@digital4better/data 1.2.30 → 1.3.0

package/data/mix/country-yearly.json

@@ -129,16 +129,16 @@
       "Gas": 0.0778,
       "Hydro": 0.2813,
       "Nuclear": 0.0411,
-      "Other Fossil": 0.0212,
+      "Other Fossil": 0.0213,
       "Other Renewables": 0.004,
-      "Solar": 0.057,
+      "Solar": 0.0569,
       "Wind": 0.0541
     },
     "2024": {
       "Bioenergy": 0.0161,
       "Coal": 0.4337,
       "Gas": 0.0756,
-      "Hydro": 0.2845,
+      "Hydro": 0.2844,
       "Nuclear": 0.0403,
       "Other Fossil": 0.0201,
       "Other Renewables": 0.0041,
@@ -146,15 +146,15 @@
       "Wind": 0.0567
     },
     "2025": {
-      "Bioenergy": 0.0167,
-      "Coal": 0.4302,
-      "Gas": 0.0757,
-      "Hydro": 0.2596,
-      "Nuclear": 0.0446,
-      "Other Fossil": 0.0204,
-      "Other Renewables": 0.0043,
-      "Solar": 0.078,
-      "Wind": 0.0704
+      "Bioenergy": 0.0161,
+      "Coal": 0.4236,
+      "Gas": 0.075,
+      "Hydro": 0.2623,
+      "Nuclear": 0.0445,
+      "Other Fossil": 0.0202,
+      "Other Renewables": 0.0044,
+      "Solar": 0.0834,
+      "Wind": 0.0705
     }
   },
   "AG": {
@@ -305,14 +305,14 @@
     },
     "2025": {
       "Bioenergy": 0.0092,
-      "Coal": 0.0436,
-      "Gas": 0.0767,
-      "Hydro": 0.7332,
-      "Nuclear": 0.0627,
-      "Other Fossil": 0.0074,
+      "Coal": 0.0426,
+      "Gas": 0.0749,
+      "Hydro": 0.7341,
+      "Nuclear": 0.0626,
+      "Other Fossil": 0.0075,
       "Other Renewables": 0.0021,
-      "Solar": 0.0273,
-      "Wind": 0.0377
+      "Solar": 0.0287,
+      "Wind": 0.0383
     }
   },
   "AM": {
@@ -546,7 +546,7 @@
       "Gas": 0.5589,
       "Hydro": 0.1917,
       "Nuclear": 0.0731,
-      "Other Fossil": 0.0088,
+      "Other Fossil": 0.0089,
       "Other Renewables": 0.0001,
       "Solar": 0.0331,
       "Wind": 0.1201
@@ -699,15 +699,15 @@
       "Wind": 0.1338
     },
     "2025": {
-      "Bioenergy": 0.0326,
-      "Coal": 0.0131,
-      "Gas": 0.1866,
-      "Hydro": 0.4833,
+      "Bioenergy": 0.0323,
+      "Coal": 0.013,
+      "Gas": 0.1677,
+      "Hydro": 0.4905,
       "Nuclear": 0.0178,
-      "Other Fossil": 0.0169,
+      "Other Fossil": 0.0165,
       "Other Renewables": 0.0006,
-      "Solar": 0.1031,
-      "Wind": 0.146
+      "Solar": 0.1304,
+      "Wind": 0.1312
     }
   },
   "AU": {
@@ -779,14 +779,14 @@
     },
     "2025": {
       "Bioenergy": 0.0009,
-      "Coal": 0.522,
-      "Gas": 0.0625,
-      "Hydro": 0.0487,
+      "Coal": 0.5235,
+      "Gas": 0.0648,
+      "Hydro": 0.0503,
       "Nuclear": 0,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.2291,
-      "Wind": 0.1367
+      "Solar": 0.22,
+      "Wind": 0.1405
     }
   },
   "AW": {
@@ -1016,14 +1016,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5946,
+      "Coal": 0.5989,
       "Gas": 0,
-      "Hydro": 0.3714,
+      "Hydro": 0.3671,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0169,
-      "Wind": 0.017
+      "Solar": 0.0182,
+      "Wind": 0.0158
     }
   },
   "BB": {
@@ -1173,14 +1173,14 @@
       "Wind": 0.0115
     },
     "2025": {
-      "Bioenergy": 0.0035,
-      "Coal": 0.3544,
-      "Gas": 0.4471,
-      "Hydro": 0.0143,
-      "Nuclear": 0.0094,
+      "Bioenergy": 0.0034,
+      "Coal": 0.353,
+      "Gas": 0.4469,
+      "Hydro": 0.0148,
+      "Nuclear": 0.0093,
       "Other Fossil": 0.1268,
       "Other Renewables": 0.0009,
-      "Solar": 0.0289,
+      "Solar": 0.03,
       "Wind": 0.0148
     }
   },
