diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 7603646721..a06c837f50 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -295,16 +295,25 @@
 			<form class="ui form" method="post">
 				<input type="hidden" name="action" value="advanced">
 
+				{{/* ── Code ── */}}
+				<details class="tw-mb-2" open>
+					<summary class="tw-cursor-pointer tw-font-bold tw-py-2">{{svg "octicon-code" 16}} {{ctx.Locale.Tr "repo.code"}}</summary>
+					<div class="tw-pl-4 tw-pb-2">
 				{{$isCodeEnabled := .Repository.UnitEnabled ctx ctx.Consts.RepoUnitTypeCode}}
 				{{$isCodeGlobalDisabled := ctx.Consts.RepoUnitTypeCode.UnitGlobalDisabled}}
 				<div class="inline field">
-					<label>{{ctx.Locale.Tr "repo.code"}}</label>
 					<div class="ui checkbox{{if $isCodeGlobalDisabled}} disabled{{end}}"{{if $isCodeGlobalDisabled}} data-tooltip-content="{{ctx.Locale.Tr "repo.unit_disabled"}}"{{end}}>
 						<input class="enable-system" name="enable_code" type="checkbox"{{if $isCodeEnabled}} checked{{end}}>
 						<label>{{ctx.Locale.Tr "repo.code.desc"}}</label>
 					</div>
 				</div>
+					</div>
+				</details>
 
+				{{/* ── Wiki ── */}}
+				<details class="tw-mb-2">
+					<summary class="tw-cursor-pointer tw-font-bold tw-py-2">{{svg "octicon-book" 16}} {{ctx.Locale.Tr "repo.wiki"}}</summary>
+					<div class="tw-pl-4 tw-pb-2">
 				{{$isInternalWikiEnabled := .Repository.UnitEnabled ctx ctx.Consts.RepoUnitTypeWiki}}
 				{{$isExternalWikiEnabled := .Repository.UnitEnabled ctx ctx.Consts.RepoUnitTypeExternalWiki}}
 				{{$isWikiEnabled := or $isInternalWikiEnabled $isExternalWikiEnabled}}
@@ -312,7 +321,6 @@
 				{{$isExternalWikiGlobalDisabled := ctx.Consts.RepoUnitTypeExternalWiki.UnitGlobalDisabled}}
 				{{$isBothWikiGlobalDisabled := and $isWikiGlobalDisabled $isExternalWikiGlobalDisabled}}
 				<div class="inline field">
-					<label>{{ctx.Locale.Tr "repo.wiki"}}</label>
 					<div class="ui checkbox{{if $isBothWikiGlobalDisabled}} disabled{{end}}"{{if $isBothWikiGlobalDisabled}} data-tooltip-content="{{ctx.Locale.Tr "repo.unit_disabled"}}"{{end}}>
 						<input class="enable-system" name="enable_wiki" type="checkbox" data-target="#wiki_box" {{if $isWikiEnabled}}checked{{end}}>
 						<label>{{ctx.Locale.Tr "repo.settings.wiki_desc"}}</label>
@@ -350,9 +358,13 @@
 						<p class="help">{{ctx.Locale.Tr "repo.settings.external_wiki_url_desc"}}</p>
 					</div>
 				</div>
+					</div>
+				</details>
 
-				<div class="divider"></div>
-
+				{{/* ── Issues ── */}}
+				<details class="tw-mb-2">
+					<summary class="tw-cursor-pointer tw-font-bold tw-py-2">{{svg "octicon-issue-opened" 16}} {{ctx.Locale.Tr "repo.issues"}}</summary>
+					<div class="tw-pl-4 tw-pb-2">
 				{{$isIssuesEnabled := or (.Repository.UnitEnabled ctx ctx.Consts.RepoUnitTypeIssues) (.Repository.UnitEnabled ctx ctx.Consts.RepoUnitTypeExternalTracker)}}
 				{{$isIssuesGlobalDisabled := ctx.Consts.RepoUnitTypeIssues.UnitGlobalDisabled}}
 				{{$isExternalTrackerGlobalDisabled := ctx.Consts.RepoUnitTypeExternalTracker.UnitGlobalDisabled}}
