diff --git a/apps/member/templates/member/club_members.html b/apps/member/templates/member/club_members.html
index 0da9524..3645050 100644
--- a/apps/member/templates/member/club_members.html
+++ b/apps/member/templates/member/club_members.html
@@ -1,4 +1,7 @@
 {% extends "member/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 {% load render_table from django_tables2 %}
 
diff --git a/apps/member/templates/member/picture_update.html b/apps/member/templates/member/picture_update.html
index 41568cf..7c9128c 100644
--- a/apps/member/templates/member/picture_update.html
+++ b/apps/member/templates/member/picture_update.html
@@ -1,4 +1,7 @@
 {% extends "member/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n crispy_forms_tags %}
 
 {% block profile_content %}
diff --git a/apps/note/templates/note/amount_input.html b/apps/note/templates/note/amount_input.html
index 43ac168..d487311 100644
--- a/apps/note/templates/note/amount_input.html
+++ b/apps/note/templates/note/amount_input.html
@@ -1,3 +1,7 @@
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+
 {# Select amount to transfert in € #}
 <div class="input-group">
     <input class="form-control mx-auto d-block" type="number" {% if not widget.attrs.negative %}min="0"{% endif %} step="0.01"
diff --git a/apps/note/templates/note/conso_form.html b/apps/note/templates/note/conso_form.html
index 5a55248..07c6348 100644
--- a/apps/note/templates/note/conso_form.html
+++ b/apps/note/templates/note/conso_form.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
-
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n static pretty_money django_tables2 %}
 
 {# Use a fluid-width container #}
diff --git a/apps/note/templates/note/transaction_form.html b/apps/note/templates/note/transaction_form.html
index dc75ad8..acb09be 100644
--- a/apps/note/templates/note/transaction_form.html
+++ b/apps/note/templates/note/transaction_form.html
@@ -2,7 +2,6 @@
 {% comment %}
 SPDX-License-Identifier: GPL-2.0-or-later
 {% endcomment %}
-
 {% load i18n static django_tables2 perms %}
 
 {% block content %}
diff --git a/apps/note/templates/note/transactiontemplate_form.html b/apps/note/templates/note/transactiontemplate_form.html
index ef2139e..f64c1f3 100644
--- a/apps/note/templates/note/transactiontemplate_form.html
+++ b/apps/note/templates/note/transactiontemplate_form.html
@@ -1,9 +1,8 @@
 {% extends "base.html" %}
-
-{% load static %}
-{% load i18n %}
-{% load crispy_forms_tags %}
-{% load pretty_money %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load static i18n crispy_forms_tags pretty_money %}
 
 {% block content %}
 <h1 class="text-white">{{ title }}</h1>
diff --git a/apps/note/templates/note/transactiontemplate_list.html b/apps/note/templates/note/transactiontemplate_list.html
index fb7c254..2a19922 100644
--- a/apps/note/templates/note/transactiontemplate_list.html
+++ b/apps/note/templates/note/transactiontemplate_list.html
@@ -1,7 +1,10 @@
 {% extends "base.html" %}
-{% load pretty_money %}
-{% load i18n %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load pretty_money i18n %}
 {% load render_table from django_tables2 %}
+
 {% block content %}
 <h1 class="text-white">{{ title }}</h1>
 <div class="row justify-content-center mb-4">
diff --git a/apps/permission/templates/permission/all_rights.html b/apps/permission/templates/permission/all_rights.html
index 9149d32..107f8f2 100644
--- a/apps/permission/templates/permission/all_rights.html
+++ b/apps/permission/templates/permission/all_rights.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% comment %}
-    SPDX-License-Identifier: GPL-3.0-or-later
+SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n %}
 {% load render_table from django_tables2 %}
diff --git a/apps/registration/templates/registration/email_validation_complete.html b/apps/registration/templates/registration/email_validation_complete.html
index b54432f..dca2647 100644
--- a/apps/registration/templates/registration/email_validation_complete.html
+++ b/apps/registration/templates/registration/email_validation_complete.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 
 {% block content %}
diff --git a/apps/registration/templates/registration/email_validation_email_sent.html b/apps/registration/templates/registration/email_validation_email_sent.html
index bb2bcea..627c864 100644
--- a/apps/registration/templates/registration/email_validation_email_sent.html
+++ b/apps/registration/templates/registration/email_validation_email_sent.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 
 {% block content %}
diff --git a/apps/registration/templates/registration/future_profile_detail.html b/apps/registration/templates/registration/future_profile_detail.html
index 1d2d08c..914b422 100644
--- a/apps/registration/templates/registration/future_profile_detail.html
+++ b/apps/registration/templates/registration/future_profile_detail.html
@@ -1,8 +1,8 @@
 {% extends "base.html" %}
-{% load static %}
-{% load i18n %}
-{% load crispy_forms_tags %}
-{% load perms %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags perms %}
 
 {% block content %}
     <div class="row mt-4">
diff --git a/apps/registration/templates/registration/future_user_list.html b/apps/registration/templates/registration/future_user_list.html
index aa0b05e..1e82403 100644
--- a/apps/registration/templates/registration/future_user_list.html
+++ b/apps/registration/templates/registration/future_user_list.html
@@ -2,8 +2,6 @@
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
-{% load render_table from django_tables2 %}
-{% load crispy_forms_tags %}
 {% load i18n %}
 
 {% block content %}
diff --git a/apps/treasury/templates/treasury/invoice_confirm_delete.html b/apps/treasury/templates/treasury/invoice_confirm_delete.html
index 2ab0b95..e1de9c8 100644
--- a/apps/treasury/templates/treasury/invoice_confirm_delete.html
+++ b/apps/treasury/templates/treasury/invoice_confirm_delete.html
@@ -1,6 +1,8 @@
 {% extends "base.html" %}
-{% load i18n %}
-{% load crispy_forms_tags %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
 
 {% block content %}
     <div class="card bg-light">
diff --git a/apps/wei/templates/wei/bus_detail.html b/apps/wei/templates/wei/bus_detail.html
index 00c901e..c8f3ce2 100644
--- a/apps/wei/templates/wei/bus_detail.html
+++ b/apps/wei/templates/wei/bus_detail.html
@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load render_table from django_tables2 %}
 {% load i18n %}
 
diff --git a/apps/wei/templates/wei/busteam_detail.html b/apps/wei/templates/wei/busteam_detail.html
index f77dc3c..27348d0 100644
--- a/apps/wei/templates/wei/busteam_detail.html
+++ b/apps/wei/templates/wei/busteam_detail.html
@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load render_table from django_tables2 %}
 {% load i18n %}
 
