diff --git a/.forgejo/workflows/release-notes-assistant-milestones.yml b/.forgejo/workflows/release-notes-assistant-milestones.yml
index 361e8f4419..6b1497657b 100644
--- a/.forgejo/workflows/release-notes-assistant-milestones.yml
+++ b/.forgejo/workflows/release-notes-assistant-milestones.yml
@@ -20,9 +20,9 @@ jobs:
 
       - name: apt install jq
         run: |
-         export DEBIAN_FRONTEND=noninteractive
-         apt-get update -qq
-         apt-get -q install -y -qq jq
+          export DEBIAN_FRONTEND=noninteractive
+          apt-get update -qq
+          apt-get -q install -y -qq jq
 
       - name: update open milestones
         run: |
diff --git a/.forgejo/workflows/release-notes-assistant.yml b/.forgejo/workflows/release-notes-assistant.yml
index 433d9c4353..0dc3f12ee1 100644
--- a/.forgejo/workflows/release-notes-assistant.yml
+++ b/.forgejo/workflows/release-notes-assistant.yml
@@ -30,9 +30,9 @@ jobs:
 
       - name: apt install jq
         run: |
-         export DEBIAN_FRONTEND=noninteractive
-         apt-get update -qq
-         apt-get -q install -y -qq jq
+          export DEBIAN_FRONTEND=noninteractive
+          apt-get update -qq
+          apt-get -q install -y -qq jq
 
       - name: release-notes-assistant preview
         run: |
diff --git a/Makefile b/Makefile
index 29435d7dbd..de1c466935 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ DIFF ?= diff --unified
 XGO_VERSION := go-1.21.x
 
 AIR_PACKAGE ?= github.com/air-verse/air@v1 # renovate: datasource=go
-EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v2/cmd/editorconfig-checker@2.8.0 # renovate: datasource=go
+EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.0.3 # renovate: datasource=go
 GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.6.0 # renovate: datasource=go
 GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.1 # renovate: datasource=go
 GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11 # renovate: datasource=go
diff --git a/templates/base/alert.tmpl b/templates/base/alert.tmpl
index b2deab5c2d..e2853d3dab 100644
--- a/templates/base/alert.tmpl
+++ b/templates/base/alert.tmpl
@@ -19,5 +19,5 @@
 	</div>
 {{end}}
 {{if and (not .Flash.ErrorMsg) (not .Flash.SuccessMsg) (not .Flash.InfoMsg) (not .Flash.WarningMsg) (not .IsHTMX)}}
-     <div id="flash-message" hx-swap-oob="true"></div>
+	<div id="flash-message" hx-swap-oob="true"></div>
 {{end}}
diff --git a/templates/htmx/milestone_sidebar.tmpl b/templates/htmx/milestone_sidebar.tmpl
index 458dabc5b1..05bbd802cc 100644
--- a/templates/htmx/milestone_sidebar.tmpl
+++ b/templates/htmx/milestone_sidebar.tmpl
@@ -1,4 +1,4 @@
 <div id="insert-timeline" hx-swap-oob="beforebegin">
-		 {{template "repo/issue/view_content/comments" .}}
+	{{template "repo/issue/view_content/comments" .}}
 </div>
 {{template "repo/issue/view_content/sidebar/milestones" .}}
diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl
index 6258f1737e..9ac3a618e6 100644
--- a/templates/org/menu.tmpl
+++ b/templates/org/menu.tmpl
@@ -6,7 +6,7 @@
 				{{if .RepoCount}}
 					<div class="ui small label">{{.RepoCount}}</div>
 				{{end}}
-        <span hidden test-name="repository-count">{{.RepoCount}}</span>
+				<span hidden test-name="repository-count">{{.RepoCount}}</span>
 			</a>
 			{{if .CanReadProjects}}
 			<a class="{{if .PageIsViewProjects}}active {{end}}item" href="{{$.Org.HomeLink}}/-/projects">
diff --git a/templates/repo/actions/dispatch.tmpl b/templates/repo/actions/dispatch.tmpl
index 520a9b50c2..2372e61ebb 100644
--- a/templates/repo/actions/dispatch.tmpl
+++ b/templates/repo/actions/dispatch.tmpl
@@ -96,4 +96,4 @@
 			});
 		});
 	</script>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl
