diff --git a/app/templates/admin/leftover_media.html b/app/templates/admin/leftover_media.html
index 6b0ce03..1fd0283 100644
--- a/app/templates/admin/leftover_media.html
+++ b/app/templates/admin/leftover_media.html
@@ -72,7 +72,7 @@
                         <td style="padding: 10px;">📷 {{ img.filename }}</td>
                         <td style="padding: 10px;">{{ "%.2f"|format(img.file_size_mb) }} MB</td>
                         <td style="padding: 10px;">{{ img.duration }}s</td>
-                        <td style="padding: 10px;">{{ img.uploaded_at.strftime('%Y-%m-%d %H:%M') if img.uploaded_at else 'N/A' }}</td>
+                        <td style="padding: 10px;">{{ img.uploaded_at | localtime if img.uploaded_at else 'N/A' }}</td>
                         <td style="padding: 10px;">
                             <form method="POST" action="{{ url_for('admin.delete_single_leftover', content_id=img.id) }}" style="display: inline;" onsubmit="return confirm('Delete this image?');">
                                 <button type="submit" class="btn btn-danger btn-sm" style="padding: 4px 8px; font-size: 12px;">🗑️</button>
@@ -122,7 +122,7 @@
                         <td style="padding: 10px;">🎥 {{ video.filename }}</td>
                         <td style="padding: 10px;">{{ "%.2f"|format(video.file_size_mb) }} MB</td>
                         <td style="padding: 10px;">{{ video.duration }}s</td>
-                        <td style="padding: 10px;">{{ video.uploaded_at.strftime('%Y-%m-%d %H:%M') if video.uploaded_at else 'N/A' }}</td>
+                        <td style="padding: 10px;">{{ video.uploaded_at | localtime if video.uploaded_at else 'N/A' }}</td>
                         <td style="padding: 10px;">
                             <form method="POST" action="{{ url_for('admin.delete_single_leftover', content_id=video.id) }}" style="display: inline;" onsubmit="return confirm('Delete this video?');">
                                 <button type="submit" class="btn btn-danger btn-sm" style="padding: 4px 8px; font-size: 12px;">🗑️</button>
@@ -162,7 +162,7 @@
                         <td style="padding: 10px;">📄 {{ pdf.filename }}</td>
                         <td style="padding: 10px;">{{ "%.2f"|format(pdf.file_size_mb) }} MB</td>
                         <td style="padding: 10px;">{{ pdf.duration }}s</td>
-                        <td style="padding: 10px;">{{ pdf.uploaded_at.strftime('%Y-%m-%d %H:%M') if pdf.uploaded_at else 'N/A' }}</td>
+                        <td style="padding: 10px;">{{ pdf.uploaded_at | localtime if pdf.uploaded_at else 'N/A' }}</td>
                     </tr>
                     {% endfor %}
                 </tbody>
diff --git a/app/templates/admin/user_management.html b/app/templates/admin/user_management.html
index dac65d3..598c40b 100644
--- a/app/templates/admin/user_management.html
+++ b/app/templates/admin/user_management.html
@@ -37,8 +37,8 @@
                                 {{ user.role|capitalize }}
                             </span>
                         </td>
-                        <td>{{ user.created_at.strftime('%Y-%m-%d %H:%M') if user.created_at else 'N/A' }}</td>
-                        <td>{{ user.last_login.strftime('%Y-%m-%d %H:%M') if user.last_login else 'Never' }}</td>
+                        <td>{{ user.created_at | localtime if user.created_at else 'N/A' }}</td>
+                        <td>{{ user.last_login | localtime if user.last_login else 'Never' }}</td>
                         <td class="actions">
                             {% if user.id != current_user.id %}
                             <button class="btn btn-sm btn-warning" onclick="showEditUserModal({{ user.id }}, '{{ user.username }}', '{{ user.role }}')">
diff --git a/app/templates/content/content_list.html b/app/templates/content/content_list.html
index 02f2d39..388bb4c 100644
--- a/app/templates/content/content_list.html
+++ b/app/templates/content/content_list.html
@@ -75,7 +75,7 @@
                         {% endif %}
                     </td>
                     <td style="padding: 12px;">
-                        <small style="color: #6c757d;">{{ item.uploaded_at.strftime('%Y-%m-%d %H:%M') }}</small>
+                        <small style="color: #6c757d;">{{ item.uploaded_at | localtime }}</small>
                     </td>
                     <td style="padding: 12px;">
                         {% if item.player_count > 0 %}
