@digital4better/data 1.3.23 → 1.3.24

package/data/mix/country-yearly.json

@@ -143,18 +143,18 @@
       "Other Fossil": 0.02,
       "Other Renewables": 0.004,
       "Solar": 0.0689,
-      "Wind": 0.0567
+      "Wind": 0.0568
     },
     "2025": {
-      "Bioenergy": 0.0157,
-      "Coal": 0.4135,
-      "Gas": 0.0726,
-      "Hydro": 0.2859,
-      "Nuclear": 0.0405,
+      "Bioenergy": 0.0156,
+      "Coal": 0.4102,
+      "Gas": 0.0725,
+      "Hydro": 0.2888,
+      "Nuclear": 0.0401,
       "Other Fossil": 0.0202,
-      "Other Renewables": 0.0039,
-      "Solar": 0.0888,
-      "Wind": 0.059
+      "Other Renewables": 0.004,
+      "Solar": 0.0886,
+      "Wind": 0.06
     }
   },
   "AG": {
@@ -239,9 +239,9 @@
   "AL": {
     "2019": {
       "Bioenergy": 0.0088,
-      "Coal": 0.0527,
+      "Coal": 0.0528,
       "Gas": 0.082,
-      "Hydro": 0.7338,
+      "Hydro": 0.7337,
       "Nuclear": 0.0718,
       "Other Fossil": 0.0068,
       "Other Renewables": 0.0025,
@@ -252,7 +252,7 @@
       "Bioenergy": 0.0093,
       "Coal": 0.0467,
       "Gas": 0.0797,
-      "Hydro": 0.7387,
+      "Hydro": 0.7386,
       "Nuclear": 0.0682,
       "Other Fossil": 0.0066,
       "Other Renewables": 0.0027,
@@ -261,20 +261,20 @@
     },
     "2021": {
       "Bioenergy": 0.0095,
-      "Coal": 0.0489,
+      "Coal": 0.049,
       "Gas": 0.081,
-      "Hydro": 0.7351,
-      "Nuclear": 0.0692,
+      "Hydro": 0.735,
+      "Nuclear": 0.0693,
       "Other Fossil": 0.0066,
       "Other Renewables": 0.0026,
-      "Solar": 0.0155,
+      "Solar": 0.0156,
       "Wind": 0.0315
     },
     "2022": {
       "Bioenergy": 0.0096,
       "Coal": 0.0523,
-      "Gas": 0.0816,
-      "Hydro": 0.7301,
+      "Gas": 0.0817,
+      "Hydro": 0.73,
       "Nuclear": 0.0619,
       "Other Fossil": 0.0068,
       "Other Renewables": 0.0026,
@@ -305,14 +305,14 @@
     },
     "2025": {
       "Bioenergy": 0.0087,
-      "Coal": 0.0389,
-      "Gas": 0.0718,
-      "Hydro": 0.7333,
+      "Coal": 0.0392,
+      "Gas": 0.0725,
+      "Hydro": 0.733,
       "Nuclear": 0.0631,
       "Other Fossil": 0.0063,
       "Other Renewables": 0.0026,
-      "Solar": 0.037,
-      "Wind": 0.0382
+      "Solar": 0.0358,
+      "Wind": 0.0388
     }
   },
   "AM": {
@@ -384,14 +384,14 @@
     },
     "2025": {
       "Bioenergy": 0.0006,
-      "Coal": 0.0155,
+      "Coal": 0.0152,
       "Gas": 0.3134,
-      "Hydro": 0.3381,
+      "Hydro": 0.3383,
       "Nuclear": 0.2267,
       "Other Fossil": 0.0002,
       "Other Renewables": 0.0001,
       "Solar": 0.1035,
-      "Wind": 0.0019
+      "Wind": 0.002
     }
   },
   "AO": {
@@ -542,14 +542,14 @@
     },
     "2025": {
       "Bioenergy": 0.011,
-      "Coal": 0.0237,
-      "Gas": 0.5105,
-      "Hydro": 0.216,
-      "Nuclear": 0.0729,
-      "Other Fossil": 0.0091,
+      "Coal": 0.02,
+      "Gas": 0.4997,
+      "Hydro": 0.2243,
+      "Nuclear": 0.0737,
+      "Other Fossil": 0.0089,
       "Other Renewables": 0.0002,
-      "Solar": 0.0324,
-      "Wind": 0.1244
+      "Solar": 0.0343,
+      "Wind": 0.128
     }
   },
   "AS": {
@@ -680,7 +680,7 @@
       "Bioenergy": 0.0228,
       "Coal": 0.0097,
       "Gas": 0.1131,
-      "Hydro": 0.6132,
+      "Hydro": 0.6131,
       "Nuclear": 0.0122,
       "Other Fossil": 0.0171,
       "Other Renewables": 0.0005,
@@ -699,15 +699,15 @@
       "Wind": 0.1338
     },
     "2025": {
-      "Bioenergy": 0.0277,
-      "Coal": 0.0088,
-      "Gas": 0.0986,
-      "Hydro": 0.5503,
-      "Nuclear": 0.0129,
-      "Other Fossil": 0.0165,
-      "Other Renewables": 0.0005,
-      "Solar": 0.1623,
-      "Wind": 0.1225
+      "Bioenergy": 0.0272,
+      "Coal": 0.0071,
+      "Gas": 0.0948,
+      "Hydro": 0.5651,
+      "Nuclear": 0.01,
+      "Other Fossil": 0.0161,
+      "Other Renewables": 0.0004,
+      "Solar": 0.1596,
+      "Wind": 0.1198
     }
   },
   "AU": {
@@ -778,15 +778,15 @@
       "Wind": 0.1343
     },
     "2025": {
-      "Bioenergy": 0.0018,
-      "Coal": 0.5146,
-      "Gas": 0.0717,
+      "Bioenergy": 0.0019,
+      "Coal": 0.5129,
+      "Gas": 0.0715,
       "Hydro": 0.0542,
       "Nuclear": 0,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.1985,
-      "Wind": 0.1591
+      "Solar": 0.2021,
+      "Wind": 0.1574
     }
   },
   "AW": {
@@ -1016,14 +1016,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.6119,
+      "Coal": 0.6135,
       "Gas": 0,
-      "Hydro": 0.3192,
+      "Hydro": 0.3204,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0547,
-      "Wind": 0.0142
+      "Solar": 0.0509,
+      "Wind": 0.0152
     }
   },
   "BB": {
@@ -1173,15 +1173,15 @@
       "Wind": 0.0115
     },
     "2025": {
-      "Bioenergy": 0.0033,
-      "Coal": 0.3545,
-      "Gas": 0.4474,
-      "Hydro": 0.0282,
-      "Nuclear": 0.0084,
-      "Other Fossil": 0.116,
+      "Bioenergy": 0.0032,
+      "Coal": 0.3548,
+      "Gas": 0.4406,
+      "Hydro": 0.0287,
+      "Nuclear": 0.0083,
+      "Other Fossil": 0.1219,
       "Other Renewables": 0.0008,
       "Solar": 0.0292,
-      "Wind": 0.0122
+      "Wind": 0.0124
     }
   },
   "BE": {
@@ -1252,15 +1252,15 @@
       "Wind": 0.1773
     },
     "2025": {
-      "Bioenergy": 0.0162,
-      "Coal": 0.0202,
-      "Gas": 0.1818,
-      "Hydro": 0.0289,
-      "Nuclear": 0.3235,
-      "Other Fossil": 0.0979,
-      "Other Renewables": 0.0013,
-      "Solar": 0.1704,
-      "Wind": 0.1598
+      "Bioenergy": 0.0154,
+      "Coal": 0.0209,
+      "Gas": 0.1944,
+      "Hydro": 0.0294,
+      "Nuclear": 0.3209,
+      "Other Fossil": 0.1012,
+      "Other Renewables": 0.0014,
+      "Solar": 0.1618,
+      "Wind": 0.1547
     }
   },
   "BF": {
@@ -1411,14 +1411,14 @@
     },
     "2025": {
       "Bioenergy": 0.0033,
-      "Coal": 0.2422,
-      "Gas": 0.0475,
-      "Hydro": 0.066,
-      "Nuclear": 0.4165,
+      "Coal": 0.2504,
+      "Gas": 0.0483,
+      "Hydro": 0.067,
+      "Nuclear": 0.4152,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.1929,
-      "Wind": 0.0315
+      "Solar": 0.1839,
+      "Wind": 0.0319
     }
   },
   "BH": {
@@ -1884,15 +1884,15 @@
       "Wind": 0.0419
     },
     "2025": {
-      "Bioenergy": 0.0104,
+      "Bioenergy": 0.0123,
       "Coal": 0,
-      "Gas": 0.6333,
-      "Hydro": 0.301,
+      "Gas": 0.6421,
+      "Hydro": 0.2914,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0302,
-      "Wind": 0.025
+      "Solar": 0.0296,
+      "Wind": 0.0245
     }
   },
   "BR": {
@@ -1963,15 +1963,15 @@
       "Wind": 0.1533
     },
     "2025": {
-      "Bioenergy": 0.0107,
+      "Bioenergy": 0.0101,
       "Coal": 0.0134,
-      "Gas": 0.0658,
-      "Hydro": 0.5824,
+      "Gas": 0.0683,
+      "Hydro": 0.5822,
       "Nuclear": 0.0222,
-      "Other Fossil": 0.0103,
+      "Other Fossil": 0.0101,
       "Other Renewables": 0,
-      "Solar": 0.1257,
-      "Wind": 0.1695
+      "Solar": 0.1264,
+      "Wind": 0.1673
     }
   },
   "BS": {
@@ -2358,15 +2358,15 @@
       "Wind": 0.0412
     },
     "2025": {
-      "Bioenergy": 0.1708,
-      "Coal": 0.0176,
-      "Gas": 0.1057,
-      "Hydro": 0.5052,
+      "Bioenergy": 0.1705,
+      "Coal": 0.0171,
+      "Gas": 0.1035,
+      "Hydro": 0.5072,
       "Nuclear": 0.0088,
       "Other Fossil": 0.1004,
-      "Other Renewables": 0.0021,
-      "Solar": 0.0453,
-      "Wind": 0.0441
+      "Other Renewables": 0.0022,
+      "Solar": 0.0459,
+      "Wind": 0.0444
     }
   },
   "CA": {
@@ -2437,15 +2437,15 @@
       "Wind": 0.0757
     },
     "2025": {
-      "Bioenergy": 0.0175,
-      "Coal": 0.0394,
-      "Gas": 0.1606,
-      "Hydro": 0.5541,
-      "Nuclear": 0.1352,
+      "Bioenergy": 0.0177,
+      "Coal": 0.0396,
+      "Gas": 0.1618,
+      "Hydro": 0.5501,
+      "Nuclear": 0.1369,
       "Other Fossil": 0.0086,
       "Other Renewables": 0.0006,
-      "Solar": 0.0116,
-      "Wind": 0.0725
+      "Solar": 0.0117,
+      "Wind": 0.073
     }
   },
   "CD": {
@@ -2712,7 +2712,7 @@
       "Bioenergy": 0.0031,
       "Coal": 0.0168,
       "Gas": 0.0273,
-      "Hydro": 0.5549,
+      "Hydro": 0.5548,
       "Nuclear": 0.2849,
       "Other Fossil": 0.0556,
       "Other Renewables": 0.0008,
@@ -2753,15 +2753,15 @@
       "Wind": 0.0045
     },
     "2025": {
-      "Bioenergy": 0.0012,
-      "Coal": 0.006,
-      "Gas": 0.0109,
-      "Hydro": 0.5329,
-      "Nuclear": 0.2627,
-      "Other Fossil": 0.0486,
-      "Other Renewables": 0.0003,
-      "Solar": 0.13,
-      "Wind": 0.0074
+      "Bioenergy": 0.0015,
+      "Coal": 0.0075,
+      "Gas": 0.0138,
+      "Hydro": 0.5169,
+      "Nuclear": 0.2722,
+      "Other Fossil": 0.0501,
+      "Other Renewables": 0.0004,
+      "Solar": 0.1284,
+      "Wind": 0.0092
     }
   },
   "CI": {
@@ -2990,15 +2990,15 @@
       "Wind": 0.1296
     },
     "2025": {
-      "Bioenergy": 0.025,
-      "Coal": 0.1829,
-      "Gas": 0.1669,
-      "Hydro": 0.2439,
+      "Bioenergy": 0.0245,
+      "Coal": 0.1791,
+      "Gas": 0.165,
+      "Hydro": 0.2463,
       "Nuclear": 0,
-      "Other Fossil": 0.0153,
+      "Other Fossil": 0.0158,
       "Other Renewables": 0.0014,
-      "Solar": 0.2236,
-      "Wind": 0.1409
+      "Solar": 0.2264,
+      "Wind": 0.1415
     }
   },
   "CM": {
@@ -3148,15 +3148,15 @@
       "Wind": 0.1001
     },
     "2025": {
-      "Bioenergy": 0.0196,
-      "Coal": 0.5592,
-      "Gas": 0.0287,
-      "Hydro": 0.1281,
-      "Nuclear": 0.0456,
-      "Other Fossil": 0.0017,
+      "Bioenergy": 0.0194,
+      "Coal": 0.5515,
+      "Gas": 0.0283,
+      "Hydro": 0.1342,
+      "Nuclear": 0.0454,
+      "Other Fossil": 0.0016,
       "Other Renewables": 0,
-      "Solar": 0.1184,
-      "Wind": 0.0987
+      "Solar": 0.1175,
+      "Wind": 0.1021
     }
   },
   "CO": {
@@ -3230,7 +3230,7 @@
       "Bioenergy": 0.0001,
       "Coal": 0.036,
       "Gas": 0.0753,
-      "Hydro": 0.8265,
+      "Hydro": 0.8266,
       "Nuclear": 0.0002,
       "Other Fossil": 0.0074,
       "Other Renewables": 0,
@@ -3307,14 +3307,14 @@
     },
     "2025": {
       "Bioenergy": 0.0037,
-      "Coal": 0.0005,
-      "Gas": 0.0035,
-      "Hydro": 0.7495,
+      "Coal": 0.0004,
+      "Gas": 0.0026,
+      "Hydro": 0.7558,
       "Nuclear": 0.0003,
-      "Other Fossil": 0.0167,
-      "Other Renewables": 0.1103,
-      "Solar": 0.0012,
-      "Wind": 0.1142
+      "Other Fossil": 0.0146,
+      "Other Renewables": 0.11,
+      "Solar": 0.001,
+      "Wind": 0.1117
     }
   },
   "CU": {
@@ -3548,10 +3548,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.715,
+      "Other Fossil": 0.7234,
       "Other Renewables": 0,
-      "Solar": 0.2525,
-      "Wind": 0.0326
+      "Solar": 0.2439,
+      "Wind": 0.0327
     }
   },
   "CZ": {
@@ -3622,15 +3622,15 @@
       "Wind": 0.0103
     },
     "2025": {
-      "Bioenergy": 0.0426,
-      "Coal": 0.3149,
-      "Gas": 0.0504,
+      "Bioenergy": 0.0416,
+      "Coal": 0.3249,
+      "Gas": 0.0511,
       "Hydro": 0.0244,
-      "Nuclear": 0.4339,
-      "Other Fossil": 0.0094,
-      "Other Renewables": 0.0331,
-      "Solar": 0.083,
-      "Wind": 0.0083
+      "Nuclear": 0.4288,
+      "Other Fossil": 0.0092,
+      "Other Renewables": 0.0328,
+      "Solar": 0.0788,
+      "Wind": 0.0085
     }
   },
   "DE": {
@@ -3701,15 +3701,15 @@
       "Wind": 0.2822
     },
     "2025": {
-      "Bioenergy": 0.0827,
-      "Coal": 0.1897,
-      "Gas": 0.1692,
-      "Hydro": 0.046,
-      "Nuclear": 0.0084,
-      "Other Fossil": 0.0354,
-      "Other Renewables": 0.0078,
-      "Solar": 0.2133,
-      "Wind": 0.2474
+      "Bioenergy": 0.0826,
+      "Coal": 0.1911,
+      "Gas": 0.1724,
+      "Hydro": 0.0445,
+      "Nuclear": 0.0076,
+      "Other Fossil": 0.0359,
+      "Other Renewables": 0.0077,
+      "Solar": 0.2029,
+      "Wind": 0.2554
     }
   },
   "DJ": {
@@ -3796,7 +3796,7 @@
       "Bioenergy": 0.1107,
       "Coal": 0.1377,
       "Gas": 0.1217,
-      "Hydro": 0.0316,
+      "Hydro": 0.0315,
       "Nuclear": 0.0408,
       "Other Fossil": 0.049,
       "Other Renewables": 0.0014,
@@ -3805,18 +3805,18 @@
     },
     "2020": {
       "Bioenergy": 0.0921,
-      "Coal": 0.1399,
+      "Coal": 0.14,
       "Gas": 0.1051,
-      "Hydro": 0.0398,
+      "Hydro": 0.0397,
       "Nuclear": 0.045,
       "Other Fossil": 0.0479,
       "Other Renewables": 0.0018,
       "Solar": 0.0455,
-      "Wind": 0.4828
+      "Wind": 0.4829
     },
     "2021": {
       "Bioenergy": 0.1338,
-      "Coal": 0.1749,
+      "Coal": 0.175,
       "Gas": 0.1021,
       "Hydro": 0.0235,
       "Nuclear": 0.0285,
@@ -3859,15 +3859,15 @@
       "Wind": 0.5433
     },
     "2025": {
-      "Bioenergy": 0.0858,
-      "Coal": 0.0784,
-      "Gas": 0.0846,
-      "Hydro": 0.0337,
-      "Nuclear": 0.0401,
-      "Other Fossil": 0.0364,
+      "Bioenergy": 0.0881,
+      "Coal": 0.0795,
+      "Gas": 0.0849,
+      "Hydro": 0.0327,
+      "Nuclear": 0.0391,
+      "Other Fossil": 0.0369,
       "Other Renewables": 0.0016,
-      "Solar": 0.1585,
-      "Wind": 0.4809
+      "Solar": 0.1506,
+      "Wind": 0.4867
     }
   },
   "DM": {
@@ -4017,15 +4017,15 @@
       "Wind": 0.0412
     },
     "2025": {
-      "Bioenergy": 0.0103,
-      "Coal": 0.2972,
-      "Gas": 0.3811,
-      "Hydro": 0.0725,
+      "Bioenergy": 0.0098,
+      "Coal": 0.2819,
+      "Gas": 0.387,
+      "Hydro": 0.0633,
       "Nuclear": 0,
-      "Other Fossil": 0.0896,
+      "Other Fossil": 0.1125,
       "Other Renewables": 0,
-      "Solar": 0.0813,
-      "Wind": 0.0678
+      "Solar": 0.0919,
+      "Wind": 0.0535
     }
   },
   "DZ": {
@@ -4175,23 +4175,23 @@
       "Wind": 0.0101
     },
     "2025": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.001,