@@ -451,9 +463,13 @@
 						</div>
 					</div>
 				</div>
+					</div>
+				</details>
 
-				<div class="divider"></div>
-
+				{{/* ── Projects ── */}}
+				<details class="tw-mb-2">
+					<summary class="tw-cursor-pointer tw-font-bold tw-py-2">{{svg "octicon-project" 16}} {{ctx.Locale.Tr "repo.projects"}}</summary>
+					<div class="tw-pl-4 tw-pb-2">
 				{{$isProjectsEnabled := .Repository.UnitEnabled ctx ctx.Consts.RepoUnitTypeProjects}}
 				{{$isProjectsGlobalDisabled := ctx.Consts.RepoUnitTypeProjects.UnitGlobalDisabled}}
 				{{$projectsUnit := .Repository.MustGetUnit ctx ctx.Consts.RepoUnitTypeProjects}}
@@ -493,13 +509,16 @@
 						</div>
 					</div>
 				</div>
+					</div>
+				</details>
 
-				<div class="divider"></div>
-
+				{{/* ── Releases ── */}}
+				<details class="tw-mb-2">
+					<summary class="tw-cursor-pointer tw-font-bold tw-py-2">{{svg "octicon-tag" 16}} {{ctx.Locale.Tr "repo.releases"}}</summary>
+					<div class="tw-pl-4 tw-pb-2">
 				{{$isReleasesEnabled := .Repository.UnitEnabled ctx ctx.Consts.RepoUnitTypeReleases}}
 				{{$isReleasesGlobalDisabled := ctx.Consts.RepoUnitTypeReleases.UnitGlobalDisabled}}
 				<div class="inline field">
-					<label>{{ctx.Locale.Tr "repo.releases"}}</label>
 					<div class="ui checkbox{{if $isReleasesGlobalDisabled}} disabled{{end}}"{{if $isReleasesGlobalDisabled}} data-tooltip-content="{{ctx.Locale.Tr "repo.unit_disabled"}}"{{end}}>
 						<input class="enable-system" name="enable_releases" type="checkbox" data-target="#releases_visibility_box" {{if $isReleasesEnabled}}checked{{end}}>
 						<label>{{ctx.Locale.Tr "repo.settings.releases_desc"}}</label>
@@ -516,108 +535,29 @@
 					</div>
 				</div>
 
