diff --git a/assets/css/main.css b/assets/css/main.css
index 02635ce..9c102bd 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -289,10 +289,14 @@ nav a:hover {
 }
 
 #TableOfContents a, #sidebar-toc a {
-  color: var(--ifk-accent);
+  color: #4b5563;
   text-decoration: none;
 }
 
+#TableOfContents a:hover, #sidebar-toc a:hover {
+  color: var(--ifk-text);
+}
+
 #TableOfContents a:hover {
   text-decoration: underline;
 }
diff --git a/layouts/shortcodes/law-charts.html b/layouts/shortcodes/law-charts.html
index 352ca63..c989dd9 100644
--- a/layouts/shortcodes/law-charts.html
+++ b/layouts/shortcodes/law-charts.html
@@ -36,7 +36,8 @@
 
 <script src="{{ "js/chart.umd.min.js" | relURL }}"></script>
 <script>
-window.addEventListener('load', function() {
+(function initCharts() {
+  if (typeof Chart === 'undefined') { setTimeout(initCharts, 100); return; }
   var LANG = "{{ $lang }}";
   var countries = {{ $countries | jsonify }};
 
@@ -120,5 +121,5 @@ window.addEventListener('load', function() {
       plugins: { legend: { position: 'bottom', labels: { padding: 16, usePointStyle: true } } }
     }
   });
-});
+})();
 </script>
diff --git a/layouts/shortcodes/world-map.html b/layouts/shortcodes/world-map.html
index 701dcb0..dbe5686 100644
--- a/layouts/shortcodes/world-map.html
+++ b/layouts/shortcodes/world-map.html
@@ -34,7 +34,11 @@
 <script src="{{ "js/maplibre-gl.min.js" | relURL }}"></script>
 <script src="{{ "js/topojson-client.min.js" | relURL }}"></script>
 <script>
-window.addEventListener('load', function() {
+(function initMap() {
+  if (typeof maplibregl === 'undefined' || typeof topojson === 'undefined') {
+    setTimeout(initMap, 100);
+    return;
+  }
   var LANG = "{{ $lang }}";
   var STATUS_COLORS = { enforced: '#667eea', passed: '#764ba2', progress: '#a5b4fc', guidelines: '#e0e7ff' };
   var STATUS_LABELS = {
@@ -123,5 +127,5 @@ window.addEventListener('load', function() {
         });
       });
   });
-});
+})();
 </script>
diff --git a/static/css/main.css b/static/css/main.css
index 02635ce..9c102bd 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -289,10 +289,14 @@ nav a:hover {
 }
 
 #TableOfContents a, #sidebar-toc a {
-  color: var(--ifk-accent);
+  color: #4b5563;
   text-decoration: none;
 }
 
+#TableOfContents a:hover, #sidebar-toc a:hover {
+  color: var(--ifk-text);
+}
+
 #TableOfContents a:hover {
   text-decoration: underline;
 }