diff --git a/app/templates/content/media_library.html b/app/templates/content/media_library.html
index 41d119f..d65a02c 100644
--- a/app/templates/content/media_library.html
+++ b/app/templates/content/media_library.html
@@ -283,7 +283,7 @@
         <div class="media-info">
             <span class="type-badge image">Image</span>
             <div style="margin-top: 5px;">{{ "%.1f"|format(media.file_size_mb) }} MB</div>
-            <div style="font-size: 10px; margin-top: 3px;">{{ media.uploaded_at.strftime('%Y-%m-%d') }}</div>
+            <div style="font-size: 10px; margin-top: 3px;">{{ media.uploaded_at | localtime('%Y-%m-%d') }}</div>
             {% if media.playlists.count() > 0 %}
                 <div class="playlist-badge in-use">📋 In {{ media.playlists.count() }} playlist(s)</div>
             {% else %}
@@ -312,7 +312,7 @@
         <div class="media-info">
             <span class="type-badge video">Video</span>
             <div style="margin-top: 5px;">{{ "%.1f"|format(media.file_size_mb) }} MB</div>
-            <div style="font-size: 10px; margin-top: 3px;">{{ media.uploaded_at.strftime('%Y-%m-%d') }}</div>
+            <div style="font-size: 10px; margin-top: 3px;">{{ media.uploaded_at | localtime('%Y-%m-%d') }}</div>
             {% if media.playlists.count() > 0 %}
                 <div class="playlist-badge in-use">📋 In {{ media.playlists.count() }} playlist(s)</div>
             {% else %}
@@ -341,7 +341,7 @@
         <div class="media-info">
             <span class="type-badge pdf">PDF</span>
             <div style="margin-top: 5px;">{{ "%.1f"|format(media.file_size_mb) }} MB</div>
-            <div style="font-size: 10px; margin-top: 3px;">{{ media.uploaded_at.strftime('%Y-%m-%d') }}</div>
+            <div style="font-size: 10px; margin-top: 3px;">{{ media.uploaded_at | localtime('%Y-%m-%d') }}</div>
             {% if media.playlists.count() > 0 %}
                 <div class="playlist-badge in-use">📋 In {{ media.playlists.count() }} playlist(s)</div>
             {% else %}
@@ -370,7 +370,7 @@
         <div class="media-info">
             <span class="type-badge pptx">PPTX</span>
             <div style="margin-top: 5px;">{{ "%.1f"|format(media.file_size_mb) }} MB</div>
-            <div style="font-size: 10px; margin-top: 3px;">{{ media.uploaded_at.strftime('%Y-%m-%d') }}</div>
+            <div style="font-size: 10px; margin-top: 3px;">{{ media.uploaded_at | localtime('%Y-%m-%d') }}</div>
             {% if media.playlists.count() > 0 %}
                 <div class="playlist-badge in-use">📋 In {{ media.playlists.count() }} playlist(s)</div>
             {% else %}
@@ -399,7 +399,7 @@
         <div class="media-info">
             <span class="type-badge">{{ media.content_type }}</span>
             <div style="margin-top: 5px;">{{ "%.1f"|format(media.file_size_mb) }} MB</div>
-            <div style="font-size: 10px; margin-top: 3px;">{{ media.uploaded_at.strftime('%Y-%m-%d') }}</div>
+            <div style="font-size: 10px; margin-top: 3px;">{{ media.uploaded_at | localtime('%Y-%m-%d') }}</div>
             {% if media.playlists.count() > 0 %}
                 <div class="playlist-badge in-use">📋 In {{ media.playlists.count() }} playlist(s)</div>
             {% else %}
