diff --git a/templates/auth/login.html b/templates/auth/login.html
index b763b3f..32e24d9 100644
--- a/templates/auth/login.html
+++ b/templates/auth/login.html
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="{{ url_for('static', filename='css/auth.css', v=config.CSS_VERSION) }}">
     <link rel="stylesheet" href="{{ url_for('static', filename='css/colors.css', v=config.CSS_VERSION) }}">
     <link rel="stylesheet" href="{{ url_for('main.dynamic_colors') }}?v={{ site_settings.updated_at.timestamp() }}" onload="console.log('[CSS] Dynamic colors loaded with version:', '{{ site_settings.updated_at.timestamp() }}')">
-    <script src="{{ url_for('static', filename='js/color-logger.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/color-logger.js', v=config.CSS_VERSION) }}"></script>
 </head>
 <body>
     <div class="container">
diff --git a/templates/auth/register.html b/templates/auth/register.html
index e75dab9..d39f430 100644
--- a/templates/auth/register.html
+++ b/templates/auth/register.html
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="{{ url_for('static', filename='css/auth.css', v=config.CSS_VERSION) }}">
     <link rel="stylesheet" href="{{ url_for('static', filename='css/colors.css', v=config.CSS_VERSION) }}">
     <link rel="stylesheet" href="{{ url_for('main.dynamic_colors') }}?v={{ site_settings.updated_at.timestamp() }}" onload="console.log('[CSS] Dynamic colors loaded with version:', '{{ site_settings.updated_at.timestamp() }}')">
-    <script src="{{ url_for('static', filename='js/color-logger.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/color-logger.js', v=config.CSS_VERSION) }}"></script>
 </head>
 <body>
     <div class="container">
diff --git a/templates/contacts/form.html b/templates/contacts/form.html
index 6a175a9..f27a6c8 100644
--- a/templates/contacts/form.html
+++ b/templates/contacts/form.html
@@ -157,5 +157,9 @@
     </div>
 </div>
 
-<script src="{{ url_for('static', filename='js/avatar-preview.js') }}"></script>
+<script src="{{ url_for('static', filename='js/avatar-preview.js', v=config.CSS_VERSION) }}"></script>
+{% endblock %}
+
+{% block extra_js %}
+<script src="{{ url_for('static', filename='js/avatar-preview.js', v=config.CSS_VERSION) }}"></script>
 {% endblock %} 
\ No newline at end of file
diff --git a/templates/contacts/list.html b/templates/contacts/list.html
index 014367c..c07fbb4 100644
--- a/templates/contacts/list.html
+++ b/templates/contacts/list.html
@@ -43,7 +43,7 @@
                 </button>
             </div>
         </form>
-        <script src="{{ url_for('static', filename='js/contacts-filter.js') }}"></script>
+        <script src="{{ url_for('static', filename='js/contacts-filter.js', v=config.CSS_VERSION) }}"></script>
     </div>
 
     <!-- Contacts List -->
@@ -203,4 +203,8 @@
     </div>
     {% endif %}
 </div>
+{% endblock %}
+
+{% block extra_js %}
+<script src="{{ url_for('static', filename='js/contacts-filter.js', v=config.CSS_VERSION) }}"></script>
 {% endblock %} 
\ No newline at end of file
diff --git a/templates/conversations/conversation.html b/templates/conversations/conversation.html
index bda1f82..920ee87 100644
--- a/templates/conversations/conversation.html
+++ b/templates/conversations/conversation.html
@@ -200,8 +200,8 @@
     window.currentUserId = "{{ current_user.id }}";
     window.sendMessageUrl = "{{ url_for('conversations.send_message', conversation_id=conversation.id) }}";
 </script>
-<script src="{{ url_for('static', filename='js/chat-manager.js') }}"></script>
-<script src="{{ url_for('static', filename='js/conversation.js') }}"></script>
-<script src="{{ url_for('static', filename='js/member-management.js') }}"></script>
+<script src="{{ url_for('static', filename='js/chat-manager.js', v=config.CSS_VERSION) }}"></script>
+<script src="{{ url_for('static', filename='js/conversation.js', v=config.CSS_VERSION) }}"></script>
+<script src="{{ url_for('static', filename='js/member-management.js', v=config.CSS_VERSION) }}"></script>
 {% endblock %}
 {% endblock content %} 
\ No newline at end of file
diff --git a/templates/conversations/create_conversation.html b/templates/conversations/create_conversation.html
index 739fad5..1dbd2e6 100644
--- a/templates/conversations/create_conversation.html
+++ b/templates/conversations/create_conversation.html
@@ -146,5 +146,5 @@
 {% block extra_js %}
 <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
-<script src="{{ url_for('static', filename='js/create-conversation.js') }}"></script>
+<script src="{{ url_for('static', filename='js/create-conversation.js', v=config.CSS_VERSION) }}"></script>
 {% endblock %} 
\ No newline at end of file
diff --git a/templates/profile/profile.html b/templates/profile/profile.html
index 82efae9..ccfc7d0 100644
--- a/templates/profile/profile.html
+++ b/templates/profile/profile.html
@@ -104,6 +104,6 @@
 </div>
 
 {% block extra_js %}