-      "Gas": 0.0337,
-      "Hydro": 0.724,
-      "Nuclear": 0.0005,
-      "Other Fossil": 0.2325,
+      "Bioenergy": 0.0099,
+      "Coal": 0.0004,
+      "Gas": 0.0309,
+      "Hydro": 0.7473,
+      "Nuclear": 0.0003,
+      "Other Fossil": 0.2038,
       "Other Renewables": 0.0001,
-      "Solar": 0.0021,
-      "Wind": 0.0058
+      "Solar": 0.001,
+      "Wind": 0.0064
     }
   },
   "EE": {
     "2019": {
       "Bioenergy": 0.0784,
-      "Coal": 0.0466,
+      "Coal": 0.0467,
       "Gas": 0.0739,
-      "Hydro": 0.049,
+      "Hydro": 0.0489,
       "Nuclear": 0.0643,
       "Other Fossil": 0.5626,
       "Other Renewables": 0.0035,
@@ -4201,19 +4201,19 @@
     "2020": {
       "Bioenergy": 0.0843,
       "Coal": 0.0663,
-      "Gas": 0.1128,
-      "Hydro": 0.0826,
+      "Gas": 0.1129,
+      "Hydro": 0.0824,
       "Nuclear": 0.0981,
       "Other Fossil": 0.3605,
       "Other Renewables": 0.0038,
-      "Solar": 0.031,
+      "Solar": 0.0311,
       "Wind": 0.1606
     },
     "2021": {
       "Bioenergy": 0.065,
       "Coal": 0.0466,
       "Gas": 0.0785,
-      "Hydro": 0.054,
+      "Hydro": 0.0539,
       "Nuclear": 0.0672,
       "Other Fossil": 0.5134,
       "Other Renewables": 0.0025,
@@ -4233,9 +4233,9 @@
     },
     "2023": {
       "Bioenergy": 0.0749,
-      "Coal": 0.0603,
+      "Coal": 0.0604,
       "Gas": 0.0992,
-      "Hydro": 0.0706,
+      "Hydro": 0.0705,
       "Nuclear": 0.0823,
       "Other Fossil": 0.3374,
       "Other Renewables": 0.0034,
@@ -4254,15 +4254,15 @@
       "Wind": 0.2016
     },
     "2025": {
-      "Bioenergy": 0.0632,
-      "Coal": 0.0457,
-      "Gas": 0.0846,
-      "Hydro": 0.0599,
-      "Nuclear": 0.0735,
-      "Other Fossil": 0.252,
+      "Bioenergy": 0.0641,
+      "Coal": 0.0464,
+      "Gas": 0.0862,
+      "Hydro": 0.0598,
+      "Nuclear": 0.0741,
+      "Other Fossil": 0.2598,
       "Other Renewables": 0.003,
-      "Solar": 0.2125,
-      "Wind": 0.2056
+      "Solar": 0.202,
+      "Wind": 0.2047
     }
   },
   "EG": {
@@ -4428,9 +4428,9 @@
       "Bioenergy": 0.0123,
       "Coal": 0.0485,
       "Gas": 0.311,
-      "Hydro": 0.11,
+      "Hydro": 0.1099,
       "Nuclear": 0.2272,
-      "Other Fossil": 0.0205,
+      "Other Fossil": 0.0206,
       "Other Renewables": 0.0037,
       "Solar": 0.0578,
       "Wind": 0.209
@@ -4491,15 +4491,15 @@
       "Wind": 0.2368
     },
     "2025": {
-      "Bioenergy": 0.0143,
-      "Coal": 0.0058,
-      "Gas": 0.1886,
-      "Hydro": 0.1189,
-      "Nuclear": 0.2066,
+      "Bioenergy": 0.0144,
+      "Coal": 0.0059,
+      "Gas": 0.1957,
+      "Hydro": 0.1197,
+      "Nuclear": 0.2033,
       "Other Fossil": 0.0074,
       "Other Renewables": 0.0023,
-      "Solar": 0.2544,
-      "Wind": 0.2017
+      "Solar": 0.2481,
+      "Wind": 0.2032
     }
   },
   "ET": {
@@ -4584,9 +4584,9 @@
   "FI": {
     "2019": {
       "Bioenergy": 0.1463,
-      "Coal": 0.0919,
+      "Coal": 0.092,
       "Gas": 0.1046,
-      "Hydro": 0.1817,
+      "Hydro": 0.1816,
       "Nuclear": 0.3152,
       "Other Fossil": 0.0607,
       "Other Renewables": 0.0044,
@@ -4601,7 +4601,7 @@
       "Nuclear": 0.3136,
       "Other Fossil": 0.0477,
       "Other Renewables": 0.0041,
-      "Solar": 0.0107,
+      "Solar": 0.0108,
       "Wind": 0.1081
     },
     "2021": {
@@ -4641,7 +4641,7 @@
       "Bioenergy": 0.1137,
       "Coal": 0.0184,
       "Gas": 0.018,
-      "Hydro": 0.178,
+      "Hydro": 0.1781,
       "Nuclear": 0.3747,
       "Other Fossil": 0.0434,
       "Other Renewables": 0.0014,
@@ -4649,15 +4649,15 @@
       "Wind": 0.2352
     },
     "2025": {
-      "Bioenergy": 0.1086,
-      "Coal": 0.0148,
-      "Gas": 0.028,
-      "Hydro": 0.1641,
-      "Nuclear": 0.3697,
-      "Other Fossil": 0.0385,
-      "Other Renewables": 0.0031,
-      "Solar": 0.0275,
-      "Wind": 0.2457
+      "Bioenergy": 0.108,
+      "Coal": 0.0142,
+      "Gas": 0.0239,
+      "Hydro": 0.1594,
+      "Nuclear": 0.3727,
+      "Other Fossil": 0.0392,
+      "Other Renewables": 0.003,
+      "Solar": 0.0253,
+      "Wind": 0.2542
     }
   },
   "FJ": {
@@ -4935,7 +4935,7 @@
       "Bioenergy": 0.0092,
       "Coal": 0.014,
       "Gas": 0.1059,
-      "Hydro": 0.1028,
+      "Hydro": 0.1027,
       "Nuclear": 0.63,
       "Other Fossil": 0.0082,
       "Other Renewables": 0.0003,
@@ -4967,13 +4967,13 @@
     "2025": {
       "Bioenergy": 0.0052,
       "Coal": 0.0017,
-      "Gas": 0.0284,
-      "Hydro": 0.0981,
-      "Nuclear": 0.7065,
+      "Gas": 0.0302,
+      "Hydro": 0.0977,
+      "Nuclear": 0.7053,
       "Other Fossil": 0.0079,
       "Other Renewables": 0,
-      "Solar": 0.0659,
-      "Wind": 0.0863
+      "Solar": 0.0652,
+      "Wind": 0.0869
     }
   },
   "GA": {
@@ -5123,15 +5123,15 @@
       "Wind": 0.3184
     },
     "2025": {
-      "Bioenergy": 0.0771,
+      "Bioenergy": 0.0755,
       "Coal": 0.0141,
-      "Gas": 0.3055,
-      "Hydro": 0.0299,
-      "Nuclear": 0.1524,
-      "Other Fossil": 0.0196,
+      "Gas": 0.3129,
+      "Hydro": 0.0298,
+      "Nuclear": 0.1528,
+      "Other Fossil": 0.0195,
       "Other Renewables": 0.0009,
-      "Solar": 0.0937,
-      "Wind": 0.3069
+      "Solar": 0.0887,
+      "Wind": 0.3058
     }
   },
   "GD": {
@@ -5281,15 +5281,15 @@
       "Wind": 0.0136
     },
     "2025": {
-      "Bioenergy": 0.0022,
-      "Coal": 0.0539,
-      "Gas": 0.167,
-      "Hydro": 0.7456,
-      "Nuclear": 0.0054,
+      "Bioenergy": 0.002,
+      "Coal": 0.0492,
+      "Gas": 0.1677,
+      "Hydro": 0.7514,
+      "Nuclear": 0.005,
       "Other Fossil": 0.0006,
       "Other Renewables": 0.0005,
-      "Solar": 0.009,
-      "Wind": 0.0157
+      "Solar": 0.008,
+      "Wind": 0.0156
     }
   },
   "GF": {
@@ -5928,7 +5928,7 @@
     "2019": {
       "Bioenergy": 0.0055,
       "Coal": 0.2449,
-      "Gas": 0.395,
+      "Gas": 0.3951,
       "Hydro": 0.0918,
       "Nuclear": 0.045,
       "Other Fossil": 0.0042,
@@ -5939,12 +5939,12 @@
     "2020": {
       "Bioenergy": 0.0055,
       "Coal": 0.1501,
-      "Gas": 0.4452,
-      "Hydro": 0.086,
+      "Gas": 0.4453,
+      "Hydro": 0.0859,
       "Nuclear": 0.0401,
       "Other Fossil": 0.0039,
       "Other Renewables": 0.0016,
-      "Solar": 0.091,
+      "Solar": 0.0911,
       "Wind": 0.1766
     },
     "2021": {
@@ -5993,14 +5993,14 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0482,
-      "Gas": 0.4128,
-      "Hydro": 0.0488,
+      "Coal": 0.0514,
+      "Gas": 0.4208,
+      "Hydro": 0.049,
       "Nuclear": 0.0026,
       "Other Fossil": 0.0003,
       "Other Renewables": 0.0001,
-      "Solar": 0.2869,
-      "Wind": 0.1999
+      "Solar": 0.2782,
+      "Wind": 0.1971
     }
   },
   "GT": {
@@ -6380,22 +6380,22 @@
       "Coal": 0.5641,
       "Gas": 0.3397,
       "Hydro": 0.0303,
-      "Nuclear": 0.0131,
+      "Nuclear": 0.0132,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.0013,
       "Solar": 0.0198,
       "Wind": 0.0185
     },
     "2025": {
-      "Bioenergy": 0.008,
-      "Coal": 0.5576,
+      "Bioenergy": 0.0079,
+      "Coal": 0.5565,
       "Gas": 0.3387,
-      "Hydro": 0.0307,
-      "Nuclear": 0.0132,
+      "Hydro": 0.0317,
+      "Nuclear": 0.0131,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.0013,
       "Solar": 0.0262,
-      "Wind": 0.0192
+      "Wind": 0.0195
     }
   },
   "HN": {
@@ -6468,8 +6468,8 @@
     "2025": {
       "Bioenergy": 0.1282,
       "Coal": 0.0053,
-      "Gas": 0.0055,
-      "Hydro": 0.2226,
+      "Gas": 0.0054,
+      "Hydro": 0.2227,
       "Nuclear": 0.0005,
       "Other Fossil": 0.4371,
       "Other Renewables": 0.0264,
@@ -6491,9 +6491,9 @@
     },
     "2020": {
       "Bioenergy": 0.0377,
-      "Coal": 0.1103,
+      "Coal": 0.1104,
       "Gas": 0.2529,
-      "Hydro": 0.3436,
+      "Hydro": 0.3435,
       "Nuclear": 0.0646,
       "Other Fossil": 0.0087,
       "Other Renewables": 0.0314,
@@ -6504,18 +6504,18 @@
       "Bioenergy": 0.0403,
       "Coal": 0.1125,
       "Gas": 0.2097,
-      "Hydro": 0.3912,
+      "Hydro": 0.3911,
       "Nuclear": 0.0547,
       "Other Fossil": 0.0074,
       "Other Renewables": 0.0288,
-      "Solar": 0.0174,
+      "Solar": 0.0175,
       "Wind": 0.1379
     },
     "2022": {
       "Bioenergy": 0.0448,
       "Coal": 0.1275,
       "Gas": 0.254,
-      "Hydro": 0.2972,
+      "Hydro": 0.2971,
       "Nuclear": 0.057,
       "Other Fossil": 0.0074,
       "Other Renewables": 0.0249,
@@ -6526,7 +6526,7 @@
       "Bioenergy": 0.0378,
       "Coal": 0.0878,
       "Gas": 0.224,
-      "Hydro": 0.4062,
+      "Hydro": 0.4061,
       "Nuclear": 0.0293,
       "Other Fossil": 0.0089,
       "Other Renewables": 0.0156,
@@ -6545,15 +6545,15 @@
       "Wind": 0.1735
     },
     "2025": {
-      "Bioenergy": 0.0407,
-      "Coal": 0.0688,
-      "Gas": 0.1859,
-      "Hydro": 0.2991,
-      "Nuclear": 0.0672,
-      "Other Fossil": 0.0092,
-      "Other Renewables": 0.0169,
-      "Solar": 0.1196,
-      "Wind": 0.1926
+      "Bioenergy": 0.0404,
+      "Coal": 0.0682,
+      "Gas": 0.1891,
+      "Hydro": 0.2945,
+      "Nuclear": 0.0648,
+      "Other Fossil": 0.009,
+      "Other Renewables": 0.0168,
+      "Solar": 0.1119,
+      "Wind": 0.2051
     }
   },
   "HT": {
@@ -6640,8 +6640,8 @@
       "Bioenergy": 0.0301,
       "Coal": 0.1401,
       "Gas": 0.2462,
-      "Hydro": 0.0534,
-      "Nuclear": 0.4149,
+      "Hydro": 0.0533,
+      "Nuclear": 0.415,
       "Other Fossil": 0.0258,
       "Other Renewables": 0.005,
       "Solar": 0.0417,
@@ -6651,8 +6651,8 @@
       "Bioenergy": 0.0311,
       "Coal": 0.1259,
       "Gas": 0.251,
-      "Hydro": 0.0538,
-      "Nuclear": 0.4031,
+      "Hydro": 0.0537,
+      "Nuclear": 0.4032,
       "Other Fossil": 0.0216,
       "Other Renewables": 0.005,
       "Solar": 0.065,
@@ -6662,7 +6662,7 @@
       "Bioenergy": 0.0325,
       "Coal": 0.1086,
       "Gas": 0.2573,
-      "Hydro": 0.0511,
+      "Hydro": 0.051,
       "Nuclear": 0.3864,
       "Other Fossil": 0.0224,
       "Other Renewables": 0.0048,
@@ -6703,15 +6703,15 @@
       "Wind": 0.0449
     },
     "2025": {
-      "Bioenergy": 0.0346,
-      "Coal": 0.0557,
-      "Gas": 0.1696,
-      "Hydro": 0.0321,
-      "Nuclear": 0.3636,
-      "Other Fossil": 0.0152,
-      "Other Renewables": 0.0039,
-      "Solar": 0.2925,
-      "Wind": 0.0327
+      "Bioenergy": 0.0361,
+      "Coal": 0.0545,
+      "Gas": 0.1791,
+      "Hydro": 0.0305,
+      "Nuclear": 0.3628,
+      "Other Fossil": 0.015,
+      "Other Renewables": 0.0038,
+      "Solar": 0.286,
+      "Wind": 0.0322
     }
   },
   "ID": {
@@ -6808,8 +6808,8 @@
     "2020": {
       "Bioenergy": 0.0076,
       "Coal": 0.0381,
-      "Gas": 0.4696,
-      "Hydro": 0.0467,
+      "Gas": 0.4697,
+      "Hydro": 0.0466,
       "Nuclear": 0.0233,
       "Other Fossil": 0.0607,
       "Other Renewables": 0.0009,
@@ -6829,7 +6829,7 @@
     },
     "2022": {
       "Bioenergy": 0.006,
-      "Coal": 0.0867,
+      "Coal": 0.0868,
       "Gas": 0.4646,
       "Hydro": 0.0325,
       "Nuclear": 0.0163,
@@ -6858,18 +6858,18 @@
       "Other Fossil": 0.0387,
       "Other Renewables": 0.0013,
       "Solar": 0.0333,
-      "Wind": 0.3488
+      "Wind": 0.3487
     },
     "2025": {
-      "Bioenergy": 0.0086,
-      "Coal": 0.0384,
-      "Gas": 0.4576,
-      "Hydro": 0.0446,
-      "Nuclear": 0.0377,
-      "Other Fossil": 0.0357,
-      "Other Renewables": 0.0015,
-      "Solar": 0.0629,
-      "Wind": 0.3131
+      "Bioenergy": 0.0089,
+      "Coal": 0.0397,
+      "Gas": 0.4278,
+      "Hydro": 0.0476,
+      "Nuclear": 0.0396,
+      "Other Fossil": 0.0397,
+      "Other Renewables": 0.0016,
+      "Solar": 0.0585,
+      "Wind": 0.3366
     }
   },
   "IL": {
@@ -7020,14 +7020,14 @@
     },
     "2025": {
       "Bioenergy": 0.0064,
-      "Coal": 0.6911,
-      "Gas": 0.0143,
-      "Hydro": 0.1059,
-      "Nuclear": 0.0287,
+      "Coal": 0.6923,
+      "Gas": 0.0149,
+      "Hydro": 0.1049,
+      "Nuclear": 0.0288,
       "Other Fossil": 0.0002,
       "Other Renewables": 0.0016,
-      "Solar": 0.0859,
-      "Wind": 0.066
+      "Solar": 0.0877,
+      "Wind": 0.0632
     }
   },
   "IQ": {
@@ -7269,81 +7269,81 @@
   },
   "IT": {
     "2019": {
-      "Bioenergy": 0.0602,
-      "Coal": 0.074,
-      "Gas": 0.4717,
-      "Hydro": 0.1706,
-      "Nuclear": 0.0274,
-      "Other Fossil": 0.0252,
-      "Other Renewables": 0.0189,
-      "Solar": 0.0775,
-      "Wind": 0.0745
+      "Bioenergy": 0.0605,
+      "Coal": 0.0745,
+      "Gas": 0.4745,
+      "Hydro": 0.1658,
+      "Nuclear": 0.0275,
+      "Other Fossil": 0.0253,
+      "Other Renewables": 0.0191,
+      "Solar": 0.0779,
+      "Wind": 0.0749
     },
     "2020": {
-      "Bioenergy": 0.0643,
-      "Coal": 0.0584,
-      "Gas": 0.4591,
-      "Hydro": 0.185,
-      "Nuclear": 0.0236,
-      "Other Fossil": 0.0276,
-      "Other Renewables": 0.02,
-      "Solar": 0.0866,
-      "Wind": 0.0754
+      "Bioenergy": 0.0648,
+      "Coal": 0.0588,
+      "Gas": 0.4628,
+      "Hydro": 0.1785,
+      "Nuclear": 0.0238,
+      "Other Fossil": 0.0278,
+      "Other Renewables": 0.0202,
+      "Solar": 0.0872,
+      "Wind": 0.076
     },
     "2021": {
-      "Bioenergy": 0.0603,
-      "Coal": 0.0634,
-      "Gas": 0.4662,
-      "Hydro": 0.1744,
-      "Nuclear": 0.0301,
-      "Other Fossil": 0.0216,
-      "Other Renewables": 0.0189,
-      "Solar": 0.0849,
-      "Wind": 0.0802
+      "Bioenergy": 0.0607,
+      "Coal": 0.0638,
+      "Gas": 0.4692,
+      "Hydro": 0.1691,
+      "Nuclear": 0.0303,
+      "Other Fossil": 0.0217,
+      "Other Renewables": 0.019,
+      "Solar": 0.0855,
+      "Wind": 0.0807
     },
     "2022": {
-      "Bioenergy": 0.0566,
-      "Coal": 0.0908,
-      "Gas": 0.4761,
-      "Hydro": 0.1193,
-      "Nuclear": 0.0272,
-      "Other Fossil": 0.0315,
-      "Other Renewables": 0.0189,
-      "Solar": 0.0977,
-      "Wind": 0.0819
+      "Bioenergy": 0.0569,
+      "Coal": 0.0912,
+      "Gas": 0.4783,
+      "Hydro": 0.1152,
+      "Nuclear": 0.0273,
+      "Other Fossil": 0.0317,
+      "Other Renewables": 0.019,
+      "Solar": 0.0982,
+      "Wind": 0.0823
     },
     "2023": {
-      "Bioenergy": 0.0554,
-      "Coal": 0.0655,
-      "Gas": 0.417,
-      "Hydro": 0.1628,
-      "Nuclear": 0.0342,
-      "Other Fossil": 0.0326,
-      "Other Renewables": 0.0193,
-      "Solar": 0.113,
-      "Wind": 0.1003
+      "Bioenergy": 0.0556,
+      "Coal": 0.0658,
+      "Gas": 0.4184,
+      "Hydro": 0.1598,
+      "Nuclear": 0.0343,
+      "Other Fossil": 0.0327,
+      "Other Renewables": 0.0194,
+      "Solar": 0.1134,
+      "Wind": 0.1007
     },
     "2024": {
-      "Bioenergy": 0.0543,
+      "Bioenergy": 0.0542,
       "Coal": 0.0338,
-      "Gas": 0.3998,
-      "Hydro": 0.2023,
-      "Nuclear": 0.0338,
+      "Gas": 0.3991,
+      "Hydro": 0.2037,
+      "Nuclear": 0.0337,
       "Other Fossil": 0.0329,
       "Other Renewables": 0.0187,
-      "Solar": 0.1297,
-      "Wind": 0.0947
+      "Solar": 0.1294,
+      "Wind": 0.0945
     },
     "2025": {
-      "Bioenergy": 0.0474,
-      "Coal": 0.031,
-      "Gas": 0.4005,
-      "Hydro": 0.1815,
-      "Nuclear": 0.0313,
-      "Other Fossil": 0.0198,
-      "Other Renewables": 0.0188,
-      "Solar": 0.1824,
-      "Wind": 0.0872
+      "Bioenergy": 0.0481,
+      "Coal": 0.0308,
+      "Gas": 0.4044,
+      "Hydro": 0.1747,
+      "Nuclear": 0.0316,
+      "Other Fossil": 0.0201,
+      "Other Renewables": 0.019,
+      "Solar": 0.179,
+      "Wind": 0.0923
     }
   },
   "JM": {
@@ -7572,15 +7572,15 @@
       "Wind": 0.0198
     },
     "2025": {
-      "Bioenergy": 0.0597,
-      "Coal": 0.2686,
-      "Gas": 0.2866,
-      "Hydro": 0.0751,
-      "Nuclear": 0.0946,
-      "Other Fossil": 0.0376,
-      "Other Renewables": 0.0096,
-      "Solar": 0.1472,
-      "Wind": 0.021
+      "Bioenergy": 0.0625,
+      "Coal": 0.2767,
+      "Gas": 0.2865,
+      "Hydro": 0.0743,
+      "Nuclear": 0.0953,
+      "Other Fossil": 0.0368,
+      "Other Renewables": 0.0099,
+      "Solar": 0.1372,
+      "Wind": 0.0208
     }
   },
   "KE": {
@@ -7652,14 +7652,14 @@
     },
     "2025": {
       "Bioenergy": 0.0247,
-      "Coal": 0.0305,
-      "Gas": 0.0418,
-      "Hydro": 0.2582,
-      "Nuclear": 0.0015,
-      "Other Fossil": 0.0777,
-      "Other Renewables": 0.4035,
-      "Solar": 0.0296,
-      "Wind": 0.1325
+      "Coal": 0.0313,
+      "Gas": 0.0429,
+      "Hydro": 0.2544,
+      "Nuclear": 0.0016,
+      "Other Fossil": 0.0829,
+      "Other Renewables": 0.4045,
+      "Solar": 0.0297,
+      "Wind": 0.128
     }
   },
   "KG": {
@@ -7731,14 +7731,14 @@
     },
     "2025": {
       "Bioenergy": 0.0015,
-      "Coal": 0.0965,
+      "Coal": 0.0962,
       "Gas": 0.0152,
-      "Hydro": 0.8356,
+      "Hydro": 0.8359,
       "Nuclear": 0.0039,
       "Other Fossil": 0.0335,
       "Other Renewables": 0.0004,
-      "Solar": 0.0077,
-      "Wind": 0.0057
+      "Solar": 0.0076,
+      "Wind": 0.0058
     }
   },
   "KH": {
@@ -7802,7 +7802,7 @@
       "Coal": 0.4629,
       "Gas": 0.0248,
       "Hydro": 0.3809,
-      "Nuclear": 0.0132,
+      "Nuclear": 0.0133,
       "Other Fossil": 0.0551,
       "Other Renewables": 0.0013,
       "Solar": 0.0295,
@@ -7810,14 +7810,14 @@
     },
     "2025": {
       "Bioenergy": 0.0134,
-      "Coal": 0.4563,
+      "Coal": 0.4552,
       "Gas": 0.0238,
-      "Hydro": 0.3813,
-      "Nuclear": 0.0133,
+      "Hydro": 0.3823,
+      "Nuclear": 0.0132,
       "Other Fossil": 0.0552,
       "Other Renewables": 0.0013,
-      "Solar": 0.036,
-      "Wind": 0.0194
+      "Solar": 0.0359,
+      "Wind": 0.0197
     }
   },
   "KI": {
@@ -8204,15 +8204,15 @@
       "Wind": 0.0057
     },
     "2025": {
-      "Bioenergy": 0.0198,
-      "Coal": 0.2901,
-      "Gas": 0.2733,
-      "Hydro": 0.0057,
-      "Nuclear": 0.3134,
-      "Other Fossil": 0.0069,
-      "Other Renewables": 0.0151,
-      "Solar": 0.0701,
-      "Wind": 0.0056
+      "Bioenergy": 0.0202,
+      "Coal": 0.2941,
+      "Gas": 0.2784,
+      "Hydro": 0.0058,
+      "Nuclear": 0.3061,
+      "Other Fossil": 0.0068,
+      "Other Renewables": 0.0148,
+      "Solar": 0.0683,
+      "Wind": 0.0054
     }
   },
   "KW": {
@@ -8442,14 +8442,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5364,
-      "Gas": 0.2904,
-      "Hydro": 0.0985,
+      "Coal": 0.537,
+      "Gas": 0.2911,
+      "Hydro": 0.0954,
       "Nuclear": 0,
-      "Other Fossil": 0.0148,
+      "Other Fossil": 0.0145,
       "Other Renewables": 0,
-      "Solar": 0.0207,
-      "Wind": 0.0392
+      "Solar": 0.0205,
+      "Wind": 0.0415
     }
   },
   "LA": {
@@ -8930,52 +8930,52 @@
     "2019": {
       "Bioenergy": 0.0548,
       "Coal": 0.1271,
-      "Gas": 0.229,
-      "Hydro": 0.1564,
-      "Nuclear": 0.1726,
+      "Gas": 0.2291,
+      "Hydro": 0.1562,
+      "Nuclear": 0.1727,
       "Other Fossil": 0.0411,
       "Other Renewables": 0.0061,
       "Solar": 0.0292,
-      "Wind": 0.1836
+      "Wind": 0.1837
     },
     "2020": {
       "Bioenergy": 0.0532,
       "Coal": 0.0993,
-      "Gas": 0.2928,
-      "Hydro": 0.142,
-      "Nuclear": 0.1444,
+      "Gas": 0.2929,
+      "Hydro": 0.1417,
+      "Nuclear": 0.1445,
       "Other Fossil": 0.0377,
       "Other Renewables": 0.0056,
-      "Solar": 0.03,
+      "Solar": 0.0301,
       "Wind": 0.195
     },
     "2021": {
       "Bioenergy": 0.0534,
       "Coal": 0.1132,
-      "Gas": 0.2746,
-      "Hydro": 0.1494,
-      "Nuclear": 0.1589,
+      "Gas": 0.2747,
+      "Hydro": 0.1492,
+      "Nuclear": 0.159,
       "Other Fossil": 0.0364,
       "Other Renewables": 0.0059,
-      "Solar": 0.0369,
+      "Solar": 0.037,
       "Wind": 0.1713
     },
     "2022": {
       "Bioenergy": 0.0518,
       "Coal": 0.119,
-      "Gas": 0.2262,
-      "Hydro": 0.1434,
-      "Nuclear": 0.1407,
+      "Gas": 0.2263,
+      "Hydro": 0.1432,
+      "Nuclear": 0.1408,
       "Other Fossil": 0.047,
       "Other Renewables": 0.006,
       "Solar": 0.0647,
-      "Wind": 0.2012
+      "Wind": 0.2013
     },
     "2023": {
       "Bioenergy": 0.0386,
       "Coal": 0.0877,
       "Gas": 0.1947,
-      "Hydro": 0.1352,
+      "Hydro": 0.1351,
       "Nuclear": 0.1199,
       "Other Fossil": 0.0573,
       "Other Renewables": 0.005,
@@ -8986,7 +8986,7 @@
       "Bioenergy": 0.0306,
       "Coal": 0.0594,
       "Gas": 0.1655,
-      "Hydro": 0.11,
+      "Hydro": 0.1101,
       "Nuclear": 0.0908,
       "Other Fossil": 0.0842,
       "Other Renewables": 0.0037,
@@ -8994,36 +8994,36 @@
       "Wind": 0.315
     },
     "2025": {
-      "Bioenergy": 0.0198,
-      "Coal": 0.0357,
-      "Gas": 0.1955,
+      "Bioenergy": 0.0196,
+      "Coal": 0.0354,
+      "Gas": 0.2012,
       "Hydro": 0.0662,
-      "Nuclear": 0.0557,
-      "Other Fossil": 0.0967,
+      "Nuclear": 0.0551,
+      "Other Fossil": 0.0978,
       "Other Renewables": 0.0022,
-      "Solar": 0.1973,
-      "Wind": 0.3309
+      "Solar": 0.1881,
+      "Wind": 0.3343
     }
   },
   "LU": {
     "2019": {
       "Bioenergy": 0.0571,
       "Coal": 0.1331,
-      "Gas": 0.2554,
-      "Hydro": 0.149,
+      "Gas": 0.2555,
+      "Hydro": 0.1488,
       "Nuclear": 0.1809,
       "Other Fossil": 0.0404,
       "Other Renewables": 0.0064,
       "Solar": 0.0499,
-      "Wind": 0.1277
+      "Wind": 0.1278
     },
     "2020": {
       "Bioenergy": 0.0716,
-      "Coal": 0.1148,
-      "Gas": 0.2384,
-      "Hydro": 0.1528,
+      "Coal": 0.1149,
+      "Gas": 0.2385,
+      "Hydro": 0.1525,
       "Nuclear": 0.1665,
-      "Other Fossil": 0.0385,
+      "Other Fossil": 0.0386,
       "Other Renewables": 0.0065,
       "Solar": 0.0574,
       "Wind": 0.1536
@@ -9031,9 +9031,9 @@
     "2021": {
       "Bioenergy": 0.0795,
       "Coal": 0.1193,
-      "Gas": 0.2381,
-      "Hydro": 0.1487,
-      "Nuclear": 0.168,
+      "Gas": 0.2382,
+      "Hydro": 0.1484,
+      "Nuclear": 0.1681,
       "Other Fossil": 0.0374,
       "Other Renewables": 0.0062,
       "Solar": 0.0657,
@@ -9041,9 +9041,9 @@
     },
     "2022": {
       "Bioenergy": 0.0846,
-      "Coal": 0.1264,
-      "Gas": 0.2271,
-      "Hydro": 0.1308,
+      "Coal": 0.1265,
+      "Gas": 0.2272,
+      "Hydro": 0.1306,
       "Nuclear": 0.1496,
       "Other Fossil": 0.0381,
       "Other Renewables": 0.0063,
@@ -9052,10 +9052,10 @@
     },
     "2023": {
       "Bioenergy": 0.0551,
-      "Coal": 0.1092,
+      "Coal": 0.1093,
       "Gas": 0.1976,
-      "Hydro": 0.1446,
-      "Nuclear": 0.1502,
+      "Hydro": 0.1444,
+      "Nuclear": 0.1503,
       "Other Fossil": 0.0365,
       "Other Renewables": 0.0062,
       "Solar": 0.1003,
@@ -9065,7 +9065,7 @@
       "Bioenergy": 0.0733,
       "Coal": 0.096,
       "Gas": 0.1809,
-      "Hydro": 0.1561,
+      "Hydro": 0.1562,
       "Nuclear": 0.1472,
       "Other Fossil": 0.0372,
       "Other Renewables": 0.0059,
@@ -9073,15 +9073,15 @@
       "Wind": 0.1861
     },
     "2025": {
-      "Bioenergy": 0.0703,
-      "Coal": 0.089,
-      "Gas": 0.1742,
-      "Hydro": 0.1257,
-      "Nuclear": 0.1422,
-      "Other Fossil": 0.0394,
+      "Bioenergy": 0.0702,
+      "Coal": 0.0903,
+      "Gas": 0.1772,
+      "Hydro": 0.1258,
+      "Nuclear": 0.1436,
+      "Other Fossil": 0.037,
       "Other Renewables": 0.0058,
-      "Solar": 0.1781,
-      "Wind": 0.1752
+      "Solar": 0.1727,
+      "Wind": 0.1772
     }
   },
   "LV": {
@@ -9089,29 +9089,29 @@
       "Bioenergy": 0.0834,
       "Coal": 0.0273,
       "Gas": 0.4215,
-      "Hydro": 0.3042,
+      "Hydro": 0.3041,
       "Nuclear": 0.0372,
       "Other Fossil": 0.0864,
       "Other Renewables": 0.0013,
       "Solar": 0.0055,
-      "Wind": 0.0332
+      "Wind": 0.0333
     },
     "2020": {
       "Bioenergy": 0.0802,
       "Coal": 0.0347,
       "Gas": 0.3001,
-      "Hydro": 0.3951,
+      "Hydro": 0.395,
       "Nuclear": 0.0499,
-      "Other Fossil": 0.0867,
+      "Other Fossil": 0.0868,
       "Other Renewables": 0.002,
       "Solar": 0.0098,
-      "Wind": 0.0416
+      "Wind": 0.0417
     },
     "2021": {
       "Bioenergy": 0.0761,
       "Coal": 0.0411,
       "Gas": 0.3105,
-      "Hydro": 0.3887,
+      "Hydro": 0.3886,
       "Nuclear": 0.0574,
       "Other Fossil": 0.0712,
       "Other Renewables": 0.0021,
@@ -9127,7 +9127,7 @@
       "Other Fossil": 0.0448,
       "Other Renewables": 0.0029,
       "Solar": 0.0234,
-      "Wind": 0.0622
+      "Wind": 0.0623
     },
     "2023": {
       "Bioenergy": 0.0367,
@@ -9143,24 +9143,24 @@
     "2024": {
       "Bioenergy": 0.0562,
       "Coal": 0.0381,
-      "Gas": 0.2652,
+      "Gas": 0.2651,
       "Hydro": 0.4257,
-      "Nuclear": 0.0582,
+      "Nuclear": 0.0583,
       "Other Fossil": 0.0092,
       "Other Renewables": 0.0023,
       "Solar": 0.0777,
-      "Wind": 0.0675
+      "Wind": 0.0674
     },
     "2025": {
-      "Bioenergy": 0.0556,
-      "Coal": 0.0228,
-      "Gas": 0.2289,
-      "Hydro": 0.4368,
-      "Nuclear": 0.0386,
-      "Other Fossil": 0.0175,
-      "Other Renewables": 0.0016,
-      "Solar": 0.1492,
-      "Wind": 0.049
+      "Bioenergy": 0.056,
+      "Coal": 0.0246,
+      "Gas": 0.2412,
+      "Hydro": 0.433,
+      "Nuclear": 0.0411,
+      "Other Fossil": 0.0161,
+      "Other Renewables": 0.0017,
+      "Solar": 0.1348,
+      "Wind": 0.0516
     }
   },
   "LY": {
@@ -9300,32 +9300,32 @@
     },
     "2024": {
       "Bioenergy": 0.0002,
-      "Coal": 0.5842,
-      "Gas": 0.1107,
+      "Coal": 0.5838,
+      "Gas": 0.1109,
       "Hydro": 0.0256,
       "Nuclear": 0.0009,
       "Other Fossil": 0.0219,
       "Other Renewables": 0.0004,
       "Solar": 0.0389,
-      "Wind": 0.2171
+      "Wind": 0.2174
     },
     "2025": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.607,
-      "Gas": 0.1128,
-      "Hydro": 0.0324,
-      "Nuclear": 0.0007,
-      "Other Fossil": 0.0207,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0322,
-      "Wind": 0.1936
+      "Bioenergy": 0.0003,
+      "Coal": 0.5661,
+      "Gas": 0.1217,
+      "Hydro": 0.0333,
+      "Nuclear": 0.0012,
+      "Other Fossil": 0.0214,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0403,
+      "Wind": 0.2152
     }
   },
   "MD": {
     "2019": {
       "Bioenergy": 0.0076,
       "Coal": 0.0168,
-      "Gas": 0.8666,
+      "Gas": 0.8667,
       "Hydro": 0.0643,
       "Nuclear": 0.0229,
       "Other Fossil": 0.0022,
@@ -9357,7 +9357,7 @@
     },
     "2022": {
       "Bioenergy": 0.0049,
-      "Coal": 0.0274,
+      "Coal": 0.0275,
       "Gas": 0.8342,
       "Hydro": 0.0718,
       "Nuclear": 0.0307,
@@ -9391,13 +9391,13 @@
     "2025": {
       "Bioenergy": 0.0006,
       "Coal": 0.0026,
-      "Gas": 0.9214,
+      "Gas": 0.9215,
       "Hydro": 0.0452,
-      "Nuclear": 0.0041,
+      "Nuclear": 0.0042,
       "Other Fossil": 0.0004,
       "Other Renewables": 0.0002,
-      "Solar": 0.0231,
-      "Wind": 0.0025
+      "Solar": 0.023,
+      "Wind": 0.0026
     }
   },
   "ME": {
@@ -9405,7 +9405,7 @@
       "Bioenergy": 0.0073,
       "Coal": 0.352,
       "Gas": 0.0682,
-      "Hydro": 0.4068,
+      "Hydro": 0.4067,
       "Nuclear": 0.0598,
       "Other Fossil": 0.0056,
       "Other Renewables": 0.0021,
@@ -9414,10 +9414,10 @@
     },
     "2020": {
       "Bioenergy": 0.0069,
-      "Coal": 0.4024,
+      "Coal": 0.4025,
       "Gas": 0.0577,
-      "Hydro": 0.3625,
-      "Nuclear": 0.0513,
+      "Hydro": 0.3624,
+      "Nuclear": 0.0514,
       "Other Fossil": 0.0048,
       "Other Renewables": 0.002,
       "Solar": 0.0084,
@@ -9427,8 +9427,8 @@
       "Bioenergy": 0.0043,
       "Coal": 0.3609,
       "Gas": 0.035,
-      "Hydro": 0.4627,
-      "Nuclear": 0.0314,
+      "Hydro": 0.4626,
+      "Nuclear": 0.0315,
       "Other Fossil": 0.003,
       "Other Renewables": 0.0012,
       "Solar": 0.0087,
@@ -9468,15 +9468,15 @@
       "Wind": 0.0917
     },
     "2025": {
-      "Bioenergy": 0.0139,
-      "Coal": 0.1768,
-      "Gas": 0.1102,
-      "Hydro": 0.354,
-      "Nuclear": 0.1017,
-      "Other Fossil": 0.0101,
-      "Other Renewables": 0.0042,
-      "Solar": 0.1035,
-      "Wind": 0.1257
+      "Bioenergy": 0.0143,
+      "Coal": 0.1748,
+      "Gas": 0.1152,
+      "Hydro": 0.3455,
+      "Nuclear": 0.1048,
+      "Other Fossil": 0.0105,
+      "Other Renewables": 0.0043,
+      "Solar": 0.098,
+      "Wind": 0.1325
     }
   },
   "MG": {
@@ -9563,9 +9563,9 @@
       "Bioenergy": 0.0176,
       "Coal": 0.4987,
       "Gas": 0.1868,
-      "Hydro": 0.2008,
+      "Hydro": 0.2007,
       "Nuclear": 0.0475,
-      "Other Fossil": 0.0045,
+      "Other Fossil": 0.0046,
       "Other Renewables": 0.0017,
       "Solar": 0.005,
       "Wind": 0.0373
@@ -9574,18 +9574,18 @@
       "Bioenergy": 0.0221,
       "Coal": 0.3945,
       "Gas": 0.228,
-      "Hydro": 0.2316,
+      "Hydro": 0.2315,
       "Nuclear": 0.0608,
-      "Other Fossil": 0.0057,
+      "Other Fossil": 0.0058,
       "Other Renewables": 0.0023,
       "Solar": 0.0081,
       "Wind": 0.0469
     },
     "2021": {
       "Bioenergy": 0.0209,
-      "Coal": 0.3268,
-      "Gas": 0.2817,
-      "Hydro": 0.2477,
+      "Coal": 0.3269,
+      "Gas": 0.2818,
+      "Hydro": 0.2476,
       "Nuclear": 0.061,
       "Other Fossil": 0.0058,
       "Other Renewables": 0.0023,
@@ -9627,14 +9627,14 @@
     },
     "2025": {
       "Bioenergy": 0.0076,
-      "Coal": 0.404,
-      "Gas": 0.2645,
-      "Hydro": 0.1696,
-      "Nuclear": 0.0459,
+      "Coal": 0.4041,
+      "Gas": 0.265,
+      "Hydro": 0.1694,
+      "Nuclear": 0.046,
       "Other Fossil": 0.0046,
       "Other Renewables": 0.0019,
-      "Solar": 0.0493,
-      "Wind": 0.0528
+      "Solar": 0.0484,
+      "Wind": 0.0532
     }
   },
   "ML": {
@@ -9943,14 +9943,14 @@
     },
     "2025": {
       "Bioenergy": 0.0552,
-      "Coal": 0.445,
-      "Gas": 0.1579,
-      "Hydro": 0.1047,
-      "Nuclear": 0.0449,
+      "Coal": 0.4415,
+      "Gas": 0.1578,
+      "Hydro": 0.108,
+      "Nuclear": 0.0445,
       "Other Fossil": 0.0342,
       "Other Renewables": 0.0044,
-      "Solar": 0.0881,
-      "Wind": 0.0655
+      "Solar": 0.0879,
+      "Wind": 0.0666
     }
   },
   "MQ": {
@@ -10194,7 +10194,7 @@
     "2019": {
       "Bioenergy": 0.005,
       "Coal": 0.0304,
-      "Gas": 0.8538,
+      "Gas": 0.8539,
       "Hydro": 0.0302,
       "Nuclear": 0.0414,
       "Other Fossil": 0.0153,
@@ -10203,19 +10203,19 @@
       "Wind": 0.0165
     },
     "2020": {
-      "Bioenergy": 0.0036,
+      "Bioenergy": 0.0037,
       "Coal": 0.0195,
       "Gas": 0.8797,
       "Hydro": 0.0221,
       "Nuclear": 0.027,
       "Other Fossil": 0.0297,
-      "Other Renewables": 0.001,
+      "Other Renewables": 0.0011,
       "Solar": 0.0044,
       "Wind": 0.0129
     },
     "2021": {
       "Bioenergy": 0.0045,
-      "Coal": 0.0245,
+      "Coal": 0.0246,
       "Gas": 0.8672,
       "Hydro": 0.0251,
       "Nuclear": 0.0334,
@@ -10229,7 +10229,7 @@
       "Coal": 0.0284,
       "Gas": 0.8159,
       "Hydro": 0.0268,
-      "Nuclear": 0.0337,
+      "Nuclear": 0.0338,
       "Other Fossil": 0.0276,
       "Other Renewables": 0.0014,
       "Solar": 0.0418,
@@ -10258,15 +10258,15 @@
       "Wind": 0.0283
     },
     "2025": {
-      "Bioenergy": 0.0066,
-      "Coal": 0.0297,
-      "Gas": 0.6652,
-      "Hydro": 0.04,
-      "Nuclear": 0.0484,
+      "Bioenergy": 0.007,
+      "Coal": 0.0314,
+      "Gas": 0.666,
+      "Hydro": 0.0417,
+      "Nuclear": 0.0512,
       "Other Fossil": 0.0102,
-      "Other Renewables": 0.002,
-      "Solar": 0.1685,
-      "Wind": 0.0293
+      "Other Renewables": 0.0021,
+      "Solar": 0.1591,
+      "Wind": 0.0315
     }
   },
   "MU": {
@@ -10575,14 +10575,14 @@
     },
     "2025": {
       "Bioenergy": 0.0002,
-      "Coal": 0.0778,
-      "Gas": 0.6057,
-      "Hydro": 0.0727,
-      "Nuclear": 0.0285,
+      "Coal": 0.0739,
+      "Gas": 0.6036,
+      "Hydro": 0.0816,
+      "Nuclear": 0.0292,
       "Other Fossil": 0.0899,
-      "Other Renewables": 0.0088,
-      "Solar": 0.0562,
-      "Wind": 0.0603
+      "Other Renewables": 0.0089,
+      "Solar": 0.0553,
+      "Wind": 0.0573
     }
   },
   "MY": {
@@ -10654,11 +10654,11 @@
     },
     "2025": {
       "Bioenergy": 0.0246,
-      "Coal": 0.452,
-      "Gas": 0.3159,
-      "Hydro": 0.1831,
+      "Coal": 0.4522,
+      "Gas": 0.3148,
+      "Hydro": 0.1828,
       "Nuclear": 0,
-      "Other Fossil": 0.0058,
+      "Other Fossil": 0.0071,
       "Other Renewables": 0,
       "Solar": 0.0185,
       "Wind": 0
@@ -11050,8 +11050,8 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.6932,
-      "Hydro": 0.3068,
+      "Gas": 0.6946,
+      "Hydro": 0.3054,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -11127,14 +11127,14 @@
       "Wind": 0.1541
     },
     "2025": {
-      "Bioenergy": 0.1685,
-      "Coal": 0.0036,
-      "Gas": 0.0215,
-      "Hydro": 0.0831,
+      "Bioenergy": 0.1684,
+      "Coal": 0.0035,
+      "Gas": 0.021,
+      "Hydro": 0.0835,
       "Nuclear": 0.0018,
       "Other Fossil": 0.3978,
       "Other Renewables": 0.1561,
-      "Solar": 0.013,
+      "Solar": 0.0131,
       "Wind": 0.1547
     }
   },