@@ -1252,15 +1252,15 @@
       "Wind": 0.1779
     },
     "2025": {
-      "Bioenergy": 0.0127,
-      "Coal": 0.0209,
-      "Gas": 0.2262,
-      "Hydro": 0.0276,
-      "Nuclear": 0.3423,
+      "Bioenergy": 0.0123,
+      "Coal": 0.02,
+      "Gas": 0.2126,
+      "Hydro": 0.0275,
+      "Nuclear": 0.3477,
       "Other Fossil": 0.0999,
       "Other Renewables": 0.001,
-      "Solar": 0.1322,
-      "Wind": 0.1371
+      "Solar": 0.1341,
+      "Wind": 0.1448
     }
   },
   "BF": {
@@ -1410,15 +1410,15 @@
       "Wind": 0.0411
     },
     "2025": {
-      "Bioenergy": 0.0029,
-      "Coal": 0.2984,
-      "Gas": 0.0576,
-      "Hydro": 0.0612,
-      "Nuclear": 0.4196,
-      "Other Fossil": 0,
+      "Bioenergy": 0.0031,
+      "Coal": 0.2995,
+      "Gas": 0.0572,
+      "Hydro": 0.0693,
+      "Nuclear": 0.3978,
+      "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.1264,
-      "Wind": 0.0339
+      "Solar": 0.1382,
+      "Wind": 0.0349
     }
   },
   "BH": {
@@ -1886,13 +1886,13 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.6025,
-      "Hydro": 0.3529,
+      "Gas": 0.6,
+      "Hydro": 0.3546,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0284,
-      "Wind": 0.0162
+      "Solar": 0.0289,
+      "Wind": 0.0165
     }
   },
   "BR": {
@@ -2358,15 +2358,15 @@
       "Wind": 0.0409
     },
     "2025": {
-      "Bioenergy": 0.1695,
-      "Coal": 0.0124,
-      "Gas": 0.0927,
-      "Hydro": 0.5268,
-      "Nuclear": 0.0095,
-      "Other Fossil": 0.1019,
-      "Other Renewables": 0.0024,
-      "Solar": 0.0479,
-      "Wind": 0.0371
+      "Bioenergy": 0.1698,
+      "Coal": 0.014,
+      "Gas": 0.0952,
+      "Hydro": 0.5248,
+      "Nuclear": 0.0086,
+      "Other Fossil": 0.1012,
+      "Other Renewables": 0.0023,
+      "Solar": 0.0467,
+      "Wind": 0.0373
     }
   },
   "CA": {
@@ -2393,59 +2393,59 @@
       "Wind": 0.0572
     },
     "2021": {
-      "Bioenergy": 0.0157,
-      "Coal": 0.0537,
-      "Gas": 0.1211,
+      "Bioenergy": 0.0172,
+      "Coal": 0.0525,
+      "Gas": 0.1209,
       "Hydro": 0.6008,
       "Nuclear": 0.1389,
-      "Other Fossil": 0.0074,
+      "Other Fossil": 0.0073,
       "Other Renewables": 0.0003,
       "Solar": 0.0043,
       "Wind": 0.0577
     },
     "2022": {
-      "Bioenergy": 0.0141,
-      "Coal": 0.0407,
-      "Gas": 0.1281,
-      "Hydro": 0.6132,
+      "Bioenergy": 0.0153,
+      "Coal": 0.0393,
+      "Gas": 0.1285,
+      "Hydro": 0.6131,
       "Nuclear": 0.1282,
-      "Other Fossil": 0.0092,
+      "Other Fossil": 0.009,
       "Other Renewables": 0.0002,
       "Solar": 0.0049,
       "Wind": 0.0614
     },
     "2023": {
-      "Bioenergy": 0.0151,
-      "Coal": 0.0438,
-      "Gas": 0.1378,
+      "Bioenergy": 0.0161,
+      "Coal": 0.0359,
+      "Gas": 0.1468,
       "Hydro": 0.5833,
       "Nuclear": 0.1376,
-      "Other Fossil": 0.0099,
+      "Other Fossil": 0.0079,
       "Other Renewables": 0.0002,
       "Solar": 0.0076,
       "Wind": 0.0646
     },
     "2024": {
-      "Bioenergy": 0.0161,
-      "Coal": 0.047,
-      "Gas": 0.1479,
+      "Bioenergy": 0.0172,
+      "Coal": 0.0386,
+      "Gas": 0.1575,
       "Hydro": 0.5594,
       "Nuclear": 0.134,
-      "Other Fossil": 0.0105,
+      "Other Fossil": 0.0084,
       "Other Renewables": 0.0005,
       "Solar": 0.0088,
       "Wind": 0.0757
     },
     "2025": {
-      "Bioenergy": 0.0164,
-      "Coal": 0.0473,
-      "Gas": 0.1489,
-      "Hydro": 0.5896,
-      "Nuclear": 0.1066,
-      "Other Fossil": 0.0106,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0042,
-      "Wind": 0.0759
+      "Bioenergy": 0.0161,
+      "Coal": 0.0364,
+      "Gas": 0.1479,
+      "Hydro": 0.5798,
+      "Nuclear": 0.1186,
+      "Other Fossil": 0.0078,
+      "Other Renewables": 0.0007,
+      "Solar": 0.007,
+      "Wind": 0.0859
     }
   },
   "CD": {
@@ -2745,23 +2745,23 @@
       "Bioenergy": 0.0004,
       "Coal": 0.002,
       "Gas": 0.0035,
-      "Hydro": 0.5894,
+      "Hydro": 0.5893,
       "Nuclear": 0.292,
-      "Other Fossil": 0.0396,
+      "Other Fossil": 0.0397,
       "Other Renewables": 0.0001,
       "Solar": 0.0683,
       "Wind": 0.0046
     },
     "2025": {
       "Bioenergy": 0.0023,
-      "Coal": 0.0122,
-      "Gas": 0.0212,
-      "Hydro": 0.432,
-      "Nuclear": 0.3617,
-      "Other Fossil": 0.0505,
+      "Coal": 0.0121,
+      "Gas": 0.021,
+      "Hydro": 0.4615,
+      "Nuclear": 0.3326,
+      "Other Fossil": 0.0498,
       "Other Renewables": 0.0005,
-      "Solar": 0.1067,
-      "Wind": 0.0129
+      "Solar": 0.1075,
+      "Wind": 0.0127
     }
   },
   "CI": {
@@ -2991,14 +2991,14 @@
     },
     "2025": {
       "Bioenergy": 0.0252,
-      "Coal": 0.1577,
-      "Gas": 0.184,
-      "Hydro": 0.2382,
+      "Coal": 0.1628,
+      "Gas": 0.1776,
+      "Hydro": 0.2472,
       "Nuclear": 0,
-      "Other Fossil": 0.0165,
-      "Other Renewables": 0.0015,
-      "Solar": 0.2433,
-      "Wind": 0.1337
+      "Other Fossil": 0.0149,
+      "Other Renewables": 0.0014,
+      "Solar": 0.2374,
+      "Wind": 0.1336
     }
   },
   "CM": {
@@ -3306,15 +3306,15 @@
       "Wind": 0.098
     },
     "2025": {
-      "Bioenergy": 0.0092,
-      "Coal": 0.0005,
-      "Gas": 0.0041,
-      "Hydro": 0.6676,
+      "Bioenergy": 0.0073,
+      "Coal": 0.0006,
+      "Gas": 0.0037,
+      "Hydro": 0.6975,
       "Nuclear": 0.0004,
-      "Other Fossil": 0.033,
-      "Other Renewables": 0.1167,
-      "Solar": 0.0017,
-      "Wind": 0.1668
+      "Other Fossil": 0.0251,
+      "Other Renewables": 0.1145,
+      "Solar": 0.0015,
+      "Wind": 0.1495
     }
   },
   "CU": {
@@ -3548,10 +3548,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.8,
+      "Other Fossil": 0.7689,
       "Other Renewables": 0,
-      "Solar": 0.1636,
-      "Wind": 0.0364
+      "Solar": 0.1912,
+      "Wind": 0.0399
     }
   },
   "CZ": {
@@ -3622,15 +3622,15 @@
       "Wind": 0.0103
     },
     "2025": {
-      "Bioenergy": 0.037,
-      "Coal": 0.3833,
-      "Gas": 0.0637,
-      "Hydro": 0.0257,
-      "Nuclear": 0.385,
-      "Other Fossil": 0.0091,
-      "Other Renewables": 0.0301,
-      "Solar": 0.0589,
-      "Wind": 0.0072
+      "Bioenergy": 0.0379,
+      "Coal": 0.3681,
+      "Gas": 0.0622,
+      "Hydro": 0.0251,
+      "Nuclear": 0.3978,
+      "Other Fossil": 0.0092,
+      "Other Renewables": 0.0306,
+      "Solar": 0.0618,
+      "Wind": 0.0073
     }
   },
   "DE": {
@@ -3701,15 +3701,15 @@
       "Wind": 0.2727
     },
     "2025": {
-      "Bioenergy": 0.0836,
-      "Coal": 0.2432,
-      "Gas": 0.1618,
-      "Hydro": 0.0369,
-      "Nuclear": 0.0075,
-      "Other Fossil": 0.0705,
-      "Other Renewables": 0.0003,
-      "Solar": 0.1652,
-      "Wind": 0.2312
+      "Bioenergy": 0.0829,
+      "Coal": 0.2288,
+      "Gas": 0.1569,
+      "Hydro": 0.0381,
+      "Nuclear": 0.0067,
+      "Other Fossil": 0.0721,
+      "Other Renewables": 0.0002,
+      "Solar": 0.1711,
+      "Wind": 0.2432
     }
   },
   "DJ": {
@@ -3859,15 +3859,15 @@
       "Wind": 0.5431
     },
     "2025": {
-      "Bioenergy": 0.1263,
-      "Coal": 0.1075,
-      "Gas": 0.0985,
-      "Hydro": 0.033,
-      "Nuclear": 0.0382,
-      "Other Fossil": 0.0405,
-      "Other Renewables": 0.0013,
-      "Solar": 0.1105,
-      "Wind": 0.4442
+      "Bioenergy": 0.1149,
+      "Coal": 0.0993,
+      "Gas": 0.0927,
+      "Hydro": 0.0311,
+      "Nuclear": 0.0355,
+      "Other Fossil": 0.0388,
+      "Other Renewables": 0.0012,
+      "Solar": 0.1186,
+      "Wind": 0.468
     }
   },
   "DM": {
@@ -4176,14 +4176,14 @@
     },
     "2025": {
       "Bioenergy": 0.0002,
-      "Coal": 0.0009,
-      "Gas": 0.0347,
-      "Hydro": 0.7139,
-      "Nuclear": 0.0007,
+      "Coal": 0.001,
+      "Gas": 0.0348,
+      "Hydro": 0.7138,
+      "Nuclear": 0.0006,
       "Other Fossil": 0.241,
       "Other Renewables": 0.0002,
       "Solar": 0.0026,
-      "Wind": 0.0058
+      "Wind": 0.0059
     }
   },
   "EE": {
@@ -4254,15 +4254,15 @@
       "Wind": 0.2017
     },
     "2025": {
-      "Bioenergy": 0.0766,
-      "Coal": 0.0419,
-      "Gas": 0.0736,
-      "Hydro": 0.0481,
-      "Nuclear": 0.059,
-      "Other Fossil": 0.359,
-      "Other Renewables": 0.0019,
-      "Solar": 0.1261,
-      "Wind": 0.2139
+      "Bioenergy": 0.0743,
+      "Coal": 0.0425,
+      "Gas": 0.0747,
+      "Hydro": 0.0506,
+      "Nuclear": 0.0609,
+      "Other Fossil": 0.3375,
+      "Other Renewables": 0.002,
+      "Solar": 0.1438,
+      "Wind": 0.2136
     }
   },
   "EG": {
@@ -4491,15 +4491,15 @@
       "Wind": 0.2368
     },
     "2025": {
-      "Bioenergy": 0.0139,
-      "Coal": 0.0106,
-      "Gas": 0.1599,
-      "Hydro": 0.1725,
-      "Nuclear": 0.1985,
-      "Other Fossil": 0.0067,
+      "Bioenergy": 0.0141,
+      "Coal": 0.0103,
+      "Gas": 0.1652,
+      "Hydro": 0.1673,
+      "Nuclear": 0.1986,
+      "Other Fossil": 0.0066,
       "Other Renewables": 0.0024,
-      "Solar": 0.1864,
-      "Wind": 0.2491
+      "Solar": 0.1969,
+      "Wind": 0.2387
     }
   },
   "ET": {
@@ -4649,15 +4649,15 @@
       "Wind": 0.2352
     },
     "2025": {
-      "Bioenergy": 0.1278,
-      "Coal": 0.0236,
-      "Gas": 0.0339,
-      "Hydro": 0.1626,
-      "Nuclear": 0.3076,
-      "Other Fossil": 0.0512,
-      "Other Renewables": 0.0039,
-      "Solar": 0.0198,
-      "Wind": 0.2696
+      "Bioenergy": 0.1238,
+      "Coal": 0.0209,
+      "Gas": 0.0294,
+      "Hydro": 0.1672,
+      "Nuclear": 0.323,
+      "Other Fossil": 0.0491,
+      "Other Renewables": 0.0035,
+      "Solar": 0.0205,
+      "Wind": 0.2626
     }
   },
   "FJ": {
@@ -4965,15 +4965,15 @@
       "Wind": 0.0899
     },
     "2025": {
-      "Bioenergy": 0.0055,
+      "Bioenergy": 0.0056,
       "Coal": 0.003,
-      "Gas": 0.0394,
-      "Hydro": 0.1082,
-      "Nuclear": 0.6968,
-      "Other Fossil": 0.0074,
+      "Gas": 0.0389,
+      "Hydro": 0.1106,
+      "Nuclear": 0.6933,
+      "Other Fossil": 0.0073,
       "Other Renewables": 0,
-      "Solar": 0.048,
-      "Wind": 0.0917
+      "Solar": 0.0499,
+      "Wind": 0.0914
     }
   },
   "GA": {
@@ -5123,15 +5123,15 @@
       "Wind": 0.3204
     },
     "2025": {
-      "Bioenergy": 0.0741,
-      "Coal": 0.0166,
-      "Gas": 0.3666,
-      "Hydro": 0.0319,
-      "Nuclear": 0.1544,
-      "Other Fossil": 0.0184,
+      "Bioenergy": 0.0736,
+      "Coal": 0.0156,
+      "Gas": 0.3546,
+      "Hydro": 0.0311,
+      "Nuclear": 0.1576,
+      "Other Fossil": 0.0186,
       "Other Renewables": 0.0008,
-      "Solar": 0.0738,
-      "Wind": 0.2633
+      "Solar": 0.0761,
+      "Wind": 0.272
     }
   },
   "GD": {
@@ -5281,15 +5281,15 @@
       "Wind": 0.0136
     },
     "2025": {
-      "Bioenergy": 0.005,
-      "Coal": 0.1241,
-      "Gas": 0.2349,
-      "Hydro": 0.5716,
-      "Nuclear": 0.0131,
-      "Other Fossil": 0.0014,
-      "Other Renewables": 0.0013,
-      "Solar": 0.0201,
-      "Wind": 0.0286
+      "Bioenergy": 0.0034,
+      "Coal": 0.0862,
+      "Gas": 0.1727,
+      "Hydro": 0.6913,
+      "Nuclear": 0.0089,
+      "Other Fossil": 0.001,
+      "Other Renewables": 0.0009,
+      "Solar": 0.0135,
+      "Wind": 0.0221
     }
   },
   "GF": {
@@ -5992,15 +5992,15 @@
       "Wind": 0.2196
     },
     "2025": {
-      "Bioenergy": 0.0015,
-      "Coal": 0.0761,
-      "Gas": 0.419,
-      "Hydro": 0.0456,
-      "Nuclear": 0.0099,
-      "Other Fossil": 0.0012,
-      "Other Renewables": 0.0004,
-      "Solar": 0.2367,
-      "Wind": 0.2096
+      "Bioenergy": 0.0009,
+      "Coal": 0.0705,
+      "Gas": 0.4265,
+      "Hydro": 0.0446,
+      "Nuclear": 0.0056,
+      "Other Fossil": 0.0007,
+      "Other Renewables": 0.0002,
+      "Solar": 0.2415,
+      "Wind": 0.2095
     }
   },
   "GT": {
@@ -6387,15 +6387,15 @@
       "Wind": 0.0185
     },
     "2025": {
-      "Bioenergy": 0.0083,
-      "Coal": 0.563,
-      "Gas": 0.3398,
-      "Hydro": 0.0222,
+      "Bioenergy": 0.0081,
+      "Coal": 0.5608,
+      "Gas": 0.3395,
+      "Hydro": 0.023,
       "Nuclear": 0.0145,
-      "Other Fossil": 0.0052,
+      "Other Fossil": 0.0051,
       "Other Renewables": 0.0014,
-      "Solar": 0.0227,
-      "Wind": 0.0229
+      "Solar": 0.0245,
+      "Wind": 0.023
     }
   },
   "HN": {
@@ -6467,13 +6467,13 @@
     },
     "2025": {
       "Bioenergy": 0.1282,
-      "Coal": 0.005,
-      "Gas": 0.0048,
-      "Hydro": 0.2237,
-      "Nuclear": 0.0005,
-      "Other Fossil": 0.4372,
+      "Coal": 0.0051,
+      "Gas": 0.0049,
+      "Hydro": 0.2236,
+      "Nuclear": 0.0004,
+      "Other Fossil": 0.4371,
       "Other Renewables": 0.0264,
-      "Solar": 0.1001,
+      "Solar": 0.1,
       "Wind": 0.0738
     }
   },