-<script src="{{ url_for('static', filename='js/avatar-preview.js') }}"></script>
+<script src="{{ url_for('static', filename='js/avatar-preview.js', v=config.CSS_VERSION) }}"></script>
 {% endblock %}
 {% endblock %} 
\ No newline at end of file
diff --git a/templates/rooms/room.html b/templates/rooms/room.html
index 3fe99cf..2fb2852 100644
--- a/templates/rooms/room.html
+++ b/templates/rooms/room.html
@@ -285,10 +285,10 @@
     // Test if modules are working
     console.log('Module system is working');
 </script>
-<script type="module" src="{{ url_for('static', filename='js/rooms/room.js') }}"></script>
-<script type="module" src="{{ url_for('static', filename='js/rooms/fileManager.js') }}"></script>
-<script type="module" src="{{ url_for('static', filename='js/rooms/viewManager.js') }}"></script>
-<script type="module" src="{{ url_for('static', filename='js/rooms/uploadManager.js') }}"></script>
-<script type="module" src="{{ url_for('static', filename='js/rooms/searchManager.js') }}"></script>
-<script type="module" src="{{ url_for('static', filename='js/rooms/modalManager.js') }}"></script>
+<script type="module" src="{{ url_for('static', filename='js/rooms/room.js', v=config.CSS_VERSION) }}"></script>
+<script type="module" src="{{ url_for('static', filename='js/rooms/fileManager.js', v=config.CSS_VERSION) }}"></script>
+<script type="module" src="{{ url_for('static', filename='js/rooms/viewManager.js', v=config.CSS_VERSION) }}"></script>
+<script type="module" src="{{ url_for('static', filename='js/rooms/uploadManager.js', v=config.CSS_VERSION) }}"></script>
+<script type="module" src="{{ url_for('static', filename='js/rooms/searchManager.js', v=config.CSS_VERSION) }}"></script>
+<script type="module" src="{{ url_for('static', filename='js/rooms/modalManager.js', v=config.CSS_VERSION) }}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/rooms/room_members.html b/templates/rooms/room_members.html
index b9c718c..c75a1a1 100644
--- a/templates/rooms/room_members.html
+++ b/templates/rooms/room_members.html
@@ -130,5 +130,5 @@
 {% block extra_js %}
 <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
-<script src="{{ url_for('static', filename='js/room-members.js') }}"></script>
+<script src="{{ url_for('static', filename='js/room-members.js', v=config.CSS_VERSION) }}"></script>
 {% endblock %} 
\ No newline at end of file
diff --git a/templates/rooms/rooms.html b/templates/rooms/rooms.html
index 378f0d2..a45472f 100644
--- a/templates/rooms/rooms.html
+++ b/templates/rooms/rooms.html
@@ -133,6 +133,6 @@
 </div>
 
 {% block extra_js %}
-<script src="{{ url_for('static', filename='js/rooms-list.js') }}"></script>
+<script src="{{ url_for('static', filename='js/rooms-list.js', v=config.CSS_VERSION) }}"></script>
 {% endblock %}
 {% endblock %} 
\ No newline at end of file
diff --git a/templates/settings/settings.html b/templates/settings/settings.html
index 9d0a0c3..d75f4b9 100644
--- a/templates/settings/settings.html
+++ b/templates/settings/settings.html
@@ -80,5 +80,5 @@
 {% endblock %}
 
 {% block extra_js %}
-<script src="{{ url_for('static', filename='js/settings.js') }}"></script>
+<script src="{{ url_for('static', filename='js/settings.js', v=config.CSS_VERSION) }}"></script>
 {% endblock %} 
\ No newline at end of file
diff --git a/templates/starred/starred.html b/templates/starred/starred.html
index 01f1782..ee55f1e 100644
--- a/templates/starred/starred.html
+++ b/templates/starred/starred.html
@@ -41,6 +41,6 @@
 {% endblock %}
 
 {% block extra_js %}
-<script src="{{ url_for('static', filename='js/file-grid.js') }}"></script>
-<script src="{{ url_for('static', filename='js/starred.js') }}"></script>
+<script src="{{ url_for('static', filename='js/file-grid.js', v=config.CSS_VERSION) }}"></script>
+<script src="{{ url_for('static', filename='js/starred.js', v=config.CSS_VERSION) }}"></script>
 {% endblock %} 
\ No newline at end of file
diff --git a/templates/trash/trash.html b/templates/trash/trash.html
index e69c105..dd14264 100644
--- a/templates/trash/trash.html
+++ b/templates/trash/trash.html
@@ -47,6 +47,6 @@
 {% endblock %}
 
 {% block extra_js %}
-<script src="{{ url_for('static', filename='js/file-grid.js') }}"></script>
-<script src="{{ url_for('static', filename='js/trash.js') }}"></script>
+<script src="{{ url_for('static', filename='js/file-grid.js', v=config.CSS_VERSION) }}"></script>
+<script src="{{ url_for('static', filename='js/trash.js', v=config.CSS_VERSION) }}"></script>
 {% endblock %} 
\ No newline at end of file