@@ -11146,7 +11146,7 @@
       "Hydro": 0.0048,
       "Nuclear": 0.0356,
       "Other Fossil": 0.0267,
-      "Other Renewables": 0.0155,
+      "Other Renewables": 0.0154,
       "Solar": 0.0457,
       "Wind": 0.0959
     },
@@ -11206,15 +11206,15 @@
       "Wind": 0.2649
     },
     "2025": {
-      "Bioenergy": 0.0469,
-      "Coal": 0.0668,
-      "Gas": 0.3213,
+      "Bioenergy": 0.0474,
+      "Coal": 0.0682,
+      "Gas": 0.3299,
       "Hydro": 0.0002,
-      "Nuclear": 0.0272,
+      "Nuclear": 0.0273,
       "Other Fossil": 0.0226,
       "Other Renewables": 0.014,
-      "Solar": 0.2759,
-      "Wind": 0.2252
+      "Solar": 0.2634,
+      "Wind": 0.2268
     }
   },
   "NO": {
@@ -11287,13 +11287,13 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.0067,
-      "Hydro": 0.9059,
+      "Gas": 0.0065,
+      "Hydro": 0.9033,
       "Nuclear": 0,
       "Other Fossil": 0.0017,
-      "Other Renewables": 0.0034,
+      "Other Renewables": 0.0033,
       "Solar": 0,
-      "Wind": 0.0823
+      "Wind": 0.0853
     }
   },
   "NP": {
@@ -11364,15 +11364,15 @@
       "Wind": 0.0166
     },
     "2025": {
-      "Bioenergy": 0.0043,
-      "Coal": 0.1084,
+      "Bioenergy": 0.0042,
+      "Coal": 0.1076,
       "Gas": 0.0196,
-      "Hydro": 0.8055,
-      "Nuclear": 0.011,
+      "Hydro": 0.8063,
+      "Nuclear": 0.0109,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.0011,
       "Solar": 0.0317,
-      "Wind": 0.0172
+      "Wind": 0.0175
     }
   },
   "NR": {
@@ -11602,14 +11602,14 @@
     },
     "2025": {
       "Bioenergy": 0.0003,
-      "Coal": 0.0354,
-      "Gas": 0.1139,
-      "Hydro": 0.5515,
+      "Coal": 0.0338,
+      "Gas": 0.1105,
+      "Hydro": 0.5429,
       "Nuclear": 0,
       "Other Fossil": 0,
-      "Other Renewables": 0.2209,
+      "Other Renewables": 0.2234,
       "Solar": 0,
-      "Wind": 0.078
+      "Wind": 0.0891
     }
   },
   "OM": {
@@ -11838,15 +11838,15 @@
       "Wind": 0.0651
     },
     "2025": {
-      "Bioenergy": 0.0061,
+      "Bioenergy": 0.0065,
       "Coal": 0,
-      "Gas": 0.3678,
-      "Hydro": 0.5335,
+      "Gas": 0.368,
+      "Hydro": 0.5304,
       "Nuclear": 0,
       "Other Fossil": 0.001,
       "Other Renewables": 0,
-      "Solar": 0.0286,
-      "Wind": 0.063
+      "Solar": 0.0306,
+      "Wind": 0.0634
     }
   },
   "PF": {
@@ -12169,7 +12169,7 @@
     "2019": {
       "Bioenergy": 0.015,
       "Coal": 0.7422,
-      "Gas": 0.0848,
+      "Gas": 0.0849,
       "Hydro": 0.0209,
       "Nuclear": 0.0149,
       "Other Fossil": 0.0153,
@@ -12181,7 +12181,7 @@
       "Bioenergy": 0.0161,
       "Coal": 0.6979,
       "Gas": 0.1022,
-      "Hydro": 0.0262,
+      "Hydro": 0.0261,
       "Nuclear": 0.0179,
       "Other Fossil": 0.014,
       "Other Renewables": 0.0007,
@@ -12233,15 +12233,15 @@
       "Wind": 0.1506
     },
     "2025": {
-      "Bioenergy": 0.0187,
-      "Coal": 0.5029,
-      "Gas": 0.1239,
-      "Hydro": 0.0112,
-      "Nuclear": 0.0029,
-      "Other Fossil": 0.0519,
-      "Other Renewables": 0.0033,
-      "Solar": 0.1475,
-      "Wind": 0.1376
+      "Bioenergy": 0.0185,
+      "Coal": 0.5063,
+      "Gas": 0.1258,
+      "Hydro": 0.011,
+      "Nuclear": 0.0026,
+      "Other Fossil": 0.0516,
+      "Other Renewables": 0.0034,
+      "Solar": 0.1409,
+      "Wind": 0.14
     }
   },
   "PM": {
@@ -12392,14 +12392,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.1957,
-      "Gas": 0.4093,
+      "Coal": 0.1975,
+      "Gas": 0.4436,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.366,
+      "Other Fossil": 0.3301,
       "Other Renewables": 0,
-      "Solar": 0.0142,
-      "Wind": 0.0149
+      "Solar": 0.014,
+      "Wind": 0.0147
     }
   },
   "PS": {
@@ -12508,8 +12508,8 @@
       "Bioenergy": 0.0733,
       "Coal": 0.033,
       "Gas": 0.3264,
-      "Hydro": 0.2127,
-      "Nuclear": 0.0254,
+      "Hydro": 0.2126,
+      "Nuclear": 0.0255,
       "Other Fossil": 0.0073,
       "Other Renewables": 0.0009,
       "Solar": 0.0494,
@@ -12518,7 +12518,7 @@
     "2022": {
       "Bioenergy": 0.0701,
       "Coal": 0.0311,
-      "Gas": 0.3697,
+      "Gas": 0.3698,
       "Hydro": 0.1336,
       "Nuclear": 0.0376,
       "Other Fossil": 0.008,
@@ -12532,14 +12532,14 @@
       "Gas": 0.2402,
       "Hydro": 0.2267,
       "Nuclear": 0.0409,
-      "Other Fossil": 0.0077,
+      "Other Fossil": 0.0078,
       "Other Renewables": 0.0017,
       "Solar": 0.1186,
       "Wind": 0.2743
     },
     "2024": {
       "Bioenergy": 0.065,
-      "Coal": 0.0272,
+      "Coal": 0.0273,
       "Gas": 0.1409,
       "Hydro": 0.2643,
       "Nuclear": 0.0428,
@@ -12549,15 +12549,15 @@
       "Wind": 0.2927
     },
     "2025": {
-      "Bioenergy": 0.0574,
-      "Coal": 0.0197,
-      "Gas": 0.1772,
-      "Hydro": 0.2482,
-      "Nuclear": 0.0333,
-      "Other Fossil": 0.0073,
-      "Other Renewables": 0.0013,
-      "Solar": 0.1944,
-      "Wind": 0.2612
+      "Bioenergy": 0.057,
+      "Coal": 0.0208,
+      "Gas": 0.1808,
+      "Hydro": 0.2493,
+      "Nuclear": 0.0347,
+      "Other Fossil": 0.0075,
+      "Other Renewables": 0.0014,
+      "Solar": 0.1903,
+      "Wind": 0.2582
     }
   },
   "PY": {
@@ -12818,7 +12818,7 @@
       "Other Fossil": 0.001,
       "Other Renewables": 0.0004,
       "Solar": 0.0248,
-      "Wind": 0.1233
+      "Wind": 0.1234
     },
     "2021": {
       "Bioenergy": 0.0109,
@@ -12865,15 +12865,15 @@
       "Wind": 0.1188
     },
     "2025": {
-      "Bioenergy": 0.0103,
-      "Coal": 0.1322,
-      "Gas": 0.1799,
-      "Hydro": 0.2278,
-      "Nuclear": 0.2036,
-      "Other Fossil": 0.0017,
-      "Other Renewables": 0.0007,
-      "Solar": 0.132,
-      "Wind": 0.1119
+      "Bioenergy": 0.0106,
+      "Coal": 0.1318,
+      "Gas": 0.1857,
+      "Hydro": 0.2287,
+      "Nuclear": 0.2028,
+      "Other Fossil": 0.0019,
+      "Other Renewables": 0.0008,
+      "Solar": 0.1211,
+      "Wind": 0.1165
     }
   },
   "RS": {
@@ -12891,7 +12891,7 @@
     "2020": {
       "Bioenergy": 0.0046,
       "Coal": 0.688,
-      "Gas": 0.0057,
+      "Gas": 0.0058,
       "Hydro": 0.257,
       "Nuclear": 0.0047,
       "Other Fossil": 0.0096,
@@ -12901,7 +12901,7 @@
     },
     "2021": {
       "Bioenergy": 0.0088,
-      "Coal": 0.5929,
+      "Coal": 0.593,
       "Gas": 0.015,
       "Hydro": 0.3097,
       "Nuclear": 0.0122,
@@ -12944,15 +12944,15 @@
       "Wind": 0.0372
     },
     "2025": {
-      "Bioenergy": 0.0101,
-      "Coal": 0.6389,
-      "Gas": 0.0542,
-      "Hydro": 0.2383,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.007,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0032,
-      "Wind": 0.0431
+      "Bioenergy": 0.0102,
+      "Coal": 0.6361,
+      "Gas": 0.0526,
+      "Hydro": 0.2384,
+      "Nuclear": 0.0071,
+      "Other Fossil": 0.0071,
+      "Other Renewables": 0.0003,
+      "Solar": 0.0039,
+      "Wind": 0.0442
     }
   },
   "RU": {
@@ -13024,14 +13024,14 @@
     },
     "2025": {
       "Bioenergy": 0.0007,
-      "Coal": 0.1756,
-      "Gas": 0.4394,
-      "Hydro": 0.1733,
-      "Nuclear": 0.1922,
-      "Other Fossil": 0.0128,
+      "Coal": 0.1754,
+      "Gas": 0.4389,
+      "Hydro": 0.1743,
+      "Nuclear": 0.1919,
+      "Other Fossil": 0.0127,
       "Other Renewables": 0,
-      "Solar": 0.0024,
-      "Wind": 0.0037
+      "Solar": 0.0023,
+      "Wind": 0.0038
     }
   },
   "RW": {
@@ -13497,15 +13497,15 @@
       "Wind": 0.2471
     },
     "2025": {
-      "Bioenergy": 0.0331,
+      "Bioenergy": 0.0337,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4198,
-      "Nuclear": 0.2737,
+      "Hydro": 0.415,
+      "Nuclear": 0.2745,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0372,
-      "Wind": 0.2362
+      "Solar": 0.0355,
+      "Wind": 0.2412
     }
   },
   "SG": {
@@ -13734,15 +13734,15 @@
       "Wind": 0.0022
     },
     "2025": {
-      "Bioenergy": 0.0108,
-      "Coal": 0.0908,
-      "Gas": 0.0584,
-      "Hydro": 0.2761,
-      "Nuclear": 0.4211,
-      "Other Fossil": 0.0003,
-      "Other Renewables": 0.0001,
-      "Solar": 0.1402,
-      "Wind": 0.0023
+      "Bioenergy": 0.0115,
+      "Coal": 0.1149,
+      "Gas": 0.069,
+      "Hydro": 0.2747,
+      "Nuclear": 0.3848,
+      "Other Fossil": 0.001,
+      "Other Renewables": 0.0004,
+      "Solar": 0.1369,
+      "Wind": 0.0068
     }
   },
   "SK": {
@@ -13813,14 +13813,14 @@
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0311,
+      "Bioenergy": 0.0319,
       "Coal": 0.0013,
-      "Gas": 0.0943,
-      "Hydro": 0.107,
-      "Nuclear": 0.6803,
-      "Other Fossil": 0.0439,
-      "Other Renewables": 0.0177,
-      "Solar": 0.0243,
+      "Gas": 0.0942,
+      "Hydro": 0.1051,
+      "Nuclear": 0.6828,
+      "Other Fossil": 0.0437,
+      "Other Renewables": 0.0174,
+      "Solar": 0.0236,
       "Wind": 0
     }
   },