@@ -6545,15 +6545,15 @@
       "Wind": 0.1734
     },
     "2025": {
-      "Bioenergy": 0.039,
-      "Coal": 0.0296,
-      "Gas": 0.2151,
-      "Hydro": 0.3633,
-      "Nuclear": 0.0415,
-      "Other Fossil": 0.0114,
-      "Other Renewables": 0.0145,
-      "Solar": 0.0684,
-      "Wind": 0.2172
+      "Bioenergy": 0.0402,
+      "Coal": 0.0334,
+      "Gas": 0.1998,
+      "Hydro": 0.356,
+      "Nuclear": 0.049,
+      "Other Fossil": 0.011,
+      "Other Renewables": 0.0162,
+      "Solar": 0.0812,
+      "Wind": 0.2132
     }
   },
   "HT": {
@@ -6703,15 +6703,15 @@
       "Wind": 0.0448
     },
     "2025": {
-      "Bioenergy": 0.0403,
-      "Coal": 0.0649,
-      "Gas": 0.2117,
-      "Hydro": 0.0383,
-      "Nuclear": 0.3783,
-      "Other Fossil": 0.0174,
+      "Bioenergy": 0.0384,
+      "Coal": 0.0643,
+      "Gas": 0.2043,
+      "Hydro": 0.0387,
+      "Nuclear": 0.3756,
+      "Other Fossil": 0.0173,
       "Other Renewables": 0.0038,
-      "Solar": 0.2062,
-      "Wind": 0.0391
+      "Solar": 0.2191,
+      "Wind": 0.0384
     }
   },
   "ID": {
@@ -6862,14 +6862,14 @@
     },
     "2025": {
       "Bioenergy": 0.0069,
-      "Coal": 0.0481,
-      "Gas": 0.4606,
-      "Hydro": 0.049,
-      "Nuclear": 0.0269,
+      "Coal": 0.0477,
+      "Gas": 0.4598,
+      "Hydro": 0.0494,
+      "Nuclear": 0.0268,
       "Other Fossil": 0.0474,
       "Other Renewables": 0.0009,
-      "Solar": 0.0194,
-      "Wind": 0.3406
+      "Solar": 0.02,
+      "Wind": 0.3409
     }
   },
   "IL": {
@@ -7019,15 +7019,15 @@
       "Wind": 0.0452
     },
     "2025": {
-      "Bioenergy": 0.0107,
-      "Coal": 0.7532,
-      "Gas": 0.011,
-      "Hydro": 0.0591,
-      "Nuclear": 0.0322,
+      "Bioenergy": 0.0094,
+      "Coal": 0.7482,
+      "Gas": 0.0148,
+      "Hydro": 0.0602,
+      "Nuclear": 0.0317,
       "Other Fossil": 0.0017,
-      "Other Renewables": 0.0015,
-      "Solar": 0.0976,
-      "Wind": 0.0331
+      "Other Renewables": 0.0016,
+      "Solar": 0.096,
+      "Wind": 0.0365
     }
   },
   "IQ": {
@@ -7336,14 +7336,14 @@
     },
     "2025": {
       "Bioenergy": 0.0546,
-      "Coal": 0.0388,
-      "Gas": 0.5005,
-      "Hydro": 0.1139,
-      "Nuclear": 0.0348,
+      "Coal": 0.0382,
+      "Gas": 0.4996,
+      "Hydro": 0.1144,
+      "Nuclear": 0.0347,
       "Other Fossil": 0.0301,
       "Other Renewables": 0.0191,
-      "Solar": 0.0811,
-      "Wind": 0.1272
+      "Solar": 0.0818,
+      "Wind": 0.1275
     }
   },
   "JM": {
@@ -7572,15 +7572,15 @@
       "Wind": 0.0198
     },
     "2025": {
-      "Bioenergy": 0.0662,
-      "Coal": 0.301,
-      "Gas": 0.3055,
-      "Hydro": 0.0554,
-      "Nuclear": 0.1018,
-      "Other Fossil": 0.0321,
+      "Bioenergy": 0.066,
+      "Coal": 0.2811,
+      "Gas": 0.2977,
+      "Hydro": 0.0674,
+      "Nuclear": 0.102,
+      "Other Fossil": 0.0304,
       "Other Renewables": 0.0107,
-      "Solar": 0.0991,
-      "Wind": 0.0281
+      "Solar": 0.114,
+      "Wind": 0.0305
     }
   },
   "KE": {
@@ -7731,13 +7731,13 @@
     },
     "2025": {
       "Bioenergy": 0.0016,
-      "Coal": 0.099,
-      "Gas": 0.0157,
-      "Hydro": 0.84,
+      "Coal": 0.0984,
+      "Gas": 0.0156,
+      "Hydro": 0.8402,
       "Nuclear": 0.0043,
       "Other Fossil": 0.0254,
       "Other Renewables": 0.0004,
-      "Solar": 0.0067,
+      "Solar": 0.0072,
       "Wind": 0.0069
     }
   },