diff --git a/apps/wei/templates/wei/survey.html b/apps/wei/templates/wei/survey.html
index 4bf1832..9eabab5 100644
--- a/apps/wei/templates/wei/survey.html
+++ b/apps/wei/templates/wei/survey.html
@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 {% load crispy_forms_tags %}
 
diff --git a/apps/wei/templates/wei/survey_closed.html b/apps/wei/templates/wei/survey_closed.html
index e4da253..aac9e83 100644
--- a/apps/wei/templates/wei/survey_closed.html
+++ b/apps/wei/templates/wei/survey_closed.html
@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 {% load crispy_forms_tags %}
 
diff --git a/apps/wei/templates/wei/survey_end.html b/apps/wei/templates/wei/survey_end.html
index af6dace..3152f6e 100644
--- a/apps/wei/templates/wei/survey_end.html
+++ b/apps/wei/templates/wei/survey_end.html
@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 {% load crispy_forms_tags %}
 
diff --git a/apps/wei/templates/wei/weiclub_list.html b/apps/wei/templates/wei/weiclub_list.html
index 2739e5b..1202a66 100644
--- a/apps/wei/templates/wei/weiclub_list.html
+++ b/apps/wei/templates/wei/weiclub_list.html
@@ -1,6 +1,10 @@
 {% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load render_table from django_tables2 %}
 {% load i18n %}
+
 {% block content %}
 <div class="row justify-content-center mb-4">
     <div class="col-md-10 text-center">
diff --git a/apps/wei/templates/wei/weimembership_form.html b/apps/wei/templates/wei/weimembership_form.html
index fd721f9..1225175 100644
--- a/apps/wei/templates/wei/weimembership_form.html
+++ b/apps/wei/templates/wei/weimembership_form.html
@@ -1,8 +1,8 @@
 {% extends "wei/base.html" %}
-{% load crispy_forms_tags %}
-{% load i18n %}
-{% load pretty_money %}
-{% load perms %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags pretty_money perms %}
 
 {% block profile_content %}
     <div class="card bg-light shadow">
diff --git a/apps/wei/templates/wei/weimembership_list.html b/apps/wei/templates/wei/weimembership_list.html
index 76643c0..8e541d7 100644
--- a/apps/wei/templates/wei/weimembership_list.html
+++ b/apps/wei/templates/wei/weimembership_list.html
@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 {% load render_table from django_tables2 %}
 
diff --git a/apps/wei/templates/wei/weiregistration_confirm_delete.html b/apps/wei/templates/wei/weiregistration_confirm_delete.html
index 79aff24..f1d2e88 100644
--- a/apps/wei/templates/wei/weiregistration_confirm_delete.html
+++ b/apps/wei/templates/wei/weiregistration_confirm_delete.html
@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 {% load crispy_forms_tags %}
 
diff --git a/apps/wei/templates/wei/weiregistration_list.html b/apps/wei/templates/wei/weiregistration_list.html
index 3e0a329..842696b 100644
--- a/apps/wei/templates/wei/weiregistration_list.html
+++ b/apps/wei/templates/wei/weiregistration_list.html
@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 {% load render_table from django_tables2 %}
 
diff --git a/note_kfet/templates/autocomplete_model.html b/note_kfet/templates/autocomplete_model.html
index 0aeca36..0e5d17c 100644
--- a/note_kfet/templates/autocomplete_model.html
+++ b/note_kfet/templates/autocomplete_model.html
@@ -1,4 +1,7 @@
 {% load i18n %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 
 <input type="hidden" name="{{ widget.name }}" {% if widget.attrs.model_pk %}value="{{ widget.attrs.model_pk }}"{% endif %} id="{{ widget.attrs.id }}_pk">
 <input type="text"