@@ -14367,13 +14367,13 @@
     },
     "2025": {
       "Bioenergy": 0.1521,
-      "Coal": 0.0025,
-      "Gas": 0.2273,
-      "Hydro": 0.1778,
+      "Coal": 0.0024,
+      "Gas": 0.227,
+      "Hydro": 0.1781,
       "Nuclear": 0.0013,
       "Other Fossil": 0.0336,
       "Other Renewables": 0.1973,
-      "Solar": 0.1564,
+      "Solar": 0.1565,
       "Wind": 0.0518
     }
   },
@@ -14840,15 +14840,15 @@
       "Wind": 0.0268
     },
     "2025": {
-      "Bioenergy": 0.0527,
-      "Coal": 0.2319,
-      "Gas": 0.5685,
-      "Hydro": 0.0505,
-      "Nuclear": 0.008,
-      "Other Fossil": 0.0012,
+      "Bioenergy": 0.0515,
+      "Coal": 0.2358,
+      "Gas": 0.558,
+      "Hydro": 0.0564,
+      "Nuclear": 0.0083,
+      "Other Fossil": 0.0011,
       "Other Renewables": 0.0008,
       "Solar": 0.0595,
-      "Wind": 0.027
+      "Wind": 0.0285
     }
   },
   "TJ": {
@@ -15304,25 +15304,25 @@
     },
     "2024": {
       "Bioenergy": 0.0254,
-      "Coal": 0.3548,
-      "Gas": 0.1855,
-      "Hydro": 0.2185,
-      "Nuclear": 0.0007,
+      "Coal": 0.355,
+      "Gas": 0.1852,
+      "Hydro": 0.2188,
+      "Nuclear": 0.0003,
       "Other Fossil": 0.0029,
-      "Other Renewables": 0.0298,
-      "Solar": 0.0753,
-      "Wind": 0.1071
+      "Other Renewables": 0.0299,
+      "Solar": 0.0754,
+      "Wind": 0.107
     },
     "2025": {
-      "Bioenergy": 0.0227,
-      "Coal": 0.3257,
-      "Gas": 0.2183,
-      "Hydro": 0.1714,
-      "Nuclear": 0.0005,
-      "Other Fossil": 0.003,
-      "Other Renewables": 0.0276,
-      "Solar": 0.1141,
-      "Wind": 0.1169
+      "Bioenergy": 0.0234,
+      "Coal": 0.3316,
+      "Gas": 0.2129,
+      "Hydro": 0.1696,
+      "Nuclear": 0.0002,
+      "Other Fossil": 0.0031,
+      "Other Renewables": 0.0289,
+      "Solar": 0.1144,
+      "Wind": 0.1159
     }
   },
   "TT": {
@@ -15473,14 +15473,14 @@
     },
     "2025": {
       "Bioenergy": 0.0008,
-      "Coal": 0.3725,
-      "Gas": 0.4767,
-      "Hydro": 0.0217,
+      "Coal": 0.3753,
+      "Gas": 0.4777,
+      "Hydro": 0.021,
       "Nuclear": 0.0134,
-      "Other Fossil": 0.0274,
+      "Other Fossil": 0.0295,
       "Other Renewables": 0,
-      "Solar": 0.0502,
-      "Wind": 0.0372
+      "Solar": 0.0505,
+      "Wind": 0.0317
     }
   },
   "TZ": {
@@ -15788,15 +15788,15 @@
       "Wind": 0.1035
     },
     "2025": {
-      "Bioenergy": 0.01,
-      "Coal": 0.1613,
-      "Gas": 0.4107,
-      "Hydro": 0.0512,
-      "Nuclear": 0.1717,
-      "Other Fossil": 0.0055,
-      "Other Renewables": 0.0038,
-      "Solar": 0.0907,
-      "Wind": 0.095
+      "Bioenergy": 0.0101,
+      "Coal": 0.1622,
+      "Gas": 0.4042,
+      "Hydro": 0.0523,
+      "Nuclear": 0.1713,
+      "Other Fossil": 0.0066,
+      "Other Renewables": 0.0039,
+      "Solar": 0.0901,
+      "Wind": 0.0993
     }
   },
   "UY": {
@@ -15867,15 +15867,15 @@
       "Wind": 0.3322
     },
     "2025": {
-      "Bioenergy": 0.1351,
+      "Bioenergy": 0.1348,
       "Coal": 0.0013,
       "Gas": 0.0219,
-      "Hydro": 0.4696,
+      "Hydro": 0.4619,
       "Nuclear": 0.0008,
       "Other Fossil": 0.0087,
       "Other Renewables": 0.0002,
-      "Solar": 0.0367,
-      "Wind": 0.3256
+      "Solar": 0.0373,
+      "Wind": 0.333
     }
   },
   "UZ": {
@@ -15947,14 +15947,14 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0694,
+      "Coal": 0.0693,
       "Gas": 0.8121,
-      "Hydro": 0.102,
+      "Hydro": 0.1021,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
       "Solar": 0.0023,
-      "Wind": 0.0015
+      "Wind": 0.0016
     }
   },
   "VC": {
@@ -16559,7 +16559,7 @@
       "Bioenergy": 0.0038,
       "Coal": 0.7779,
       "Gas": 0.0326,
-      "Hydro": 0.0766,
+      "Hydro": 0.0765,
       "Nuclear": 0.0264,
       "Other Fossil": 0.0027,
       "Other Renewables": 0.0011,
@@ -16570,7 +16570,7 @@
       "Bioenergy": 0.0034,
       "Coal": 0.8201,
       "Gas": 0.0308,
-      "Hydro": 0.0473,
+      "Hydro": 0.0472,
       "Nuclear": 0.025,
       "Other Fossil": 0.0025,
       "Other Renewables": 0.001,
@@ -16579,14 +16579,14 @@
     },
     "2025": {
       "Bioenergy": 0.0065,
-      "Coal": 0.7067,
-      "Gas": 0.0549,
-      "Hydro": 0.0811,
+      "Coal": 0.7068,
+      "Gas": 0.0553,
+      "Hydro": 0.081,
       "Nuclear": 0.0462,
       "Other Fossil": 0.0046,
       "Other Renewables": 0.0019,
-      "Solar": 0.0214,
-      "Wind": 0.0767
+      "Solar": 0.0208,
+      "Wind": 0.077
     }
   },
   "YE": {
@@ -16737,14 +16737,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.811,
+      "Coal": 0.8096,
       "Gas": 0,
-      "Hydro": 0.0069,
-      "Nuclear": 0.0375,
-      "Other Fossil": 0.0174,
+      "Hydro": 0.0067,
+      "Nuclear": 0.038,
+      "Other Fossil": 0.0164,
       "Other Renewables": 0.0011,
-      "Solar": 0.0769,
-      "Wind": 0.0493
+      "Solar": 0.0824,
+      "Wind": 0.0459
     }
   },
   "ZM": {