@@ -7805,18 +7805,18 @@
       "Nuclear": 0.0132,
       "Other Fossil": 0.0552,
       "Other Renewables": 0.0013,
-      "Solar": 0.0294,
+      "Solar": 0.0295,
       "Wind": 0.0186
     },
     "2025": {
-      "Bioenergy": 0.0138,
-      "Coal": 0.4618,
-      "Gas": 0.0248,
-      "Hydro": 0.3727,
+      "Bioenergy": 0.0136,
+      "Coal": 0.4596,
+      "Gas": 0.0246,
+      "Hydro": 0.3736,
       "Nuclear": 0.0146,
       "Other Fossil": 0.0552,
       "Other Renewables": 0.0014,
-      "Solar": 0.0324,
+      "Solar": 0.0342,
       "Wind": 0.0231
     }
   },
@@ -8285,10 +8285,10 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.5833,
+      "Gas": 0.5837,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.4167,
+      "Other Fossil": 0.4163,
       "Other Renewables": 0,
       "Solar": 0,
       "Wind": 0
@@ -8994,15 +8994,15 @@
       "Wind": 0.3148
     },
     "2025": {
-      "Bioenergy": 0.0204,
-      "Coal": 0.0356,
-      "Gas": 0.243,
-      "Hydro": 0.0616,
-      "Nuclear": 0.0484,
-      "Other Fossil": 0.1094,
+      "Bioenergy": 0.0206,
+      "Coal": 0.0368,
+      "Gas": 0.2457,
+      "Hydro": 0.0642,
+      "Nuclear": 0.0509,
+      "Other Fossil": 0.109,
       "Other Renewables": 0.0016,
-      "Solar": 0.1268,
-      "Wind": 0.3532
+      "Solar": 0.1358,
+      "Wind": 0.3352
     }
   },
   "LU": {
@@ -9073,15 +9073,15 @@
       "Wind": 0.1858
     },
     "2025": {
-      "Bioenergy": 0.0736,
-      "Coal": 0.1006,
-      "Gas": 0.2008,
-      "Hydro": 0.1332,
-      "Nuclear": 0.1434,
-      "Other Fossil": 0.0408,
+      "Bioenergy": 0.0732,
+      "Coal": 0.0983,
+      "Gas": 0.1916,
+      "Hydro": 0.1343,
+      "Nuclear": 0.1424,
+      "Other Fossil": 0.0407,
       "Other Renewables": 0.0048,
-      "Solar": 0.1298,
-      "Wind": 0.1731
+      "Solar": 0.1366,
+      "Wind": 0.1782
     }
   },
   "LV": {
@@ -9152,15 +9152,15 @@
       "Wind": 0.0675
     },
     "2025": {
-      "Bioenergy": 0.0615,
+      "Bioenergy": 0.0617,
       "Coal": 0.0161,
-      "Gas": 0.3072,
-      "Hydro": 0.4384,
-      "Nuclear": 0.0247,
-      "Other Fossil": 0.0162,
+      "Gas": 0.294,
+      "Hydro": 0.4502,
+      "Nuclear": 0.0259,
+      "Other Fossil": 0.0097,
       "Other Renewables": 0.0009,
-      "Solar": 0.088,
-      "Wind": 0.047
+      "Solar": 0.0965,
+      "Wind": 0.045
     }
   },
   "LY": {
@@ -9378,26 +9378,26 @@
       "Wind": 0.0094
     },
     "2024": {
-      "Bioenergy": 0.0014,
-      "Coal": 0.0072,
-      "Gas": 0.8982,
-      "Hydro": 0.0498,
-      "Nuclear": 0.0102,
-      "Other Fossil": 0.0011,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0092,
-      "Wind": 0.0226
+      "Bioenergy": 0.0009,
+      "Coal": 0.0046,
+      "Gas": 0.9136,
+      "Hydro": 0.0477,
+      "Nuclear": 0.0067,
+      "Other Fossil": 0.0007,
+      "Other Renewables": 0.0002,
+      "Solar": 0.0125,
+      "Wind": 0.0132
     },
     "2025": {
-      "Bioenergy": 0.0039,
-      "Coal": 0.0185,
-      "Gas": 0.8402,
-      "Hydro": 0.0607,
-      "Nuclear": 0.0267,
-      "Other Fossil": 0.0032,
-      "Other Renewables": 0.0009,
-      "Solar": 0.0105,
-      "Wind": 0.0353
+      "Bioenergy": 0.0006,
+      "Coal": 0.0028,
+      "Gas": 0.9216,
+      "Hydro": 0.0452,
+      "Nuclear": 0.0041,
+      "Other Fossil": 0.0005,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0226,
+      "Wind": 0.0025
     }
   },
   "ME": {
@@ -9468,15 +9468,15 @@
       "Wind": 0.0916
     },
     "2025": {
-      "Bioenergy": 0.0111,
-      "Coal": 0.2576,
-      "Gas": 0.0835,
-      "Hydro": 0.4066,
-      "Nuclear": 0.0721,
-      "Other Fossil": 0.0084,
-      "Other Renewables": 0.0026,
+      "Bioenergy": 0.0105,
+      "Coal": 0.2693,
+      "Gas": 0.0766,
+      "Hydro": 0.4016,
+      "Nuclear": 0.0684,
+      "Other Fossil": 0.0081,
+      "Other Renewables": 0.0024,
       "Solar": 0.0379,
-      "Wind": 0.1202
+      "Wind": 0.1253
     }
   },
   "MG": {
@@ -9627,14 +9627,14 @@
     },
     "2025": {
       "Bioenergy": 0.0093,
-      "Coal": 0.3962,
-      "Gas": 0.2687,
-      "Hydro": 0.1766,
-      "Nuclear": 0.0468,
+      "Coal": 0.3956,
+      "Gas": 0.2675,
+      "Hydro": 0.1772,
+      "Nuclear": 0.0467,
       "Other Fossil": 0.0055,
       "Other Renewables": 0.0016,
-      "Solar": 0.0423,
-      "Wind": 0.053
+      "Solar": 0.0432,
+      "Wind": 0.0534
     }
   },
   "ML": {
@@ -9934,23 +9934,23 @@
       "Bioenergy": 0.0557,
       "Coal": 0.4675,
       "Gas": 0.1613,
-      "Hydro": 0.1032,
+      "Hydro": 0.1031,
       "Nuclear": 0.0448,
       "Other Fossil": 0.0341,
       "Other Renewables": 0.0045,
       "Solar": 0.066,
-      "Wind": 0.0629
+      "Wind": 0.063
     },
     "2025": {
-      "Bioenergy": 0.0563,
-      "Coal": 0.4636,
-      "Gas": 0.1614,
-      "Hydro": 0.0756,
-      "Nuclear": 0.0495,
-      "Other Fossil": 0.0344,
-      "Other Renewables": 0.0048,
-      "Solar": 0.0761,
-      "Wind": 0.0782
+      "Bioenergy": 0.0557,
+      "Coal": 0.4562,
+      "Gas": 0.1606,
+      "Hydro": 0.0786,
+      "Nuclear": 0.0494,
+      "Other Fossil": 0.0342,
+      "Other Renewables": 0.0049,
+      "Solar": 0.0821,
+      "Wind": 0.0783
     }
   },
   "MQ": {
@@ -10259,14 +10259,14 @@
     },
     "2025": {
       "Bioenergy": 0.0074,
-      "Coal": 0.0348,
-      "Gas": 0.6589,
-      "Hydro": 0.0423,
-      "Nuclear": 0.0504,
-      "Other Fossil": 0.0296,
+      "Coal": 0.034,
+      "Gas": 0.6574,
+      "Hydro": 0.043,
+      "Nuclear": 0.0503,
+      "Other Fossil": 0.0297,
       "Other Renewables": 0.0017,
-      "Solar": 0.1445,
-      "Wind": 0.0304
+      "Solar": 0.1456,
+      "Wind": 0.0309
     }
   },
   "MU": {
@@ -10575,22 +10575,22 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0491,
-      "Gas": 0.5952,
-      "Hydro": 0.055,
-      "Nuclear": 0.0422,
-      "Other Fossil": 0.1153,
-      "Other Renewables": 0.0119,
-      "Solar": 0.0531,
-      "Wind": 0.0778
+      "Coal": 0.0613,
+      "Gas": 0.6035,
+      "Hydro": 0.0618,
+      "Nuclear": 0.0316,
+      "Other Fossil": 0.097,
+      "Other Renewables": 0.0107,
+      "Solar": 0.0586,
+      "Wind": 0.0752
     }
   },
   "MY": {
     "2019": {
       "Bioenergy": 0.0249,
-      "Coal": 0.428,
-      "Gas": 0.3843,
-      "Hydro": 0.1549,
+      "Coal": 0.4281,
+      "Gas": 0.3844,
+      "Hydro": 0.1548,
       "Nuclear": 0,
       "Other Fossil": 0.0041,
       "Other Renewables": 0,
@@ -10642,25 +10642,25 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.0247,
-      "Coal": 0.4322,
-      "Gas": 0.341,
-      "Hydro": 0.1815,
+      "Bioenergy": 0.0236,
+      "Coal": 0.4377,
+      "Gas": 0.3434,
+      "Hydro": 0.1746,
       "Nuclear": 0,
-      "Other Fossil": 0.0044,
+      "Other Fossil": 0.0043,
       "Other Renewables": 0,
-      "Solar": 0.0162,
+      "Solar": 0.0164,
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0256,
-      "Coal": 0.4496,
-      "Gas": 0.3172,
-      "Hydro": 0.1843,
+      "Bioenergy": 0.0242,
+      "Coal": 0.4513,
+      "Gas": 0.3207,
+      "Hydro": 0.18,
       "Nuclear": 0,
-      "Other Fossil": 0.0045,
+      "Other Fossil": 0.0051,
       "Other Renewables": 0,
-      "Solar": 0.0189,
+      "Solar": 0.0187,
       "Wind": 0
     }
   },
