diff --git a/pagure/static/tags.js b/pagure/static/tags.js
new file mode 100644
index 0000000..b6bab2b
--- /dev/null
+++ b/pagure/static/tags.js
@@ -0,0 +1,5 @@
+$(document).ready(function() {
+  $("[data-bg-color").each(function(ind, obj) {
+    $(obj).css('background-color', $(obj).attr('data-bg-color'));
+  });
+});
\ No newline at end of file
diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index 788aaca..f1e57b1 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -656,6 +656,8 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid)
   url_for('static', filename='vendor/jquery.caret/jquery.caret.min.js') }}?version={{ g.version}}"></script>
 <script type="text/javascript" nonce="{{ g.nonce }}" src="{{
   url_for('static', filename='vendor/jquery.atwho/jquery.atwho.min.js') }}?version={{ g.version}}"></script>
+<script type="text/javascript" nonce="{{ g.nonce }}" src="{{
+  url_for('static', filename='tags.js') }}?version={{ g.version}}"></script>
 
 <script type="text/javascript" nonce="{{ g.nonce }}">
 
@@ -802,12 +804,6 @@ function setup_reply_btns() {
 });
 };
 
-function color_tags() {
-  $(".badge-tag").each(function(ind, obj) {
-    $(obj).css('background-color', $(obj).attr('data-bg-color'));
-  });
-}
-
 $(document).ready(function() {
   var cur_hash = null;
 
@@ -855,7 +851,6 @@ $(document).ready(function() {
   cancel_edit_btn();
   setup_edit_btns();
   setup_reply_btns();
-  color_tags();
 
 });
 </script>
diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index bae0d99..2ab56eb 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -538,13 +538,10 @@
 
 <script type="text/javascript" nonce="{{ g.nonce }}" src="{{
   url_for('static', filename='vendor/selectize/selectize.min.js') }}?version={{ g.version}}"></script>
+<script type="text/javascript" nonce="{{ g.nonce }}" src="{{
+  url_for('static', filename='tags.js') }}?version={{ g.version}}"></script>
 
 <script type="text/javascript" nonce="{{ g.nonce }}">
-function color_tags() {
-  $(".small-badge-tag").each(function(ind, obj) {
-    $(obj).css('background-color', $(obj).attr('data-bg-color'));
-  });
-}
 
 function update_progress_bar() {
   $(".progress-bar").each(function(ind, obj) {
@@ -553,7 +550,6 @@ function update_progress_bar() {
 }
 
 $(document).ready(function() {
-    color_tags();
     update_progress_bar();
 
     $("#search_pattern-selectize-reset").on('click', function(e){
diff --git a/pagure/templates/repo_milestone.html b/pagure/templates/repo_milestone.html
index ff464b7..552d442 100644
--- a/pagure/templates/repo_milestone.html
+++ b/pagure/templates/repo_milestone.html
@@ -76,7 +76,8 @@
 
 {% block jscripts %}
 {{ super() }}
-
+<script type="text/javascript" nonce="{{ g.nonce }}" src="{{
+  url_for('static', filename='tags.js') }}?version={{ g.version}}"></script>
 <script type="text/javascript" nonce="{{ g.nonce }}">
 
 function update_progress_bar() {
diff --git a/pagure/templates/repo_pull_request.html b/pagure/templates/repo_pull_request.html
index e012de2..7a03977 100644
--- a/pagure/templates/repo_pull_request.html
+++ b/pagure/templates/repo_pull_request.html
@@ -764,6 +764,8 @@
   url_for('static', filename='vendor/jquery.atwho/jquery.atwho.min.js') }}?version={{ g.version}}"></script>
 <script type="text/javascript" nonce="{{ g.nonce }}" src="{{
   url_for('static', filename='request_ev.js') }}?version={{ g.version}}"></script>
+<script type="text/javascript" nonce="{{ g.nonce }}" src="{{
+  url_for('static', filename='tags.js') }}?version={{ g.version}}"></script>
 
 <script type="text/javascript" nonce="{{ g.nonce }}">
 function cancel_edit_btn() {
@@ -1319,12 +1321,6 @@ $(".add_comment_form").submit(function(event) {
 <script type="text/javascript" nonce="{{ g.nonce }}">
 var cur_hash = null;
 
-function color_tags() {
-  $(".badge-tag").each(function(ind, obj) {
-    $(obj).css('background-color', $(obj).attr('data-bg-color'));
-  });
-}
-
 function highlight_comment() {
   var _hash = window.location.hash;
   if (_hash != cur_hash) {
@@ -1389,7 +1385,6 @@ function updateHighlight(onload) {
 }
 
 $(document).ready(function () {
-  color_tags();
 
   {% if g.authenticated and pull_request %}
   function set_up_subcribed() {
diff --git a/pagure/templates/repo_roadmap.html b/pagure/templates/repo_roadmap.html
index 41a9fb6..129df0f 100644
--- a/pagure/templates/repo_roadmap.html
+++ b/pagure/templates/repo_roadmap.html
@@ -279,6 +279,8 @@
 
 {% block jscripts %}
 {{ super() }}
+<script type="text/javascript" nonce="{{ g.nonce }}" src="{{
+  url_for('static', filename='tags.js') }}?version={{ g.version}}"></script>
 
 <script type="text/javascript" nonce="{{ g.nonce }}">
 
diff --git a/pagure/templates/requests.html b/pagure/templates/requests.html
index 48b0e81..927ba87 100644
--- a/pagure/templates/requests.html
+++ b/pagure/templates/requests.html
@@ -299,6 +299,8 @@
 
 <script type="text/javascript" nonce="{{ g.nonce }}" src="{{
   url_for('static', filename='vendor/selectize/selectize.min.js') }}?version={{ g.version}}"></script>
+<script type="text/javascript" nonce="{{ g.nonce }}" src="{{
+  url_for('static', filename='tags.js') }}?version={{ g.version}}"></script>
 
 <script type="text/javascript" nonce="{{ g.nonce }}">
 $(document).ready(function() {
diff --git a/pagure/templates/settings.html b/pagure/templates/settings.html
index 56d400d..a09d722 100644
--- a/pagure/templates/settings.html
+++ b/pagure/templates/settings.html
@@ -1117,6 +1117,8 @@
 
 <script type="text/javascript" nonce="{{ g.nonce }}" src="{{
   url_for('static', filename='vendor/selectize/selectize.min.js') }}?version={{ g.version}}"></script>
+<script type="text/javascript" nonce="{{ g.nonce }}" src="{{
+  url_for('static', filename='tags.js') }}?version={{ g.version}}"></script>
 
 <script type="text/javascript" nonce="{{ g.nonce }}">
 function updateform() {
@@ -1130,15 +1132,8 @@ function updateform() {
   });
 };
 