-				<div class="divider"></div>
-
-				{{/* ── Licensing & Update Feeds ── */}}
-				<div class="inline field">
-					<label>{{ctx.Locale.Tr "repo.settings.licensing_section"}}</label>
-					<div class="ui checkbox">
-						<input class="enable-system" name="enable_licensing" type="checkbox" data-target="#licensing_options_box" {{if and .RepoUpdateConfig .RepoUpdateConfig.LicensingEnabled}}checked{{end}}>
-						<label>{{ctx.Locale.Tr "repo.settings.enable_licensing"}}</label>
-					</div>
-				</div>
-				<div class="field tw-pl-4{{if not (and .RepoUpdateConfig .RepoUpdateConfig.LicensingEnabled)}} disabled{{end}}" id="licensing_options_box">
-					<p class="help tw-mb-4">{{ctx.Locale.Tr "repo.settings.licensing_section_desc"}}</p>
-					<div class="inline field">
-						<label>{{ctx.Locale.Tr "repo.settings.update_platform"}}</label>
-						<select name="update_platform" class="ui dropdown">
-							<option value="joomla" {{if or (not .RepoUpdateConfig) (eq .RepoUpdateConfig.Platform "joomla") (eq .RepoUpdateConfig.Platform "")}}selected{{end}}>Joomla (updates.xml)</option>
-							<option value="dolibarr" {{if and .RepoUpdateConfig (eq .RepoUpdateConfig.Platform "dolibarr")}}selected{{end}}>Dolibarr (JSON)</option>
-							<option value="both" {{if and .RepoUpdateConfig (eq .RepoUpdateConfig.Platform "both")}}selected{{end}}>{{ctx.Locale.Tr "repo.settings.update_platform_both"}}</option>
-						</select>
-						<p class="help">{{ctx.Locale.Tr "repo.settings.update_platform_help"}}</p>
-					</div>
-					<div class="inline field">
-						<div class="ui checkbox">
-							<input name="require_update_key" type="checkbox" {{if and .RepoUpdateConfig .RepoUpdateConfig.RequireKey}}checked{{end}}>
-							<label>{{ctx.Locale.Tr "repo.settings.require_update_key"}}</label>
-						</div>
-						<p class="help">{{ctx.Locale.Tr "repo.settings.require_update_key_help"}}</p>
-					</div>
-					<div class="inline field">
-						<label>{{ctx.Locale.Tr "repo.settings.download_gating"}}</label>
-						<select name="download_gating" class="ui dropdown">
-							<option value="none" {{if or (not .RepoUpdateConfig) (eq .RepoUpdateConfig.DownloadGating "") (eq .RepoUpdateConfig.DownloadGating "none")}}selected{{end}}>{{ctx.Locale.Tr "org.settings.download_gating_none"}}</option>
-							<option value="prerelease" {{if and .RepoUpdateConfig (eq .RepoUpdateConfig.DownloadGating "prerelease")}}selected{{end}}>{{ctx.Locale.Tr "org.settings.download_gating_prerelease"}}</option>
-							<option value="all" {{if and .RepoUpdateConfig (eq .RepoUpdateConfig.DownloadGating "all")}}selected{{end}}>{{ctx.Locale.Tr "org.settings.download_gating_all"}}</option>
-						</select>
-						<p class="help">{{ctx.Locale.Tr "org.settings.download_gating_help"}}</p>
-					</div>
-					<div class="inline field">
-						<label>{{ctx.Locale.Tr "repo.settings.support_url"}}</label>
-						<input name="support_url" value="{{if .RepoUpdateConfig}}{{.RepoUpdateConfig.SupportURL}}{{end}}" placeholder="https://mokoconsulting.tech/support">
-						<p class="help">{{ctx.Locale.Tr "repo.settings.support_url_help"}}</p>
-					</div>
-
-					<div class="ui divider"></div>
-					<h6>{{ctx.Locale.Tr "repo.settings.extension_metadata"}}</h6>
-					<p class="help tw-mb-4">{{ctx.Locale.Tr "repo.settings.extension_metadata_desc"}}</p>
-
-					<div class="two fields">
-						<div class="field">
-							<label>{{ctx.Locale.Tr "org.settings.extension_name"}}</label>
-							<input name="extension_name" value="{{if .RepoUpdateConfig}}{{.RepoUpdateConfig.ExtensionName}}{{end}}" placeholder="pkg_myextension">
-							<p class="help">{{ctx.Locale.Tr "org.settings.extension_name_help"}}</p>
-						</div>
-						<div class="field">
-							<label>{{ctx.Locale.Tr "org.settings.display_name"}}</label>
-							<input name="display_name" value="{{if .RepoUpdateConfig}}{{.RepoUpdateConfig.DisplayName}}{{end}}" placeholder="Package - My Extension">
-							<p class="help">{{ctx.Locale.Tr "org.settings.display_name_help"}}</p>
-						</div>
-					</div>
-					<div class="two fields">
-						<div class="field">
-							<label>{{ctx.Locale.Tr "org.settings.extension_type"}}</label>
-							<select name="extension_type" class="ui dropdown">
-								<option value="">{{ctx.Locale.Tr "repo.settings.inherit_org"}}</option>
-								<option value="package" {{if and .RepoUpdateConfig (eq .RepoUpdateConfig.ExtensionType "package")}}selected{{end}}>Package</option>
-								<option value="component" {{if and .RepoUpdateConfig (eq .RepoUpdateConfig.ExtensionType "component")}}selected{{end}}>Component</option>
-								<option value="module" {{if and .RepoUpdateConfig (eq .RepoUpdateConfig.ExtensionType "module")}}selected{{end}}>Module</option>
-								<option value="plugin" {{if and .RepoUpdateConfig (eq .RepoUpdateConfig.ExtensionType "plugin")}}selected{{end}}>Plugin</option>
-								<option value="template" {{if and .RepoUpdateConfig (eq .RepoUpdateConfig.ExtensionType "template")}}selected{{end}}>Template</option>
-								<option value="library" {{if and .RepoUpdateConfig (eq .RepoUpdateConfig.ExtensionType "library")}}selected{{end}}>Library</option>
-							</select>
-						</div>
-						<div class="field">
-							<label>{{ctx.Locale.Tr "org.settings.target_version"}}</label>
-							<input name="target_version" value="{{if .RepoUpdateConfig}}{{.RepoUpdateConfig.TargetVersion}}{{end}}" placeholder="(5|6)\..*">
-							<p class="help">{{ctx.Locale.Tr "org.settings.target_version_help"}}</p>
-						</div>
-					</div>
-					<div class="two fields">
-						<div class="field">
-							<label>{{ctx.Locale.Tr "org.settings.maintainer"}}</label>
-							<input name="maintainer" value="{{if .RepoUpdateConfig}}{{.RepoUpdateConfig.Maintainer}}{{end}}" placeholder="Moko Consulting">
-						</div>
-						<div class="field">
-							<label>{{ctx.Locale.Tr "org.settings.php_minimum"}}</label>
-							<input name="php_minimum" value="{{if .RepoUpdateConfig}}{{.RepoUpdateConfig.PHPMinimum}}{{end}}" placeholder="8.1">
-						</div>
-					</div>
-				</div>
+					</div>
+				</details>
 