@@ -11127,14 +11127,14 @@
       "Wind": 0.154
     },
     "2025": {
-      "Bioenergy": 0.1682,
-      "Coal": 0.0025,
-      "Gas": 0.0188,
-      "Hydro": 0.0875,
-      "Nuclear": 0.0019,
-      "Other Fossil": 0.3981,
+      "Bioenergy": 0.1683,
+      "Coal": 0.0029,
+      "Gas": 0.0193,
+      "Hydro": 0.0871,
+      "Nuclear": 0.0017,
+      "Other Fossil": 0.398,
       "Other Renewables": 0.1562,
-      "Solar": 0.0135,
+      "Solar": 0.0133,
       "Wind": 0.1533
     }
   },
@@ -11206,15 +11206,15 @@
       "Wind": 0.2732
     },
     "2025": {
-      "Bioenergy": 0.0667,
-      "Coal": 0.1115,
-      "Gas": 0.4006,
+      "Bioenergy": 0.0669,
+      "Coal": 0.1025,
+      "Gas": 0.3754,
       "Hydro": 0.0009,
-      "Nuclear": 0.0199,
-      "Other Fossil": 0.0097,
+      "Nuclear": 0.0241,
+      "Other Fossil": 0.0099,
       "Other Renewables": 0.0044,
-      "Solar": 0.1939,
-      "Wind": 0.1926
+      "Solar": 0.1964,
+      "Wind": 0.2195
     }
   },
   "NO": {
@@ -11287,13 +11287,13 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.0073,
-      "Hydro": 0.9067,
+      "Gas": 0.0066,
+      "Hydro": 0.9059,
       "Nuclear": 0,
       "Other Fossil": 0.001,
-      "Other Renewables": 0.0025,
+      "Other Renewables": 0.0026,
       "Solar": 0,
-      "Wind": 0.0825
+      "Wind": 0.084
     }
   },
   "NP": {
@@ -11364,14 +11364,14 @@
       "Wind": 0.0166
     },
     "2025": {
-      "Bioenergy": 0.0045,
-      "Coal": 0.113,
-      "Gas": 0.0205,
-      "Hydro": 0.7984,
-      "Nuclear": 0.0121,
-      "Other Fossil": 0.0013,
+      "Bioenergy": 0.0044,
+      "Coal": 0.1112,
+      "Gas": 0.0203,
+      "Hydro": 0.7991,
+      "Nuclear": 0.012,
+      "Other Fossil": 0.0012,
       "Other Renewables": 0.0012,
-      "Solar": 0.0288,
+      "Solar": 0.0303,
       "Wind": 0.0203
     }
   },