-function color_tags() {
-  $(".badge").each(function(ind, obj) {
-    $(obj).css('background-color', $(obj).attr('data-bg-color'));
-  });
-}
-
 $(document).ready(function() {
     updateform();
-    color_tags();
 
     $('#generate_new_hook_token').click(function() {
         return confirm('Are you sure to generate a new token for '
diff --git a/pagure/templates/userdash_activity.html b/pagure/templates/userdash_activity.html
index 7f0fcce..043accf 100644
--- a/pagure/templates/userdash_activity.html
+++ b/pagure/templates/userdash_activity.html
@@ -138,6 +138,8 @@
 
 {% block jscripts %}
     {{ super() }}
+<script type="text/javascript" nonce="{{ g.nonce }}" src="{{
+  url_for('static', filename='tags.js') }}?version={{ g.version}}"></script>
 <script type="text/javascript" nonce="{{ g.nonce }}">
 $(document).ready(function() {
   var $acls_selectize = $('#acls-selectize').selectize({
diff --git a/pagure/templates/userprofile_issues.html b/pagure/templates/userprofile_issues.html
index 3f279c6..8f7cdbe 100644
--- a/pagure/templates/userprofile_issues.html
+++ b/pagure/templates/userprofile_issues.html
@@ -4,7 +4,6 @@
 
 {% from "_render_issues.html" import render_issue_row %}
 
-
 {% block userprofile_content %}
 <div class="pt-4">
   <div class="container pb-5">
@@ -58,6 +57,8 @@
 
 {% block jscripts %}
 {{ super() }}
+<script type="text/javascript" nonce="{{ g.nonce }}" src="{{
+  url_for('static', filename='tags.js') }}?version={{ g.version}}"></script>
 <script type="text/javascript" nonce="{{ g.nonce }}">
   count_issues(status='.issue-status-open');
   $(function(){
diff --git a/pagure/templates/userprofile_pullrequests.html b/pagure/templates/userprofile_pullrequests.html
index 4c4a82e..046d43b 100644
--- a/pagure/templates/userprofile_pullrequests.html
+++ b/pagure/templates/userprofile_pullrequests.html
@@ -66,6 +66,8 @@
 
 {% block jscripts %}
 {{ super() }}
+<script type="text/javascript" nonce="{{ g.nonce }}" src="{{
+  url_for('static', filename='tags.js') }}?version={{ g.version}}"></script>
 <script type="text/javascript" nonce="{{ g.nonce }}">
   count_issues(status='.pr-status-open');
   $(function(){