diff --git a/app/templates/dashboard.html b/app/templates/dashboard.html
index 9273125..29be11b 100644
--- a/app/templates/dashboard.html
+++ b/app/templates/dashboard.html
@@ -123,7 +123,7 @@ body.dark-mode .log-item {
                 [{{ log.level.upper() }}]
             </span>
             {{ log.message }}
-            <small class="secondary-text" style="float: right;">{{ log.timestamp.strftime('%Y-%m-%d %H:%M:%S') }}</small>
+            <small class="secondary-text" style="float: right;">{{ log.timestamp | localtime('%Y-%m-%d %H:%M:%S') }}</small>
         </div>
         {% endfor %}
     </div>
diff --git a/app/templates/players/manage_player.html b/app/templates/players/manage_player.html
index b350280..7e5e379 100644
--- a/app/templates/players/manage_player.html
+++ b/app/templates/players/manage_player.html
@@ -357,7 +357,7 @@ document.addEventListener('keydown', function(event) {
     <p><strong>Hostname:</strong> {{ player.hostname }}</p>
     <p><strong>Last Seen:</strong> 
         {% if player.last_seen %}
-            {{ player.last_seen.strftime('%Y-%m-%d %H:%M:%S') }}
+            {{ player.last_seen | localtime('%Y-%m-%d %H:%M:%S') }}
         {% else %}
             Never
         {% endif %}
@@ -389,7 +389,7 @@ document.addEventListener('keydown', function(event) {
         </div>
         <div>
             <div style="font-size: 0.85rem; color: #6c757d; margin-bottom: 0.25rem;">Last Updated</div>
-            <div style="font-size: 1rem; font-weight: bold;">{{ current_playlist.updated_at.strftime('%Y-%m-%d %H:%M') }}</div>
+            <div style="font-size: 1rem; font-weight: bold;">{{ current_playlist.updated_at | localtime }}</div>
         </div>
         <div>
             <div style="font-size: 0.85rem; color: #6c757d; margin-bottom: 0.25rem;">Orientation</div>
@@ -512,7 +512,7 @@ document.addEventListener('keydown', function(event) {
                 <p style="margin: 0.25rem 0 0 0; font-size: 0.9rem;">Version: {{ current_playlist.version }}</p>
                 <p style="margin: 0.25rem 0 0 0; font-size: 0.9rem;">Content Items: {{ current_playlist.contents.count() }}</p>
                 <p style="margin: 0.25rem 0 0 0; font-size: 0.9rem; color: #6c757d;">
-                    Updated: {{ current_playlist.updated_at.strftime('%Y-%m-%d %H:%M') }}
+                    Updated: {{ current_playlist.updated_at | localtime }}
                 </p>
             </div>
             {% else %}
@@ -595,7 +595,7 @@ document.addEventListener('keydown', function(event) {
                             {% endif %}
                         </div>
                         <small style="color: #6c757d; white-space: nowrap; margin-left: 1rem;">
-                            {{ log.timestamp.strftime('%m/%d %H:%M') }}
+                            {{ log.timestamp | localtime('%m/%d %H:%M') }}
                         </small>
                     </div>
                 </div>
@@ -617,7 +617,7 @@ document.addEventListener('keydown', function(event) {
     <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); gap: 1rem; margin-top: 1rem;">
         <div>
             <p><strong>Player ID:</strong> {{ player.id }}</p>
-            <p><strong>Created:</strong> {{ player.created_at.strftime('%Y-%m-%d %H:%M') if player.created_at else 'N/A' }}</p>
+            <p><strong>Created:</strong> {{ (player.created_at | localtime) if player.created_at else 'N/A' }}</p>
         </div>
         <div>
             <p><strong>Orientation:</strong> {{ player.orientation }}</p>
@@ -626,7 +626,7 @@ document.addEventListener('keydown', function(event) {
         <div>
             <p><strong>Last Heartbeat:</strong> 
                 {% if player.last_heartbeat %}
-                    {{ player.last_heartbeat.strftime('%Y-%m-%d %H:%M:%S') }}
+                    {{ player.last_heartbeat | localtime('%Y-%m-%d %H:%M:%S') }}
                 {% else %}
                     Never
                 {% endif %}
diff --git a/app/templates/players/player_page.html b/app/templates/players/player_page.html
index 80b5d32..8fe8c7a 100644
--- a/app/templates/players/player_page.html
+++ b/app/templates/players/player_page.html
@@ -64,7 +64,7 @@
                 </tr>
                 <tr>
                     <td style="padding: 10px; font-weight: bold;">Created:</td>
-                    <td style="padding: 10px;">{{ player.created_at.strftime('%Y-%m-%d %H:%M') }}</td>
+                    <td style="padding: 10px;">{{ player.created_at | localtime }}</td>
                 </tr>
             </table>
         </div>
@@ -188,7 +188,7 @@
                     {% for feedback in recent_feedback %}
                     <tr style="border-bottom: 1px solid #dee2e6;">
                         <td style="padding: 10px; white-space: nowrap;">
-                            <small style="color: #6c757d;">{{ feedback.timestamp.strftime('%Y-%m-%d %H:%M:%S') }}</small>
+                            <small style="color: #6c757d;">{{ feedback.timestamp | localtime('%Y-%m-%d %H:%M:%S') }}</small>
                         </td>
                         <td style="padding: 10px;">
                             {% if feedback.status == 'playing' %}