@@ -12154,15 +12154,15 @@
       "Wind": 0.0244
     },
     "2025": {
-      "Bioenergy": 0.0088,
-      "Coal": 0.1377,
-      "Gas": 0.1975,
-      "Hydro": 0.1764,
-      "Nuclear": 0.2008,
-      "Other Fossil": 0.0023,
+      "Bioenergy": 0.0053,
+      "Coal": 0.1751,
+      "Gas": 0.2197,
+      "Hydro": 0.149,
+      "Nuclear": 0.1715,
+      "Other Fossil": 0.0046,
       "Other Renewables": 0,
-      "Solar": 0.2577,
-      "Wind": 0.0189
+      "Solar": 0.2478,
+      "Wind": 0.0269
     }
   },
   "PL": {
@@ -12233,15 +12233,15 @@
       "Wind": 0.1507
     },
     "2025": {
-      "Bioenergy": 0.0195,
-      "Coal": 0.5372,
-      "Gas": 0.1257,
-      "Hydro": 0.0098,
-      "Nuclear": 0,
-      "Other Fossil": 0.0564,
-      "Other Renewables": 0.0022,
-      "Solar": 0.11,
-      "Wind": 0.1393
+      "Bioenergy": 0.0196,
+      "Coal": 0.5331,
+      "Gas": 0.1236,
+      "Hydro": 0.0108,
+      "Nuclear": 0.0011,
+      "Other Fossil": 0.0557,
+      "Other Renewables": 0.0024,
+      "Solar": 0.1153,
+      "Wind": 0.1385
     }
   },
   "PM": {
@@ -12392,14 +12392,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.1672,
-      "Gas": 0.4085,
+      "Coal": 0.2291,
+      "Gas": 0.393,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.3909,
+      "Other Fossil": 0.3512,
       "Other Renewables": 0,
-      "Solar": 0.0159,
-      "Wind": 0.0176
+      "Solar": 0.0151,
+      "Wind": 0.0117
     }
   },
   "PS": {
@@ -12549,15 +12549,15 @@
       "Wind": 0.3021
     },
     "2025": {
-      "Bioenergy": 0.0552,
-      "Coal": 0.0084,
-      "Gas": 0.1247,
-      "Hydro": 0.3812,
-      "Nuclear": 0.0116,
-      "Other Fossil": 0.0046,
+      "Bioenergy": 0.055,
+      "Coal": 0.0093,
+      "Gas": 0.1406,
+      "Hydro": 0.3681,
+      "Nuclear": 0.0132,
+      "Other Fossil": 0.0052,
       "Other Renewables": 0.0004,
-      "Solar": 0.1008,
-      "Wind": 0.3132
+      "Solar": 0.1166,
+      "Wind": 0.2916
     }
   },
   "PY": {
@@ -12865,15 +12865,15 @@
       "Wind": 0.1188
     },
     "2025": {
-      "Bioenergy": 0.0112,
-      "Coal": 0.1343,
-      "Gas": 0.1815,
-      "Hydro": 0.2364,
-      "Nuclear": 0.2189,
-      "Other Fossil": 0.0021,
+      "Bioenergy": 0.011,
+      "Coal": 0.1344,
+      "Gas": 0.1881,
+      "Hydro": 0.2405,
+      "Nuclear": 0.2051,
+      "Other Fossil": 0.002,
       "Other Renewables": 0.0006,
-      "Solar": 0.0882,
-      "Wind": 0.1268
+      "Solar": 0.0924,
+      "Wind": 0.1259
     }
   },
   "RS": {
@@ -12944,15 +12944,15 @@
       "Wind": 0.0375
     },
     "2025": {
-      "Bioenergy": 0.0076,
-      "Coal": 0.5883,
-      "Gas": 0.0533,
-      "Hydro": 0.2956,
-      "Nuclear": 0.0025,
-      "Other Fossil": 0.0069,
-      "Other Renewables": 0.0001,
-      "Solar": 0.001,
-      "Wind": 0.0447
+      "Bioenergy": 0.0081,
+      "Coal": 0.5885,
+      "Gas": 0.0587,
+      "Hydro": 0.2852,
+      "Nuclear": 0.0053,
+      "Other Fossil": 0.0073,
+      "Other Renewables": 0.0002,
+      "Solar": 0.0031,
+      "Wind": 0.0437
     }
   },
   "RU": {
@@ -13024,14 +13024,14 @@
     },
     "2025": {
       "Bioenergy": 0.0008,
-      "Coal": 0.1986,
-      "Gas": 0.48,
-      "Hydro": 0.1377,
-      "Nuclear": 0.1665,
-      "Other Fossil": 0.0115,
+      "Coal": 0.1946,
+      "Gas": 0.4694,
+      "Hydro": 0.1462,
+      "Nuclear": 0.1728,
+      "Other Fossil": 0.0113,
       "Other Renewables": 0,
-      "Solar": 0.0011,
-      "Wind": 0.0038
+      "Solar": 0.0014,
+      "Wind": 0.0035
     }
   },
   "RW": {
@@ -13497,15 +13497,15 @@
       "Wind": 0.2507
     },
     "2025": {
-      "Bioenergy": 0.0416,
+      "Bioenergy": 0.0414,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4123,
-      "Nuclear": 0.2898,
+      "Hydro": 0.4035,
+      "Nuclear": 0.2876,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0103,
-      "Wind": 0.246
+      "Solar": 0.0113,
+      "Wind": 0.2562
     }
   },
   "SG": {
@@ -13734,14 +13734,14 @@
       "Wind": 0.0022
     },
     "2025": {
-      "Bioenergy": 0.0077,
-      "Coal": 0.1864,
-      "Gas": 0.0476,
-      "Hydro": 0.2593,
-      "Nuclear": 0.3808,
+      "Bioenergy": 0.0078,
+      "Coal": 0.1655,
+      "Gas": 0.0523,
+      "Hydro": 0.2714,
+      "Nuclear": 0.3869,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.1175,
+      "Solar": 0.1155,
       "Wind": 0.0006
     }
   },