index e37f3d7dc3..7bab492d7b 100644
--- a/templates/repo/actions/runs_list.tmpl
+++ b/templates/repo/actions/runs_list.tmpl
@@ -15,7 +15,7 @@
 					{{if .Title}}{{.Title}}{{else}}{{ctx.Locale.Tr "actions.runs.empty_commit_message"}}{{end}}
 				</a>
 				<div class="flex-item-body">
-					<b>{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}</b> - 
+					<b>{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}</b> -
 					{{- if .ScheduleID -}}
 						{{ctx.Locale.Tr "actions.runs.scheduled"}}
 					{{- else -}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index b97ce8266f..683dea8425 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -72,7 +72,7 @@
 				</div>
 			</div>
 
-		    {{template "repo/issue/view_content/comments" .}}
+			{{template "repo/issue/view_content/comments" .}}
 			<div id="insert-timeline"></div>
 
 			{{if and .Issue.IsPull (not $.Repository.IsArchived)}}
diff --git a/templates/repo/issue/view_content/pull_merge_instruction.tmpl b/templates/repo/issue/view_content/pull_merge_instruction.tmpl
index 62605ad730..128dfef7f7 100644
--- a/templates/repo/issue/view_content/pull_merge_instruction.tmpl
+++ b/templates/repo/issue/view_content/pull_merge_instruction.tmpl
@@ -1,6 +1,6 @@
 <div class="divider"></div>
 <details class="collapsible">
-  <summary class="tw-py-2"> {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}} </summary>
+	<summary class="tw-py-2"> {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}} </summary>
 	<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}}</div>
 	{{$localBranch := .PullRequest.HeadBranch}}
 	{{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}
diff --git a/templates/repo/wiki/search.tmpl b/templates/repo/wiki/search.tmpl
index 88b12b08b9..d3af9bdcb2 100644
--- a/templates/repo/wiki/search.tmpl
+++ b/templates/repo/wiki/search.tmpl
@@ -1,12 +1,12 @@
 {{if .Results}}
-    {{range .Results}}
-        <a class="item" href="{{$.RepoLink}}/wiki/{{.Filename}}">
-            <b class="tw-block tw-mb-2">{{.Filename}}</b>
-            {{range .LineCodes}}
-                <p class="tw-my-0">{{.}}</p>
-            {{end}}
-        </a>
-    {{end}}
+	{{range .Results}}
+		<a class="item" href="{{$.RepoLink}}/wiki/{{.Filename}}">
+			<b class="tw-block tw-mb-2">{{.Filename}}</b>
+			{{range .LineCodes}}
+				<p class="tw-my-0">{{.}}</p>
+			{{end}}
+		</a>
+	{{end}}
 {{else}}
-    <div class="item muted">{{ctx.Locale.Tr "repo.wiki.no_search_results"}}</div>
+	<div class="item muted">{{ctx.Locale.Tr "repo.wiki.no_search_results"}}</div>
 {{end}}
diff --git a/templates/shared/searchfile.tmpl b/templates/shared/searchfile.tmpl
index ae67eb7118..a051742ae4 100644
--- a/templates/shared/searchfile.tmpl
+++ b/templates/shared/searchfile.tmpl
@@ -1,9 +1,9 @@
 <div class="file-body file-code code-view">
 	<div>
 		<ol class="tw-p-0 tw-m-0">
-		{{/* if the expected line number does not match
-		     the actual line number end the ordered list
-		     and begin a new one */}}
+		{{/* 	if the expected line number does not match
+				the actual line number end the ordered list
+				and begin a new one */}}
 		{{$expNum := 0}}
 		{{range .SearchResult.Lines}}
 		{{if and (gt $expNum 0) (ne .Num $expNum)}}
diff --git a/templates/shared/user/profile_big_avatar.tmpl b/templates/shared/user/profile_big_avatar.tmpl
index 6795eaed2c..d3033b46bd 100644
--- a/templates/shared/user/profile_big_avatar.tmpl
+++ b/templates/shared/user/profile_big_avatar.tmpl
@@ -1,5 +1,5 @@
 {{if .IsHTMX}}
-    {{template "base/alert" .}}
+	{{template "base/alert" .}}
 {{end}}
 <div id="profile-avatar-card" class="ui card" hx-swap="morph">
 	<div id="profile-avatar" class="content tw-flex">