+				{{/* ── Packages ── */}}
+				<details class="tw-mb-2">
+					<summary class="tw-cursor-pointer tw-font-bold tw-py-2">{{svg "octicon-package" 16}} {{ctx.Locale.Tr "repo.packages"}}</summary>
+					<div class="tw-pl-4 tw-pb-2">
 				{{$isPackagesEnabled := .Repository.UnitEnabled ctx ctx.Consts.RepoUnitTypePackages}}
 				{{$isPackagesGlobalDisabled := ctx.Consts.RepoUnitTypePackages.UnitGlobalDisabled}}
 				<div class="inline field">
-					<label>{{ctx.Locale.Tr "repo.packages"}}</label>
 					<div class="ui checkbox{{if $isPackagesGlobalDisabled}} disabled{{end}}"{{if $isPackagesGlobalDisabled}} data-tooltip-content="{{ctx.Locale.Tr "repo.unit_disabled"}}"{{end}}>
 						<input class="enable-system" name="enable_packages" type="checkbox" {{if $isPackagesEnabled}}checked{{end}}>
 						<label>{{ctx.Locale.Tr "repo.settings.packages_desc"}}</label>
 					</div>
 				</div>
+					</div>
+				</details>
 
 				{{if not .IsMirror}}
-					<div class="divider"></div>
+				{{/* ── Pull Requests ── */}}
+				<details class="tw-mb-2">
+					<summary class="tw-cursor-pointer tw-font-bold tw-py-2">{{svg "octicon-git-pull-request" 16}} {{ctx.Locale.Tr "repo.pulls"}}</summary>
+					<div class="tw-pl-4 tw-pb-2">
 					{{$pullRequestEnabled := .Repository.UnitEnabled ctx ctx.Consts.RepoUnitTypePullRequests}}
 					{{$pullRequestGlobalDisabled := ctx.Consts.RepoUnitTypePullRequests.UnitGlobalDisabled}}
 					{{$prUnit := .Repository.MustGetUnit ctx ctx.Consts.RepoUnitTypePullRequests}}
@@ -756,8 +696,11 @@
 					</div>
 				{{end}}
 
-				<div class="divider"></div>
-				<div class="field">
+					</div>
+				</details>
+				{{end}}
+
+				<div class="field tw-mt-4">
 					<button class="ui primary button">{{ctx.Locale.Tr "repo.settings.update_settings"}}</button>
 				</div>
 			</form>