@@ -13813,14 +13813,14 @@
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0326,
+      "Bioenergy": 0.0325,
       "Coal": 0.0025,
-      "Gas": 0.1041,
-      "Hydro": 0.0992,
-      "Nuclear": 0.6733,
-      "Other Fossil": 0.0522,
-      "Other Renewables": 0.0171,
-      "Solar": 0.019,
+      "Gas": 0.1003,
+      "Hydro": 0.0987,
+      "Nuclear": 0.6799,
+      "Other Fossil": 0.0494,
+      "Other Renewables": 0.017,
+      "Solar": 0.0197,
       "Wind": 0
     }
   },
@@ -14840,15 +14840,15 @@
       "Wind": 0.0268
     },
     "2025": {
-      "Bioenergy": 0.0639,
-      "Coal": 0.2235,
-      "Gas": 0.5652,
-      "Hydro": 0.0545,
-      "Nuclear": 0.0079,
-      "Other Fossil": 0.0013,
-      "Other Renewables": 0.0008,
-      "Solar": 0.05,
-      "Wind": 0.0329
+      "Bioenergy": 0.0629,
+      "Coal": 0.2185,
+      "Gas": 0.5872,
+      "Hydro": 0.0501,
+      "Nuclear": 0.007,
+      "Other Fossil": 0.0008,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0475,
+      "Wind": 0.0252
     }
   },
   "TJ": {
@@ -15314,15 +15314,15 @@
       "Wind": 0.107
     },
     "2025": {
-      "Bioenergy": 0.025,
-      "Coal": 0.3215,
-      "Gas": 0.2124,
-      "Hydro": 0.207,
-      "Nuclear": 0.0002,
-      "Other Fossil": 0.0033,
-      "Other Renewables": 0.034,
-      "Solar": 0.0894,
-      "Wind": 0.1072
+      "Bioenergy": 0.0252,
+      "Coal": 0.3233,
+      "Gas": 0.2093,
+      "Hydro": 0.2065,
+      "Nuclear": 0.0003,
+      "Other Fossil": 0.0031,
+      "Other Renewables": 0.0333,
+      "Solar": 0.0926,
+      "Wind": 0.1064
     }
   },
   "TT": {
@@ -15450,37 +15450,37 @@
       "Wind": 0.0125
     },
     "2023": {
-      "Bioenergy": 0.0008,
-      "Coal": 0.4268,
-      "Gas": 0.3998,
+      "Bioenergy": 0.0009,
+      "Coal": 0.4266,
+      "Gas": 0.3996,
       "Hydro": 0.0142,
       "Nuclear": 0.0637,
-      "Other Fossil": 0.0261,
+      "Other Fossil": 0.0265,
       "Other Renewables": 0,
       "Solar": 0.0462,
       "Wind": 0.0223
     },
     "2024": {
       "Bioenergy": 0.0008,
-      "Coal": 0.397,
-      "Gas": 0.4291,
+      "Coal": 0.3961,
+      "Gas": 0.4283,
       "Hydro": 0.0147,
-      "Nuclear": 0.0426,
+      "Nuclear": 0.0425,
       "Other Fossil": 0.0274,
       "Other Renewables": 0,
-      "Solar": 0.0522,
-      "Wind": 0.0362
+      "Solar": 0.0534,
+      "Wind": 0.0368
     },
     "2025": {
       "Bioenergy": 0.0009,
-      "Coal": 0.3426,
-      "Gas": 0.4632,
-      "Hydro": 0.0158,
-      "Nuclear": 0.0337,
-      "Other Fossil": 0.0294,
+      "Coal": 0.3538,
+      "Gas": 0.4606,
+      "Hydro": 0.0169,
+      "Nuclear": 0.0333,
+      "Other Fossil": 0.0291,
       "Other Renewables": 0,
-      "Solar": 0.0489,
-      "Wind": 0.0655
+      "Solar": 0.05,
+      "Wind": 0.0553
     }
   },
   "TZ": {
@@ -15788,15 +15788,15 @@
       "Wind": 0.1035
     },
     "2025": {
-      "Bioenergy": 0.0105,
-      "Coal": 0.1633,
-      "Gas": 0.362,
-      "Hydro": 0.0623,
-      "Nuclear": 0.1775,
-      "Other Fossil": 0.0082,
+      "Bioenergy": 0.0106,
+      "Coal": 0.1624,
+      "Gas": 0.3707,
+      "Hydro": 0.0611,
+      "Nuclear": 0.1774,
+      "Other Fossil": 0.0075,
       "Other Renewables": 0.0042,
-      "Solar": 0.0826,
-      "Wind": 0.1296
+      "Solar": 0.0834,
+      "Wind": 0.1227
     }
   },
   "UY": {
@@ -15867,15 +15867,15 @@
       "Wind": 0.3322
     },
     "2025": {
-      "Bioenergy": 0.1553,
-      "Coal": 0.003,
-      "Gas": 0.0405,
-      "Hydro": 0.3889,
-      "Nuclear": 0.0023,
-      "Other Fossil": 0.0159,
-      "Other Renewables": 0.0006,
-      "Solar": 0.0511,
-      "Wind": 0.3424
+      "Bioenergy": 0.146,
+      "Coal": 0.0027,
+      "Gas": 0.0361,
+      "Hydro": 0.413,
+      "Nuclear": 0.0017,
+      "Other Fossil": 0.0144,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0463,
+      "Wind": 0.3393
     }
   },
   "UZ": {
@@ -15947,13 +15947,13 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0698,
+      "Coal": 0.0697,
       "Gas": 0.8122,
-      "Hydro": 0.1013,
+      "Hydro": 0.1014,
       "Nuclear": 0.0012,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
-      "Solar": 0.002,
+      "Solar": 0.0021,
       "Wind": 0.0018
     }
   },
@@ -16342,14 +16342,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5906,
-      "Gas": 0.0682,
-      "Hydro": 0.1852,
+      "Coal": 0.5885,
+      "Gas": 0.0748,
+      "Hydro": 0.1885,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.097,
-      "Wind": 0.059
+      "Solar": 0.0971,
+      "Wind": 0.0511
     }
   },
   "VU": {
@@ -16578,15 +16578,15 @@
       "Wind": 0.0647
     },
     "2025": {
-      "Bioenergy": 0.0088,
-      "Coal": 0.6947,
-      "Gas": 0.0731,
-      "Hydro": 0.0651,
-      "Nuclear": 0.0597,
-      "Other Fossil": 0.007,
-      "Other Renewables": 0.002,
-      "Solar": 0.023,
-      "Wind": 0.0665
+      "Bioenergy": 0.006,
+      "Coal": 0.7389,
+      "Gas": 0.0521,
+      "Hydro": 0.0669,
+      "Nuclear": 0.0417,
+      "Other Fossil": 0.0048,
+      "Other Renewables": 0.0014,
+      "Solar": 0.0133,
+      "Wind": 0.075
     }
   },
   "YE": {