npm - @digital4better/data - Versions diffs - 1.2.14 → 1.2.16 - Mend

@digital4better/data 1.2.14 → 1.2.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (65) hide show

package/data/factor/continent-monthly-green.csv +362 -362
package/data/factor/continent-monthly-green.json +2652 -2652
package/data/factor/continent-monthly.csv +382 -382
package/data/factor/continent-monthly.json +2699 -2699
package/data/factor/continent-yearly-green.csv +39 -39
package/data/factor/continent-yearly-green.json +294 -294
package/data/factor/continent-yearly.csv +39 -39
package/data/factor/continent-yearly.json +306 -306
package/data/factor/country-monthly-green.csv +2350 -2350
package/data/factor/country-monthly-green.json +18954 -18954
package/data/factor/country-monthly.csv +2527 -2527
package/data/factor/country-monthly.json +17358 -17358
package/data/factor/country-yearly-green.csv +353 -353
package/data/factor/country-yearly-green.json +2920 -2920
package/data/factor/country-yearly.csv +353 -353
package/data/factor/country-yearly.json +2764 -2764
package/data/factor/subdivision-monthly-green.csv +39 -39
package/data/factor/subdivision-monthly-green.json +330 -330
package/data/factor/subdivision-monthly.csv +39 -39
package/data/factor/subdivision-monthly.json +342 -342
package/data/factor/subdivision-yearly-green.csv +64 -64
package/data/factor/subdivision-yearly-green.json +296 -296
package/data/factor/subdivision-yearly.csv +53 -53
package/data/factor/subdivision-yearly.json +267 -267
package/data/factor/world-monthly-green.csv +74 -74
package/data/factor/world-monthly-green.json +666 -666
package/data/factor/world-monthly.csv +74 -74
package/data/factor/world-monthly.json +664 -664
package/data/factor/world-yearly-green.csv +7 -7
package/data/factor/world-yearly-green.json +63 -63
package/data/factor/world-yearly.csv +7 -7
package/data/factor/world-yearly.json +62 -62
package/data/mix/continent-monthly-green.csv +218 -218
package/data/mix/continent-monthly-green.json +631 -631
package/data/mix/continent-monthly.csv +218 -218
package/data/mix/continent-monthly.json +789 -789
package/data/mix/continent-yearly-green.csv +28 -28
package/data/mix/continent-yearly-green.json +79 -79
package/data/mix/continent-yearly.csv +28 -28
package/data/mix/continent-yearly.json +113 -113
package/data/mix/country-monthly-green.csv +1507 -1507
package/data/mix/country-monthly-green.json +4351 -4351
package/data/mix/country-monthly.csv +1507 -1507
package/data/mix/country-monthly.json +4932 -4932
package/data/mix/country-yearly-green.csv +210 -210
package/data/mix/country-yearly-green.json +643 -643
package/data/mix/country-yearly.csv +210 -210
package/data/mix/country-yearly.json +966 -966
package/data/mix/subdivision-monthly-green.csv +30 -30
package/data/mix/subdivision-monthly-green.json +42 -42
package/data/mix/subdivision-monthly.csv +30 -30
package/data/mix/subdivision-monthly.json +123 -123
package/data/mix/subdivision-yearly-green.csv +19 -19
package/data/mix/subdivision-yearly-green.json +31 -31
package/data/mix/subdivision-yearly.csv +19 -19
package/data/mix/subdivision-yearly.json +65 -65
package/data/mix/world-monthly-green.csv +71 -71
package/data/mix/world-monthly-green.json +218 -218
package/data/mix/world-monthly.csv +71 -71
package/data/mix/world-monthly.json +195 -195
package/data/mix/world-yearly-green.csv +7 -7
package/data/mix/world-yearly-green.json +19 -19
package/data/mix/world-yearly.csv +7 -7
package/data/mix/world-yearly.json +24 -24
package/package.json +1 -1

package/data/mix/country-yearly.json CHANGED Viewed

@@ -81,80 +81,80 @@
   "AF": {
     "2019": {
       "Bioenergy": 0.0119,
-      "Coal": 0.463,
+      "Coal": 0.4629,
       "Gas": 0.0931,
       "Hydro": 0.2982,
       "Nuclear": 0.0412,
       "Other Fossil": 0.0237,
       "Other Renewables": 0.0043,
-      "Solar": 0.033,
-      "Wind": 0.0317
+      "Solar": 0.0331,
+      "Wind": 0.0316
     },
     "2020": {
-      "Bioenergy": 0.0133,
-      "Coal": 0.4554,
+      "Bioenergy": 0.0132,
+      "Coal": 0.4553,
       "Gas": 0.0907,
-      "Hydro": 0.3006,
-      "Nuclear": 0.0412,
+      "Hydro": 0.3005,
+      "Nuclear": 0.0411,
       "Other Fossil": 0.0228,
       "Other Renewables": 0.0037,
-      "Solar": 0.0373,
+      "Solar": 0.0375,
       "Wind": 0.035
     },
     "2021": {
       "Bioenergy": 0.0148,
-      "Coal": 0.4535,
+      "Coal": 0.4534,
       "Gas": 0.0858,
       "Hydro": 0.2922,
       "Nuclear": 0.0412,
       "Other Fossil": 0.0231,
       "Other Renewables": 0.0038,
-      "Solar": 0.0415,
+      "Solar": 0.0418,
       "Wind": 0.044
     },
     "2022": {
       "Bioenergy": 0.0161,
-      "Coal": 0.4442,
+      "Coal": 0.444,
       "Gas": 0.0817,
-      "Hydro": 0.2923,
+      "Hydro": 0.2922,
       "Nuclear": 0.041,
       "Other Fossil": 0.0233,
       "Other Renewables": 0.004,
-      "Solar": 0.0486,
+      "Solar": 0.0489,
       "Wind": 0.0488
     },
     "2023": {
-      "Bioenergy": 0.0165,
-      "Coal": 0.4474,
-      "Gas": 0.0779,
-      "Hydro": 0.2814,
+      "Bioenergy": 0.0164,
+      "Coal": 0.4471,
+      "Gas": 0.0778,
+      "Hydro": 0.2813,
       "Nuclear": 0.0411,
       "Other Fossil": 0.0213,
       "Other Renewables": 0.004,
-      "Solar": 0.0565,
+      "Solar": 0.057,
       "Wind": 0.054
     },
     "2024": {
       "Bioenergy": 0.0158,
-      "Coal": 0.4345,
-      "Gas": 0.0751,
-      "Hydro": 0.2844,
+      "Coal": 0.4343,
+      "Gas": 0.0752,
+      "Hydro": 0.2845,
       "Nuclear": 0.0404,
       "Other Fossil": 0.0202,
       "Other Renewables": 0.0041,
       "Solar": 0.0691,
-      "Wind": 0.0562
+      "Wind": 0.0564
     },
     "2025": {
-      "Bioenergy": 0.0176,
-      "Coal": 0.4501,
-      "Gas": 0.0742,
-      "Hydro": 0.2627,
-      "Nuclear": 0.0429,
-      "Other Fossil": 0.0202,
-      "Other Renewables": 0.004,
-      "Solar": 0.0654,
-      "Wind": 0.0628
+      "Bioenergy": 0.0173,
+      "Coal": 0.4357,
+      "Gas": 0.078,
+      "Hydro": 0.2574,
+      "Nuclear": 0.0436,
+      "Other Fossil": 0.0218,
+      "Other Renewables": 0.0044,
+      "Solar": 0.0762,
+      "Wind": 0.0655
     }
   },
   "AG": {
@@ -304,15 +304,15 @@
       "Wind": 0.0404
     },
     "2025": {
-      "Bioenergy": 0.0086,
-      "Coal": 0.0464,
-      "Gas": 0.0835,
-      "Hydro": 0.7303,
-      "Nuclear": 0.0651,
-      "Other Fossil": 0.0067,
+      "Bioenergy": 0.0088,
+      "Coal": 0.0477,
+      "Gas": 0.0838,
+      "Hydro": 0.7304,
+      "Nuclear": 0.0639,
+      "Other Fossil": 0.0068,
       "Other Renewables": 0.0019,
-      "Solar": 0.0114,
-      "Wind": 0.0459
+      "Solar": 0.0149,
+      "Wind": 0.0418
     }
   },
   "AM": {
@@ -531,8 +531,8 @@
     },
     "2024": {
       "Bioenergy": 0.0088,
-      "Coal": 0.0058,
-      "Gas": 0.5083,
+      "Coal": 0.0061,
+      "Gas": 0.508,
       "Hydro": 0.2506,
       "Nuclear": 0.072,
       "Other Fossil": 0.0119,
@@ -541,15 +541,15 @@
       "Wind": 0.1136
     },
     "2025": {
-      "Bioenergy": 0.0084,
-      "Coal": 0.0009,
-      "Gas": 0.4803,
-      "Hydro": 0.2859,
-      "Nuclear": 0.0569,
-      "Other Fossil": 0.0068,
-      "Other Renewables": 0,
-      "Solar": 0.0403,
-      "Wind": 0.1206
+      "Bioenergy": 0.0087,
+      "Coal": 0.0044,
+      "Gas": 0.549,
+      "Hydro": 0.2087,
+      "Nuclear": 0.0689,
+      "Other Fossil": 0.0095,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0365,
+      "Wind": 0.1143
     }
   },
   "AS": {
@@ -661,7 +661,7 @@
       "Hydro": 0.5787,
       "Nuclear": 0.0299,
       "Other Fossil": 0.0182,
-      "Other Renewables": 0.0008,
+      "Other Renewables": 0.0009,
       "Solar": 0.0383,
       "Wind": 0.1145
     },
@@ -688,105 +688,105 @@
       "Wind": 0.1324
     },
     "2024": {
-      "Bioenergy": 0.0271,
+      "Bioenergy": 0.0273,
       "Coal": 0.0026,
-      "Gas": 0.0899,
-      "Hydro": 0.6241,
+      "Gas": 0.0905,
+      "Hydro": 0.6217,
       "Nuclear": 0.0036,
-      "Other Fossil": 0.0151,
+      "Other Fossil": 0.0152,
       "Other Renewables": 0.0001,
-      "Solar": 0.104,
-      "Wind": 0.1334
+      "Solar": 0.1047,
+      "Wind": 0.1342
     },
     "2025": {
       "Bioenergy": 0.0342,
-      "Coal": 0.0205,
-      "Gas": 0.2709,
-      "Hydro": 0.4429,
-      "Nuclear": 0.0287,
-      "Other Fossil": 0.0166,
+      "Coal": 0.0212,
+      "Gas": 0.2822,
+      "Hydro": 0.4193,
+      "Nuclear": 0.0284,
+      "Other Fossil": 0.0169,
       "Other Renewables": 0.0009,
-      "Solar": 0.0556,
-      "Wind": 0.1297
+      "Solar": 0.0685,
+      "Wind": 0.1285
     }
   },
   "AU": {
     "2019": {
       "Bioenergy": 0.0017,
-      "Coal": 0.6579,
-      "Gas": 0.1156,
-      "Hydro": 0.061,
+      "Coal": 0.6581,
+      "Gas": 0.1155,
+      "Hydro": 0.0611,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.079,
-      "Wind": 0.0849
+      "Solar": 0.0789,
+      "Wind": 0.0848
     },
     "2020": {
       "Bioenergy": 0.0013,
-      "Coal": 0.6337,
+      "Coal": 0.6339,
       "Gas": 0.1011,
-      "Hydro": 0.0644,
+      "Hydro": 0.0643,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0.0997,
-      "Wind": 0.0998
+      "Wind": 0.0997
     },
     "2021": {
       "Bioenergy": 0.0012,
-      "Coal": 0.6054,
-      "Gas": 0.0791,
+      "Coal": 0.6055,
+      "Gas": 0.079,
       "Hydro": 0.0705,
       "Nuclear": 0,
       "Other Fossil": 0.0004,
       "Other Renewables": 0,
       "Solar": 0.1257,
-      "Wind": 0.1177
+      "Wind": 0.1176
     },
     "2022": {
       "Bioenergy": 0.001,
-      "Coal": 0.5588,
-      "Gas": 0.0914,
+      "Coal": 0.5584,
+      "Gas": 0.091,
       "Hydro": 0.0727,
       "Nuclear": 0,
       "Other Fossil": 0.0003,
       "Other Renewables": 0,
-      "Solar": 0.1469,
-      "Wind": 0.1288
+      "Solar": 0.1479,
+      "Wind": 0.1286
     },
     "2023": {
-      "Bioenergy": 0.0015,
-      "Coal": 0.5407,
-      "Gas": 0.0756,
-      "Hydro": 0.0664,
+      "Bioenergy": 0.0014,
+      "Coal": 0.5405,
+      "Gas": 0.0757,
+      "Hydro": 0.0662,
       "Nuclear": 0,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.1812,
-      "Wind": 0.1345
+      "Solar": 0.1815,
+      "Wind": 0.1346
     },
     "2024": {
-      "Bioenergy": 0.002,
-      "Coal": 0.5331,
-      "Gas": 0.0796,
-      "Hydro": 0.0587,
+      "Bioenergy": 0.0019,
+      "Coal": 0.5324,
+      "Gas": 0.0773,
+      "Hydro": 0.0571,
       "Nuclear": 0,
       "Other Fossil": 0.0003,
       "Other Renewables": 0,
-      "Solar": 0.1926,
-      "Wind": 0.1338
+      "Solar": 0.1967,
+      "Wind": 0.1343
     },
     "2025": {
-      "Bioenergy": 0.0026,
-      "Coal": 0.4761,
-      "Gas": 0.0757,
-      "Hydro": 0.0673,
+      "Bioenergy": 0.0012,
+      "Coal": 0.498,
+      "Gas": 0.0622,
+      "Hydro": 0.0428,
       "Nuclear": 0,
-      "Other Fossil": 0.0005,
+      "Other Fossil": 0.0003,
       "Other Renewables": 0,
-      "Solar": 0.2491,
-      "Wind": 0.1287
+      "Solar": 0.2579,
+      "Wind": 0.1375
     }
   },
   "AW": {
@@ -1005,25 +1005,25 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.6522,
+      "Coal": 0.6324,
       "Gas": 0,
-      "Hydro": 0.3077,
+      "Hydro": 0.3324,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0286,
-      "Wind": 0.0115
+      "Solar": 0.0244,
+      "Wind": 0.0108
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.6703,
+      "Coal": 0.5338,
       "Gas": 0,
-      "Hydro": 0.2857,
+      "Hydro": 0.4511,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.033,
-      "Wind": 0.011
+      "Solar": 0.0075,
+      "Wind": 0.0075
     }
   },
   "BB": {
@@ -1122,10 +1122,10 @@
       "Coal": 0.1165,
       "Gas": 0.6592,
       "Hydro": 0.0233,
-      "Nuclear": 0.0049,
+      "Nuclear": 0.0048,
       "Other Fossil": 0.1859,
       "Other Renewables": 0.0004,
-      "Solar": 0.0041,
+      "Solar": 0.0042,
       "Wind": 0.0041
     },
     "2021": {
@@ -1136,7 +1136,7 @@
       "Nuclear": 0.0046,
       "Other Fossil": 0.239,
       "Other Renewables": 0.0004,
-      "Solar": 0.0065,
+      "Solar": 0.0066,
       "Wind": 0.0049
     },
     "2022": {
@@ -1158,7 +1158,7 @@
       "Nuclear": 0.0089,
       "Other Fossil": 0.1551,
       "Other Renewables": 0.0009,
-      "Solar": 0.0176,
+      "Solar": 0.0177,
       "Wind": 0.0116
     },
     "2024": {
@@ -1170,18 +1170,18 @@
       "Other Fossil": 0.1112,
       "Other Renewables": 0.0008,
       "Solar": 0.0224,
-      "Wind": 0.0114
+      "Wind": 0.0115
     },
     "2025": {
-      "Bioenergy": 0.0037,
-      "Coal": 0.3866,
-      "Gas": 0.4999,
-      "Hydro": 0.0192,
-      "Nuclear": 0.009,
-      "Other Fossil": 0.0377,
-      "Other Renewables": 0.0008,
-      "Solar": 0.0301,
-      "Wind": 0.0131
+      "Bioenergy": 0.0039,
+      "Coal": 0.3903,
+      "Gas": 0.4207,
+      "Hydro": 0.0151,
+      "Nuclear": 0.01,
+      "Other Fossil": 0.1172,
+      "Other Renewables": 0.001,
+      "Solar": 0.0269,
+      "Wind": 0.015
     }
   },
   "BE": {
@@ -1244,23 +1244,23 @@
       "Bioenergy": 0.0117,
       "Coal": 0.0181,
       "Gas": 0.166,
-      "Hydro": 0.025,
+      "Hydro": 0.0249,
       "Nuclear": 0.3965,
       "Other Fossil": 0.0917,
       "Other Renewables": 0.0009,
-      "Solar": 0.112,
+      "Solar": 0.1119,
       "Wind": 0.1781
     },
     "2025": {
-      "Bioenergy": 0.0126,
-      "Coal": 0.0266,
-      "Gas": 0.2429,
-      "Hydro": 0.0297,
-      "Nuclear": 0.4033,
-      "Other Fossil": 0.0842,
-      "Other Renewables": 0.0011,
-      "Solar": 0.0318,
-      "Wind": 0.1678
+      "Bioenergy": 0.0115,
+      "Coal": 0.0222,
+      "Gas": 0.2498,
+      "Hydro": 0.0238,
+      "Nuclear": 0.3888,
+      "Other Fossil": 0.0924,
+      "Other Renewables": 0.0009,
+      "Solar": 0.051,
+      "Wind": 0.1596
     }
   },
   "BF": {
@@ -1411,14 +1411,14 @@
     },
     "2025": {
       "Bioenergy": 0.0026,
-      "Coal": 0.3974,
-      "Gas": 0.0605,
-      "Hydro": 0.0421,
-      "Nuclear": 0.3868,
+      "Coal": 0.4023,
+      "Gas": 0.0568,
+      "Hydro": 0.0487,
+      "Nuclear": 0.3696,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0763,
-      "Wind": 0.0342
+      "Solar": 0.0843,
+      "Wind": 0.0356
     }
   },
   "BH": {
@@ -1886,13 +1886,13 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.6634,
-      "Hydro": 0.2871,
+      "Gas": 0.6582,
+      "Hydro": 0.3061,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0297,
-      "Wind": 0.0198
+      "Solar": 0.0255,
+      "Wind": 0.0102
     }
   },
   "BR": {
@@ -1963,15 +1963,15 @@
       "Wind": 0.1521
     },
     "2025": {
-      "Bioenergy": 0.0037,
-      "Coal": 0.0048,
-      "Gas": 0.0417,
-      "Hydro": 0.7016,
-      "Nuclear": 0.0211,
-      "Other Fossil": 0.0092,
+      "Bioenergy": 0.0042,
+      "Coal": 0.0077,
+      "Gas": 0.0355,
+      "Hydro": 0.6917,
+      "Nuclear": 0.0219,
+      "Other Fossil": 0.0093,
       "Other Renewables": 0,
-      "Solar": 0.1245,
-      "Wind": 0.0935
+      "Solar": 0.1229,
+      "Wind": 0.1069
     }
   },
   "BS": {
@@ -2295,20 +2295,20 @@
       "Bioenergy": 0.1709,
       "Coal": 0.0232,
       "Gas": 0.1055,
-      "Hydro": 0.5233,
+      "Hydro": 0.5234,
       "Nuclear": 0.0095,
-      "Other Fossil": 0.1209,
+      "Other Fossil": 0.1208,
       "Other Renewables": 0.0033,
       "Solar": 0.0184,
       "Wind": 0.0251
     },
     "2020": {
       "Bioenergy": 0.1713,
-      "Coal": 0.0186,
+      "Coal": 0.0187,
       "Gas": 0.1089,
       "Hydro": 0.5275,
       "Nuclear": 0.0098,
-      "Other Fossil": 0.1106,
+      "Other Fossil": 0.1105,
       "Other Renewables": 0.0032,
       "Solar": 0.0219,
       "Wind": 0.0282
@@ -2319,7 +2319,7 @@
       "Gas": 0.1195,
       "Hydro": 0.5133,
       "Nuclear": 0.0097,
-      "Other Fossil": 0.1076,
+      "Other Fossil": 0.1075,
       "Other Renewables": 0.0029,
       "Solar": 0.0252,
       "Wind": 0.0332
@@ -2328,9 +2328,9 @@
       "Bioenergy": 0.1705,
       "Coal": 0.0142,
       "Gas": 0.1011,
-      "Hydro": 0.5284,
+      "Hydro": 0.5286,
       "Nuclear": 0.0084,
-      "Other Fossil": 0.1099,
+      "Other Fossil": 0.1098,
       "Other Renewables": 0.0029,
       "Solar": 0.0295,
       "Wind": 0.035
@@ -2339,34 +2339,34 @@
       "Bioenergy": 0.1707,
       "Coal": 0.0171,
       "Gas": 0.1023,
-      "Hydro": 0.519,
+      "Hydro": 0.5191,
       "Nuclear": 0.0088,
-      "Other Fossil": 0.1058,
+      "Other Fossil": 0.1057,
       "Other Renewables": 0.0026,
       "Solar": 0.0355,
       "Wind": 0.038
     },
     "2024": {
       "Bioenergy": 0.171,
-      "Coal": 0.0156,
-      "Gas": 0.1042,
-      "Hydro": 0.511,
+      "Coal": 0.0157,
+      "Gas": 0.1043,
+      "Hydro": 0.5107,
       "Nuclear": 0.0092,
-      "Other Fossil": 0.1036,
+      "Other Fossil": 0.1038,
       "Other Renewables": 0.0024,
       "Solar": 0.042,
       "Wind": 0.041
     },
     "2025": {
-      "Bioenergy": 0.1699,
-      "Coal": 0.014,
-      "Gas": 0.094,
-      "Hydro": 0.5176,
-      "Nuclear": 0.0077,
-      "Other Fossil": 0.1007,
-      "Other Renewables": 0.0023,
-      "Solar": 0.0487,
-      "Wind": 0.0451
+      "Bioenergy": 0.1692,
+      "Coal": 0.012,
+      "Gas": 0.0927,
+      "Hydro": 0.5327,
+      "Nuclear": 0.0095,
+      "Other Fossil": 0.1018,
+      "Other Renewables": 0.0024,
+      "Solar": 0.0468,
+      "Wind": 0.0329
     }
   },
   "CA": {
@@ -2426,26 +2426,26 @@
       "Wind": 0.0646
     },
     "2024": {
-      "Bioenergy": 0.0162,
-      "Coal": 0.0472,
-      "Gas": 0.1486,
-      "Hydro": 0.5572,
-      "Nuclear": 0.1342,
-      "Other Fossil": 0.0106,
+      "Bioenergy": 0.0161,
+      "Coal": 0.047,
+      "Gas": 0.1479,
+      "Hydro": 0.5594,
+      "Nuclear": 0.134,
+      "Other Fossil": 0.0105,
       "Other Renewables": 0.0005,
-      "Solar": 0.009,
-      "Wind": 0.0765
+      "Solar": 0.0088,
+      "Wind": 0.0757
     },
     "2025": {
-      "Bioenergy": 0.0161,
-      "Coal": 0.0465,
-      "Gas": 0.1462,
-      "Hydro": 0.5561,
-      "Nuclear": 0.1321,
-      "Other Fossil": 0.0105,
-      "Other Renewables": 0.0006,
-      "Solar": 0.0036,
-      "Wind": 0.0883
+      "Bioenergy": 0.0154,
+      "Coal": 0.0447,
+      "Gas": 0.1403,
+      "Hydro": 0.5779,
+      "Nuclear": 0.1309,
+      "Other Fossil": 0.0099,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0024,
+      "Wind": 0.0781
     }
   },
   "CD": {
@@ -2723,7 +2723,7 @@
       "Bioenergy": 0.0028,
       "Coal": 0.0161,
       "Gas": 0.0246,
-      "Hydro": 0.4872,
+      "Hydro": 0.4873,
       "Nuclear": 0.3539,
       "Other Fossil": 0.0546,
       "Other Renewables": 0.0006,
@@ -2744,24 +2744,24 @@
     "2024": {
       "Bioenergy": 0.0004,
       "Coal": 0.002,
-      "Gas": 0.0035,
-      "Hydro": 0.5954,
-      "Nuclear": 0.2935,
-      "Other Fossil": 0.0463,
+      "Gas": 0.0036,
+      "Hydro": 0.5955,
+      "Nuclear": 0.2942,
+      "Other Fossil": 0.0453,
       "Other Renewables": 0.0001,
-      "Solar": 0.0553,
+      "Solar": 0.0554,
       "Wind": 0.0036
     },
     "2025": {
-      "Bioenergy": 0.0025,
-      "Coal": 0.0136,
-      "Gas": 0.0245,
-      "Hydro": 0.51,
-      "Nuclear": 0.3544,
-      "Other Fossil": 0.0508,
+      "Bioenergy": 0.0029,
+      "Coal": 0.0156,
+      "Gas": 0.0274,
+      "Hydro": 0.5027,
+      "Nuclear": 0.3523,
+      "Other Fossil": 0.0452,
       "Other Renewables": 0.0006,
-      "Solar": 0.0285,
-      "Wind": 0.015
+      "Solar": 0.0383,
+      "Wind": 0.0152
     }
   },
   "CI": {
@@ -2990,15 +2990,15 @@
       "Wind": 0.1296
     },
     "2025": {
-      "Bioenergy": 0.0233,
-      "Coal": 0.1084,
-      "Gas": 0.1427,
-      "Hydro": 0.284,
+      "Bioenergy": 0.0238,
+      "Coal": 0.1242,
+      "Gas": 0.1567,
+      "Hydro": 0.2657,
       "Nuclear": 0,
-      "Other Fossil": 0.011,
+      "Other Fossil": 0.0116,
       "Other Renewables": 0.0014,
-      "Solar": 0.2853,
-      "Wind": 0.144
+      "Solar": 0.2772,
+      "Wind": 0.1393
     }
   },
   "CM": {
@@ -3089,7 +3089,7 @@
       "Nuclear": 0.0475,
       "Other Fossil": 0.0028,
       "Other Renewables": 0,
-      "Solar": 0.0306,
+      "Solar": 0.0305,
       "Wind": 0.0553
     },
     "2020": {
@@ -3100,7 +3100,7 @@
       "Nuclear": 0.0481,
       "Other Fossil": 0.0026,
       "Other Renewables": 0,
-      "Solar": 0.0343,
+      "Solar": 0.0342,
       "Wind": 0.0612
     },
     "2021": {
@@ -3137,26 +3137,26 @@
       "Wind": 0.0952
     },
     "2024": {
-      "Bioenergy": 0.0194,
-      "Coal": 0.5909,
-      "Gas": 0.0285,
-      "Hydro": 0.1293,
-      "Nuclear": 0.0447,
+      "Bioenergy": 0.0195,
+      "Coal": 0.5919,
+      "Gas": 0.0286,
+      "Hydro": 0.1295,
+      "Nuclear": 0.0448,
       "Other Fossil": 0.0017,
       "Other Renewables": 0,
-      "Solar": 0.0859,
-      "Wind": 0.0995
+      "Solar": 0.0841,
+      "Wind": 0.1
     },
     "2025": {
-      "Bioenergy": 0.0203,
-      "Coal": 0.6169,
-      "Gas": 0.0298,
-      "Hydro": 0.0929,
-      "Nuclear": 0.0472,
-      "Other Fossil": 0.0018,
+      "Bioenergy": 0.0194,
+      "Coal": 0.5911,
+      "Gas": 0.0285,
+      "Hydro": 0.092,
+      "Nuclear": 0.0465,
+      "Other Fossil": 0.0017,
       "Other Renewables": 0,
-      "Solar": 0.0804,
-      "Wind": 0.1108
+      "Solar": 0.1007,
+      "Wind": 0.1201
     }
   },
   "CO": {
@@ -3228,13 +3228,13 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.1182,
-      "Gas": 0.0694,
-      "Hydro": 0.7489,
+      "Coal": 0.1088,
+      "Gas": 0.059,
+      "Hydro": 0.7708,
       "Nuclear": 0,
-      "Other Fossil": 0.0074,
+      "Other Fossil": 0.0062,
       "Other Renewables": 0,
-      "Solar": 0.0547,
+      "Solar": 0.0537,
       "Wind": 0.0015
     }
   },
@@ -3303,18 +3303,18 @@
       "Other Fossil": 0.106,
       "Other Renewables": 0.1171,
       "Solar": 0.0019,
-      "Wind": 0.0981
+      "Wind": 0.098
     },
     "2025": {
-      "Bioenergy": 0.0083,
+      "Bioenergy": 0.009,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.7521,
+      "Hydro": 0.7344,
       "Nuclear": 0,
       "Other Fossil": 0,
-      "Other Renewables": 0.0909,
+      "Other Renewables": 0.0991,
       "Solar": 0,
-      "Wind": 0.1488
+      "Wind": 0.1575
     }
   },
   "CU": {
@@ -3537,10 +3537,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.7587,
+      "Other Fossil": 0.7627,
       "Other Renewables": 0,
-      "Solar": 0.2021,
-      "Wind": 0.0392
+      "Solar": 0.1985,
+      "Wind": 0.0388
     },
     "2025": {
       "Bioenergy": 0,
@@ -3548,10 +3548,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.7708,
+      "Other Fossil": 0.8182,
       "Other Renewables": 0,
-      "Solar": 0.1875,
-      "Wind": 0.0417
+      "Solar": 0.1455,
+      "Wind": 0.0364
     }
   },
   "CZ": {
@@ -3622,15 +3622,15 @@
       "Wind": 0.0103
     },
     "2025": {
-      "Bioenergy": 0.0344,
-      "Coal": 0.4427,
-      "Gas": 0.0645,
-      "Hydro": 0.0287,
-      "Nuclear": 0.3653,
-      "Other Fossil": 0.0115,
-      "Other Renewables": 0.0287,
-      "Solar": 0.0143,
-      "Wind": 0.01
+      "Bioenergy": 0.0338,
+      "Coal": 0.442,
+      "Gas": 0.0646,
+      "Hydro": 0.0265,
+      "Nuclear": 0.3605,
+      "Other Fossil": 0.011,
+      "Other Renewables": 0.0279,
+      "Solar": 0.0256,
+      "Wind": 0.0081
     }
   },
   "DE": {
@@ -3690,26 +3690,26 @@
       "Wind": 0.2709
     },
     "2024": {
-      "Bioenergy": 0.0867,
+      "Bioenergy": 0.0868,
       "Coal": 0.2123,
       "Gas": 0.1674,
       "Hydro": 0.0569,
       "Nuclear": 0.0111,
       "Other Fossil": 0.0445,
       "Other Renewables": 0.0004,
-      "Solar": 0.148,
+      "Solar": 0.1479,
       "Wind": 0.2727
     },
     "2025": {
-      "Bioenergy": 0.0792,
-      "Coal": 0.2477,
-      "Gas": 0.1982,
-      "Hydro": 0.0351,
-      "Nuclear": 0.0006,
-      "Other Fossil": 0.0568,
-      "Other Renewables": 0,
-      "Solar": 0.0429,
-      "Wind": 0.3395
+      "Bioenergy": 0.079,
+      "Coal": 0.2705,
+      "Gas": 0.2065,
+      "Hydro": 0.0352,
+      "Nuclear": 0.003,
+      "Other Fossil": 0.0565,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0631,
+      "Wind": 0.2859
     }
   },
   "DJ": {
@@ -3843,7 +3843,7 @@
       "Hydro": 0.0177,
       "Nuclear": 0.0199,
       "Other Fossil": 0.0359,
-      "Other Renewables": 0.0006,
+      "Other Renewables": 0.0007,
       "Solar": 0.0914,
       "Wind": 0.5468
     },
@@ -3851,7 +3851,7 @@
       "Bioenergy": 0.1066,
       "Coal": 0.099,
       "Gas": 0.0711,
-      "Hydro": 0.0192,
+      "Hydro": 0.0191,
       "Nuclear": 0.0215,
       "Other Fossil": 0.0343,
       "Other Renewables": 0.0007,
@@ -3859,15 +3859,15 @@
       "Wind": 0.5426
     },
     "2025": {
-      "Bioenergy": 0.1375,
-      "Coal": 0.1003,
-      "Gas": 0.0919,
-      "Hydro": 0.017,
-      "Nuclear": 0.0222,
-      "Other Fossil": 0.0339,
-      "Other Renewables": 0.0007,
-      "Solar": 0.0189,
-      "Wind": 0.5777
+      "Bioenergy": 0.1381,
+      "Coal": 0.1179,
+      "Gas": 0.102,
+      "Hydro": 0.022,
+      "Nuclear": 0.0281,
+      "Other Fossil": 0.039,
+      "Other Renewables": 0.0009,
+      "Solar": 0.0347,
+      "Wind": 0.5174
     }
   },
   "DM": {
@@ -4164,26 +4164,26 @@
       "Wind": 0.0088
     },
     "2024": {
-      "Bioenergy": 0.0151,
+      "Bioenergy": 0.014,
       "Coal": 0.0013,
-      "Gas": 0.0385,
-      "Hydro": 0.6522,
-      "Nuclear": 0.0007,
-      "Other Fossil": 0.2793,
+      "Gas": 0.0384,
+      "Hydro": 0.6581,
+      "Nuclear": 0.0008,
+      "Other Fossil": 0.2743,
       "Other Renewables": 0.0002,
-      "Solar": 0.0027,
-      "Wind": 0.01
+      "Solar": 0.0028,
+      "Wind": 0.0101
     },
     "2025": {
-      "Bioenergy": 0.0298,
-      "Coal": 0.0024,
-      "Gas": 0.0576,
-      "Hydro": 0.4514,
-      "Nuclear": 0.0013,
-      "Other Fossil": 0.439,
+      "Bioenergy": 0.0004,
+      "Coal": 0.0019,
+      "Gas": 0.0462,
+      "Hydro": 0.6323,
+      "Nuclear": 0.0015,
+      "Other Fossil": 0.303,
       "Other Renewables": 0.0004,
-      "Solar": 0.0063,
-      "Wind": 0.0118
+      "Solar": 0.0058,
+      "Wind": 0.0084
     }
   },
   "EE": {
@@ -4228,7 +4228,7 @@
       "Nuclear": 0.0268,
       "Other Fossil": 0.6252,
       "Other Renewables": 0.0009,
-      "Solar": 0.0733,
+      "Solar": 0.0732,
       "Wind": 0.1014
     },
     "2023": {
@@ -4244,25 +4244,25 @@
     },
     "2024": {
       "Bioenergy": 0.0677,
-      "Coal": 0.051,
+      "Coal": 0.0511,
       "Gas": 0.0866,
       "Hydro": 0.0659,
-      "Nuclear": 0.0754,
+      "Nuclear": 0.0755,
       "Other Fossil": 0.3045,
       "Other Renewables": 0.0024,
-      "Solar": 0.1442,
+      "Solar": 0.1441,
       "Wind": 0.2023
     },
     "2025": {
-      "Bioenergy": 0.0769,
-      "Coal": 0.0598,
-      "Gas": 0.1076,
-      "Hydro": 0.0639,
-      "Nuclear": 0.0839,
-      "Other Fossil": 0.2981,
-      "Other Renewables": 0.0025,
-      "Solar": 0.0113,
-      "Wind": 0.296
+      "Bioenergy": 0.0794,
+      "Coal": 0.057,
+      "Gas": 0.1004,
+      "Hydro": 0.0594,
+      "Nuclear": 0.0766,
+      "Other Fossil": 0.3736,
+      "Other Renewables": 0.0023,
+      "Solar": 0.0212,
+      "Wind": 0.23
     }
   },
   "EG": {
@@ -4491,15 +4491,15 @@
       "Wind": 0.2368
     },
     "2025": {
-      "Bioenergy": 0.0141,
-      "Coal": 0.0133,
-      "Gas": 0.1764,
-      "Hydro": 0.1264,
-      "Nuclear": 0.2308,
-      "Other Fossil": 0.0071,
-      "Other Renewables": 0.0022,
-      "Solar": 0.1012,
-      "Wind": 0.3285
+      "Bioenergy": 0.0144,
+      "Coal": 0.0135,
+      "Gas": 0.1809,
+      "Hydro": 0.1519,
+      "Nuclear": 0.2313,
+      "Other Fossil": 0.007,
+      "Other Renewables": 0.0023,
+      "Solar": 0.1414,
+      "Wind": 0.2573
     }
   },
   "ET": {
@@ -4638,26 +4638,26 @@
       "Wind": 0.1767
     },
     "2024": {
-      "Bioenergy": 0.1133,
+      "Bioenergy": 0.1137,
       "Coal": 0.0185,
-      "Gas": 0.0195,
-      "Hydro": 0.1771,
-      "Nuclear": 0.3746,
+      "Gas": 0.018,
+      "Hydro": 0.178,
+      "Nuclear": 0.3748,
       "Other Fossil": 0.0433,
       "Other Renewables": 0.0014,
       "Solar": 0.017,
-      "Wind": 0.2351
+      "Wind": 0.2352
     },
     "2025": {
-      "Bioenergy": 0.1097,
-      "Coal": 0.0204,
-      "Gas": 0.0397,
-      "Hydro": 0.1354,
-      "Nuclear": 0.3725,
-      "Other Fossil": 0.0558,
-      "Other Renewables": 0.0038,
-      "Solar": 0.0023,
-      "Wind": 0.2603
+      "Bioenergy": 0.1105,
+      "Coal": 0.0231,
+      "Gas": 0.0229,
+      "Hydro": 0.1393,
+      "Nuclear": 0.3745,
+      "Other Fossil": 0.055,
+      "Other Renewables": 0.0035,
+      "Solar": 0.0041,
+      "Wind": 0.2674
     }
   },
   "FJ": {
@@ -4965,15 +4965,15 @@
       "Wind": 0.0896
     },
     "2025": {
-      "Bioenergy": 0.0054,
-      "Coal": 0.0063,
-      "Gas": 0.053,
-      "Hydro": 0.1112,
-      "Nuclear": 0.6957,
-      "Other Fossil": 0.0063,
+      "Bioenergy": 0.0051,
+      "Coal": 0.0065,
+      "Gas": 0.0566,
+      "Hydro": 0.1153,
+      "Nuclear": 0.693,
+      "Other Fossil": 0.0064,
       "Other Renewables": 0,
-      "Solar": 0.0189,
-      "Wind": 0.1032
+      "Solar": 0.0255,
+      "Wind": 0.0917
     }
   },
   "GA": {
@@ -5104,7 +5104,7 @@
       "Bioenergy": 0.0538,
       "Coal": 0.0237,
       "Gas": 0.3527,
-      "Hydro": 0.0279,
+      "Hydro": 0.028,
       "Nuclear": 0.1645,
       "Other Fossil": 0.0116,
       "Other Renewables": 0.0006,
@@ -5123,15 +5123,15 @@
       "Wind": 0.324
     },
     "2025": {
-      "Bioenergy": 0.0658,
-      "Coal": 0.0131,
-      "Gas": 0.4041,
-      "Hydro": 0.0294,
-      "Nuclear": 0.1328,
-      "Other Fossil": 0.0169,
+      "Bioenergy": 0.0689,
+      "Coal": 0.0123,
+      "Gas": 0.3768,
+      "Hydro": 0.027,
+      "Nuclear": 0.1325,
+      "Other Fossil": 0.0159,
       "Other Renewables": 0.0005,
-      "Solar": 0.0182,
-      "Wind": 0.3192
+      "Solar": 0.0227,
+      "Wind": 0.3434
     }
   },
   "GD": {
@@ -5255,7 +5255,7 @@
       "Nuclear": 0.0056,
       "Other Fossil": 0.0011,
       "Other Renewables": 0.0005,
-      "Solar": 0.0047,
+      "Solar": 0.0048,
       "Wind": 0.0143
     },
     "2023": {
@@ -5267,29 +5267,29 @@
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0003,
       "Solar": 0.0032,
-      "Wind": 0.0124
+      "Wind": 0.0123
     },
     "2024": {
       "Bioenergy": 0.0016,
-      "Coal": 0.0406,
+      "Coal": 0.0405,
       "Gas": 0.2033,
       "Hydro": 0.731,
       "Nuclear": 0.0039,
       "Other Fossil": 0.0004,
       "Other Renewables": 0.0004,
       "Solar": 0.0053,
-      "Wind": 0.0135
+      "Wind": 0.0136
     },
     "2025": {
-      "Bioenergy": 0.0035,
-      "Coal": 0.0881,
-      "Gas": 0.3684,
-      "Hydro": 0.4971,
-      "Nuclear": 0.0086,
-      "Other Fossil": 0.0009,
-      "Other Renewables": 0.0008,
-      "Solar": 0.0113,
-      "Wind": 0.0213
+      "Bioenergy": 0.0059,
+      "Coal": 0.1449,
+      "Gas": 0.3147,
+      "Hydro": 0.4626,
+      "Nuclear": 0.0149,
+      "Other Fossil": 0.0021,
+      "Other Renewables": 0.0015,
+      "Solar": 0.0229,
+      "Wind": 0.0305
     }
   },
   "GF": {
@@ -5993,14 +5993,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.1116,
-      "Gas": 0.4989,
-      "Hydro": 0.0481,
+      "Coal": 0.1049,
+      "Gas": 0.5154,
+      "Hydro": 0.0442,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.1575,
-      "Wind": 0.1838
+      "Solar": 0.1556,
+      "Wind": 0.1799
     }
   },
   "GT": {
@@ -6328,7 +6328,7 @@
       "Nuclear": 0.0134,
       "Other Fossil": 0.0063,
       "Other Renewables": 0.0014,
-      "Solar": 0.008,
+      "Solar": 0.0081,
       "Wind": 0.0103
     },
     "2020": {
@@ -6339,63 +6339,63 @@
       "Nuclear": 0.0134,
       "Other Fossil": 0.006,
       "Other Renewables": 0.0012,
-      "Solar": 0.0094,
+      "Solar": 0.0095,
       "Wind": 0.0114
     },
     "2021": {
       "Bioenergy": 0.0077,
-      "Coal": 0.5706,
+      "Coal": 0.5705,
       "Gas": 0.343,
       "Hydro": 0.0328,
       "Nuclear": 0.0134,
       "Other Fossil": 0.0061,
       "Other Renewables": 0.0012,
-      "Solar": 0.0108,
+      "Solar": 0.0109,
       "Wind": 0.0143
     },
     "2022": {
       "Bioenergy": 0.0081,
-      "Coal": 0.5676,
+      "Coal": 0.5675,
       "Gas": 0.3417,
       "Hydro": 0.0328,
       "Nuclear": 0.0134,
       "Other Fossil": 0.0062,
       "Other Renewables": 0.0013,
-      "Solar": 0.0131,
+      "Solar": 0.0132,
       "Wind": 0.0159
     },
     "2023": {
       "Bioenergy": 0.0082,
-      "Coal": 0.5686,
-      "Gas": 0.3405,
-      "Hydro": 0.0293,
+      "Coal": 0.5685,
+      "Gas": 0.3404,
+      "Hydro": 0.0292,
       "Nuclear": 0.0134,
       "Other Fossil": 0.0055,
       "Other Renewables": 0.0013,
-      "Solar": 0.0157,
+      "Solar": 0.0159,
       "Wind": 0.0176
     },
     "2024": {
       "Bioenergy": 0.008,
-      "Coal": 0.5644,
+      "Coal": 0.5643,
       "Gas": 0.3396,
       "Hydro": 0.0303,
       "Nuclear": 0.0132,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.0013,
       "Solar": 0.0198,
-      "Wind": 0.0183
+      "Wind": 0.0184
     },
     "2025": {
-      "Bioenergy": 0.0086,
-      "Coal": 0.5695,
-      "Gas": 0.3392,
-      "Hydro": 0.0232,
-      "Nuclear": 0.014,
-      "Other Fossil": 0.0052,
-      "Other Renewables": 0.0013,
-      "Solar": 0.0186,
-      "Wind": 0.0205
+      "Bioenergy": 0.0085,
+      "Coal": 0.5648,
+      "Gas": 0.3405,
+      "Hydro": 0.0215,
+      "Nuclear": 0.0142,
+      "Other Fossil": 0.0057,
+      "Other Renewables": 0.0014,
+      "Solar": 0.0221,
+      "Wind": 0.0213
     }
   },
   "HN": {
@@ -6467,14 +6467,14 @@
     },
     "2025": {
       "Bioenergy": 0.1282,
-      "Coal": 0.0051,
-      "Gas": 0.0049,
-      "Hydro": 0.2233,
-      "Nuclear": 0.0004,
-      "Other Fossil": 0.4371,
+      "Coal": 0.005,
+      "Gas": 0.0048,
+      "Hydro": 0.2241,
+      "Nuclear": 0.0005,
+      "Other Fossil": 0.4372,
       "Other Renewables": 0.0264,
-      "Solar": 0.1002,
-      "Wind": 0.0742
+      "Solar": 0.1001,
+      "Wind": 0.0736
     }
   },
   "HR": {
@@ -6529,7 +6529,7 @@
       "Hydro": 0.4061,
       "Nuclear": 0.0294,
       "Other Fossil": 0.009,
-      "Other Renewables": 0.0153,
+      "Other Renewables": 0.0154,
       "Solar": 0.0324,
       "Wind": 0.1578
     },
@@ -6539,21 +6539,21 @@
       "Gas": 0.2145,
       "Hydro": 0.3472,
       "Nuclear": 0.0543,
-      "Other Fossil": 0.0098,
+      "Other Fossil": 0.0097,
       "Other Renewables": 0.0163,
       "Solar": 0.0701,
-      "Wind": 0.1734
+      "Wind": 0.1733
     },
     "2025": {
-      "Bioenergy": 0.0364,
-      "Coal": 0.0336,
-      "Gas": 0.2652,
-      "Hydro": 0.3492,
-      "Nuclear": 0.0471,
-      "Other Fossil": 0.0108,
-      "Other Renewables": 0.0134,
-      "Solar": 0.0124,
-      "Wind": 0.232
+      "Bioenergy": 0.0385,
+      "Coal": 0.0411,
+      "Gas": 0.2765,
+      "Hydro": 0.3215,
+      "Nuclear": 0.0549,
+      "Other Fossil": 0.012,
+      "Other Renewables": 0.0141,
+      "Solar": 0.0357,
+      "Wind": 0.2057
     }
   },
   "HT": {
@@ -6677,8 +6677,8 @@
       "Nuclear": 0.3819,
       "Other Fossil": 0.0219,
       "Other Renewables": 0.0044,
-      "Solar": 0.1176,
-      "Wind": 0.0443
+      "Solar": 0.1175,
+      "Wind": 0.0442
     },
     "2023": {
       "Bioenergy": 0.0239,
@@ -6687,31 +6687,31 @@
       "Hydro": 0.0475,
       "Nuclear": 0.3887,
       "Other Fossil": 0.0193,
-      "Other Renewables": 0.0027,
+      "Other Renewables": 0.0028,
       "Solar": 0.1644,
       "Wind": 0.047
     },
     "2024": {
-      "Bioenergy": 0.0264,
-      "Coal": 0.0879,
-      "Gas": 0.1907,
-      "Hydro": 0.0454,
-      "Nuclear": 0.3704,
+      "Bioenergy": 0.0265,
+      "Coal": 0.0881,
+      "Gas": 0.191,
+      "Hydro": 0.0455,
+      "Nuclear": 0.3711,
       "Other Fossil": 0.0177,
       "Other Renewables": 0.004,
-      "Solar": 0.2127,
+      "Solar": 0.2112,
       "Wind": 0.0448
     },
     "2025": {
-      "Bioenergy": 0.034,
-      "Coal": 0.0758,
-      "Gas": 0.2803,
-      "Hydro": 0.0477,
-      "Nuclear": 0.3768,
-      "Other Fossil": 0.0168,
-      "Other Renewables": 0.0039,
-      "Solar": 0.1114,
-      "Wind": 0.0533
+      "Bioenergy": 0.0369,
+      "Coal": 0.0796,
+      "Gas": 0.2904,
+      "Hydro": 0.0472,
+      "Nuclear": 0.358,
+      "Other Fossil": 0.0176,
+      "Other Renewables": 0.004,
+      "Solar": 0.1184,
+      "Wind": 0.0478
     }
   },
   "ID": {
@@ -6761,7 +6761,7 @@
     },
     "2023": {
       "Bioenergy": 0.0411,
-      "Coal": 0.5905,
+      "Coal": 0.5904,
       "Gas": 0.2103,
       "Hydro": 0.0719,
       "Nuclear": 0.0003,
@@ -6783,13 +6783,13 @@
     },
     "2025": {
       "Bioenergy": 0.0411,
-      "Coal": 0.5905,
+      "Coal": 0.5904,
       "Gas": 0.2103,
       "Hydro": 0.0717,
       "Nuclear": 0.0003,
       "Other Fossil": 0.0356,
       "Other Renewables": 0.0476,
-      "Solar": 0.0008,
+      "Solar": 0.0009,
       "Wind": 0.0021
     }
   },
@@ -6862,14 +6862,14 @@
     },
     "2025": {
       "Bioenergy": 0.0068,
-      "Coal": 0.0354,
-      "Gas": 0.4042,
+      "Coal": 0.0359,
+      "Gas": 0.4043,
       "Hydro": 0.0492,
-      "Nuclear": 0.0276,
+      "Nuclear": 0.0271,
       "Other Fossil": 0.0341,
       "Other Renewables": 0.0008,
-      "Solar": 0.01,
-      "Wind": 0.432
+      "Solar": 0.0115,
+      "Wind": 0.4302
     }
   },
   "IL": {
@@ -7020,14 +7020,14 @@
     },
     "2025": {
       "Bioenergy": 0.0163,
-      "Coal": 0.7566,
-      "Gas": 0.0114,
-      "Hydro": 0.0607,
-      "Nuclear": 0.0363,
+      "Coal": 0.7633,
+      "Gas": 0.0102,
+      "Hydro": 0.0543,
+      "Nuclear": 0.0324,
       "Other Fossil": 0.0003,
       "Other Renewables": 0.0016,
-      "Solar": 0.076,
-      "Wind": 0.0408
+      "Solar": 0.0833,
+      "Wind": 0.0382
     }
   },
   "IQ": {
@@ -7179,10 +7179,10 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.6419,
-      "Hydro": 0.0243,
+      "Gas": 0.6644,
+      "Hydro": 0.0186,
       "Nuclear": 0,
-      "Other Fossil": 0.3338,
+      "Other Fossil": 0.317,
       "Other Renewables": 0,
       "Solar": 0,
       "Wind": 0
@@ -7292,7 +7292,7 @@
     },
     "2021": {
       "Bioenergy": 0.0615,
-      "Coal": 0.0647,
+      "Coal": 0.0648,
       "Gas": 0.4753,
       "Hydro": 0.1583,
       "Nuclear": 0.0308,
@@ -7327,7 +7327,7 @@
       "Bioenergy": 0.0555,
       "Coal": 0.0352,
       "Gas": 0.4092,
-      "Hydro": 0.1862,
+      "Hydro": 0.1861,
       "Nuclear": 0.0346,
       "Other Fossil": 0.0313,
       "Other Renewables": 0.0189,
@@ -7335,15 +7335,15 @@
       "Wind": 0.097
     },
     "2025": {
-      "Bioenergy": 0.0541,
-      "Coal": 0.0402,
-      "Gas": 0.5058,
-      "Hydro": 0.1127,
-      "Nuclear": 0.036,
-      "Other Fossil": 0.0251,
+      "Bioenergy": 0.0542,
+      "Coal": 0.0409,
+      "Gas": 0.5059,
+      "Hydro": 0.1128,
+      "Nuclear": 0.0353,
+      "Other Fossil": 0.0252,
       "Other Renewables": 0.0192,
-      "Solar": 0.0719,
-      "Wind": 0.1349
+      "Solar": 0.0739,
+      "Wind": 0.1326
     }
   },
   "JM": {
@@ -7698,7 +7698,7 @@
     },
     "2022": {
       "Bioenergy": 0.0018,
-      "Coal": 0.1553,
+      "Coal": 0.1552,
       "Gas": 0.0167,
       "Hydro": 0.8089,
       "Nuclear": 0.0046,
@@ -7708,37 +7708,37 @@
       "Wind": 0.0059
     },
     "2023": {
-      "Bioenergy": 0.0017,
+      "Bioenergy": 0.0016,
       "Coal": 0.1592,
       "Gas": 0.0155,
       "Hydro": 0.8071,
-      "Nuclear": 0.004,
+      "Nuclear": 0.0039,
       "Other Fossil": 0.0029,
       "Other Renewables": 0.0004,
-      "Solar": 0.0039,
+      "Solar": 0.004,
       "Wind": 0.0054
     },
     "2024": {
       "Bioenergy": 0.0019,
-      "Coal": 0.1307,
+      "Coal": 0.1306,
       "Gas": 0.0168,
       "Hydro": 0.8151,
       "Nuclear": 0.0047,
       "Other Fossil": 0.017,
       "Other Renewables": 0.0005,
       "Solar": 0.0066,
-      "Wind": 0.0066
+      "Wind": 0.0067
     },
     "2025": {
       "Bioenergy": 0.0017,
-      "Coal": 0.1009,
-      "Gas": 0.0155,
-      "Hydro": 0.8403,
+      "Coal": 0.0995,
+      "Gas": 0.0159,
+      "Hydro": 0.8397,
       "Nuclear": 0.0042,
-      "Other Fossil": 0.0254,
+      "Other Fossil": 0.0256,
       "Other Renewables": 0.0004,
-      "Solar": 0.0054,
-      "Wind": 0.0061
+      "Solar": 0.0065,
+      "Wind": 0.0064
     }
   },
   "KH": {
@@ -7755,7 +7755,7 @@
     },
     "2020": {
       "Bioenergy": 0.0126,
-      "Coal": 0.4701,
+      "Coal": 0.47,
       "Gas": 0.0298,
       "Hydro": 0.3862,
       "Nuclear": 0.0135,
@@ -7767,57 +7767,57 @@
     "2021": {
       "Bioenergy": 0.0131,
       "Coal": 0.4694,
-      "Gas": 0.0282,
+      "Gas": 0.0281,
       "Hydro": 0.3834,
       "Nuclear": 0.0135,
       "Other Fossil": 0.0562,
       "Other Renewables": 0.0013,
-      "Solar": 0.0205,
+      "Solar": 0.0206,
       "Wind": 0.0144
     },
     "2022": {
       "Bioenergy": 0.0136,
-      "Coal": 0.4664,
+      "Coal": 0.4663,
       "Gas": 0.0268,
       "Hydro": 0.3834,
       "Nuclear": 0.0135,
       "Other Fossil": 0.0562,
       "Other Renewables": 0.0013,
-      "Solar": 0.0228,
+      "Solar": 0.0229,
       "Wind": 0.016
     },
     "2023": {
       "Bioenergy": 0.0137,
-      "Coal": 0.4674,
+      "Coal": 0.4673,
       "Gas": 0.0255,
       "Hydro": 0.3799,
       "Nuclear": 0.0135,
-      "Other Fossil": 0.0556,
+      "Other Fossil": 0.0555,
       "Other Renewables": 0.0013,
-      "Solar": 0.0254,
+      "Solar": 0.0256,
       "Wind": 0.0177
     },
     "2024": {
       "Bioenergy": 0.0135,
-      "Coal": 0.4632,
+      "Coal": 0.4631,
       "Gas": 0.0247,
       "Hydro": 0.3809,
       "Nuclear": 0.0133,
       "Other Fossil": 0.0552,
       "Other Renewables": 0.0013,
       "Solar": 0.0295,
-      "Wind": 0.0184
+      "Wind": 0.0185
     },
     "2025": {
-      "Bioenergy": 0.0141,
-      "Coal": 0.4683,
-      "Gas": 0.0243,
-      "Hydro": 0.3738,
-      "Nuclear": 0.0141,
-      "Other Fossil": 0.0552,
-      "Other Renewables": 0.0013,
-      "Solar": 0.0283,
-      "Wind": 0.0206
+      "Bioenergy": 0.014,
+      "Coal": 0.4636,
+      "Gas": 0.0256,
+      "Hydro": 0.372,
+      "Nuclear": 0.0143,
+      "Other Fossil": 0.0557,
+      "Other Renewables": 0.0014,
+      "Solar": 0.0318,
+      "Wind": 0.0215
     }
   },
   "KI": {
@@ -8205,14 +8205,14 @@
     },
     "2025": {
       "Bioenergy": 0.0209,
-      "Coal": 0.286,
-      "Gas": 0.2914,
-      "Hydro": 0.0041,
-      "Nuclear": 0.324,
-      "Other Fossil": 0.0083,
-      "Other Renewables": 0.0145,
-      "Solar": 0.0407,
-      "Wind": 0.0101
+      "Coal": 0.2538,
+      "Gas": 0.3038,
+      "Hydro": 0.0043,
+      "Nuclear": 0.3458,
+      "Other Fossil": 0.0077,
+      "Other Renewables": 0.0147,
+      "Solar": 0.0412,
+      "Wind": 0.0079
     }
   },
   "KW": {
@@ -8431,25 +8431,25 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.5505,
-      "Gas": 0.2779,
-      "Hydro": 0.0965,
+      "Coal": 0.5515,
+      "Gas": 0.2783,
+      "Hydro": 0.0954,
       "Nuclear": 0,
       "Other Fossil": 0.0205,
       "Other Renewables": 0,
-      "Solar": 0.0172,
-      "Wind": 0.0373
+      "Solar": 0.0163,
+      "Wind": 0.038
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5617,
-      "Gas": 0.2835,
-      "Hydro": 0.085,
+      "Coal": 0.5504,
+      "Gas": 0.2979,
+      "Hydro": 0.0745,
       "Nuclear": 0,
-      "Other Fossil": 0.0215,
+      "Other Fossil": 0.0227,
       "Other Renewables": 0,
-      "Solar": 0.0152,
-      "Wind": 0.0331
+      "Solar": 0.0082,
+      "Wind": 0.0463
     }
   },
   "LA": {
@@ -8952,7 +8952,7 @@
     "2021": {
       "Bioenergy": 0.0533,
       "Coal": 0.1139,
-      "Gas": 0.2746,
+      "Gas": 0.2747,
       "Hydro": 0.1488,
       "Nuclear": 0.1594,
       "Other Fossil": 0.0369,
@@ -8963,7 +8963,7 @@
     "2022": {
       "Bioenergy": 0.0516,
       "Coal": 0.1206,
-      "Gas": 0.2259,
+      "Gas": 0.226,
       "Hydro": 0.1432,
       "Nuclear": 0.1412,
       "Other Fossil": 0.0472,
@@ -8979,7 +8979,7 @@
       "Nuclear": 0.1202,
       "Other Fossil": 0.0575,
       "Other Renewables": 0.0039,
-      "Solar": 0.0892,
+      "Solar": 0.0891,
       "Wind": 0.2715
     },
     "2024": {
@@ -8990,19 +8990,19 @@
       "Nuclear": 0.0913,
       "Other Fossil": 0.0841,
       "Other Renewables": 0.0029,
-      "Solar": 0.1399,
-      "Wind": 0.3149
+      "Solar": 0.1398,
+      "Wind": 0.3148
     },
     "2025": {
-      "Bioenergy": 0.0256,
-      "Coal": 0.0493,
-      "Gas": 0.2526,
-      "Hydro": 0.0772,
-      "Nuclear": 0.0691,
-      "Other Fossil": 0.0973,
-      "Other Renewables": 0.002,
-      "Solar": 0.0257,
-      "Wind": 0.4012
+      "Bioenergy": 0.0235,
+      "Coal": 0.0579,
+      "Gas": 0.2826,
+      "Hydro": 0.0818,
+      "Nuclear": 0.0773,
+      "Other Fossil": 0.1073,
+      "Other Renewables": 0.0024,
+      "Solar": 0.0411,
+      "Wind": 0.3261
     }
   },
   "LU": {
@@ -9030,8 +9030,8 @@
     },
     "2021": {
       "Bioenergy": 0.0794,
-      "Coal": 0.12,
-      "Gas": 0.2381,
+      "Coal": 0.1201,
+      "Gas": 0.2382,
       "Hydro": 0.1481,
       "Nuclear": 0.1686,
       "Other Fossil": 0.0379,
@@ -9041,13 +9041,13 @@
     },
     "2022": {
       "Bioenergy": 0.0844,
-      "Coal": 0.1281,
-      "Gas": 0.2268,
+      "Coal": 0.1282,
+      "Gas": 0.2269,
       "Hydro": 0.1306,
       "Nuclear": 0.1501,
       "Other Fossil": 0.0383,
       "Other Renewables": 0.005,
-      "Solar": 0.088,
+      "Solar": 0.0879,
       "Wind": 0.1486
     },
     "2023": {
@@ -9065,23 +9065,23 @@
       "Bioenergy": 0.0735,
       "Coal": 0.0985,
       "Gas": 0.181,
-      "Hydro": 0.1559,
+      "Hydro": 0.1558,
       "Nuclear": 0.1479,
       "Other Fossil": 0.0371,
       "Other Renewables": 0.0047,
-      "Solar": 0.1156,
+      "Solar": 0.1155,
       "Wind": 0.1859
     },
     "2025": {
-      "Bioenergy": 0.0842,
-      "Coal": 0.1092,
-      "Gas": 0.2177,
-      "Hydro": 0.138,
-      "Nuclear": 0.1531,
-      "Other Fossil": 0.037,
-      "Other Renewables": 0.0045,
-      "Solar": 0.042,
-      "Wind": 0.2144
+      "Bioenergy": 0.0664,
+      "Coal": 0.1167,
+      "Gas": 0.2277,
+      "Hydro": 0.144,
+      "Nuclear": 0.1564,
+      "Other Fossil": 0.0391,
+      "Other Renewables": 0.0048,
+      "Solar": 0.0525,
+      "Wind": 0.1923
     }
   },
   "LV": {
@@ -9120,14 +9120,14 @@
     },
     "2022": {
       "Bioenergy": 0.058,
-      "Coal": 0.0584,
+      "Coal": 0.0585,
       "Gas": 0.2505,
       "Hydro": 0.4326,
       "Nuclear": 0.0677,
       "Other Fossil": 0.0449,
       "Other Renewables": 0.0023,
       "Solar": 0.0231,
-      "Wind": 0.0624
+      "Wind": 0.0623
     },
     "2023": {
       "Bioenergy": 0.0367,
@@ -9136,9 +9136,9 @@
       "Hydro": 0.4887,
       "Nuclear": 0.0568,
       "Other Fossil": 0.0241,
-      "Other Renewables": 0.0018,
+      "Other Renewables": 0.0019,
       "Solar": 0.0407,
-      "Wind": 0.0637
+      "Wind": 0.0636
     },
     "2024": {
       "Bioenergy": 0.0459,
@@ -9149,18 +9149,18 @@
       "Other Fossil": 0.0161,
       "Other Renewables": 0.0019,
       "Solar": 0.0779,
-      "Wind": 0.0666
+      "Wind": 0.0665
     },
     "2025": {
-      "Bioenergy": 0.0335,
-      "Coal": 0.0093,
-      "Gas": 0.3342,
-      "Hydro": 0.5337,
-      "Nuclear": 0.0131,
-      "Other Fossil": 0.0172,
-      "Other Renewables": 0.0004,
-      "Solar": 0.0018,
-      "Wind": 0.0568
+      "Bioenergy": 0.0311,
+      "Coal": 0.0048,
+      "Gas": 0.4639,
+      "Hydro": 0.4266,
+      "Nuclear": 0.0066,
+      "Other Fossil": 0.0158,
+      "Other Renewables": 0.0002,
+      "Solar": 0.0149,
+      "Wind": 0.0361
     }
   },
   "LY": {
@@ -9363,8 +9363,8 @@
       "Nuclear": 0.0308,
       "Other Fossil": 0.0035,
       "Other Renewables": 0.001,
-      "Solar": 0.0079,
-      "Wind": 0.0183
+      "Solar": 0.0078,
+      "Wind": 0.0182
     },
     "2023": {
       "Bioenergy": 0.0008,
@@ -9393,11 +9393,11 @@
       "Coal": 0.0031,
       "Gas": 0.9222,
       "Hydro": 0.045,
-      "Nuclear": 0.0043,
+      "Nuclear": 0.0042,
       "Other Fossil": 0.0004,
       "Other Renewables": 0.0001,
-      "Solar": 0.0214,
-      "Wind": 0.003
+      "Solar": 0.0217,
+      "Wind": 0.0027
     }
   },
   "ME": {
@@ -9449,11 +9449,11 @@
       "Bioenergy": 0.0008,
       "Coal": 0.3959,
       "Gas": 0.0072,
-      "Hydro": 0.4975,
+      "Hydro": 0.4976,
       "Nuclear": 0.006,
       "Other Fossil": 0.0006,
       "Other Renewables": 0.0002,
-      "Solar": 0.0029,
+      "Solar": 0.0028,
       "Wind": 0.0889
     },
     "2024": {
@@ -9465,18 +9465,18 @@
       "Other Fossil": 0.0029,
       "Other Renewables": 0.0009,
       "Solar": 0.0316,
-      "Wind": 0.0917
+      "Wind": 0.0916
     },
     "2025": {
-      "Bioenergy": 0.0038,
-      "Coal": 0.4092,
-      "Gas": 0.0366,
-      "Hydro": 0.4106,
-      "Nuclear": 0.0286,
-      "Other Fossil": 0.0029,
-      "Other Renewables": 0.0008,
-      "Solar": 0.0039,
-      "Wind": 0.1035
+      "Bioenergy": 0.0041,
+      "Coal": 0.4192,
+      "Gas": 0.0389,
+      "Hydro": 0.4054,
+      "Nuclear": 0.0297,
+      "Other Fossil": 0.0031,
+      "Other Renewables": 0.0009,
+      "Solar": 0.0057,
+      "Wind": 0.0929
     }
   },
   "MG": {
@@ -9594,7 +9594,7 @@
     },
     "2022": {
       "Bioenergy": 0.0123,
-      "Coal": 0.436,
+      "Coal": 0.4361,
       "Gas": 0.1882,
       "Hydro": 0.2297,
       "Nuclear": 0.0414,
@@ -9615,26 +9615,26 @@
       "Wind": 0.0292
     },
     "2024": {
-      "Bioenergy": 0.0177,
-      "Coal": 0.4008,
-      "Gas": 0.2386,
-      "Hydro": 0.2352,
-      "Nuclear": 0.0154,
-      "Other Fossil": 0.0015,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0477,
-      "Wind": 0.0426
+      "Bioenergy": 0.0191,
+      "Coal": 0.3936,
+      "Gas": 0.2328,
+      "Hydro": 0.2409,
+      "Nuclear": 0.0182,
+      "Other Fossil": 0.0018,
+      "Other Renewables": 0.0006,
+      "Solar": 0.05,
+      "Wind": 0.043
     },
     "2025": {
-      "Bioenergy": 0.0182,
-      "Coal": 0.3954,
-      "Gas": 0.2986,
-      "Hydro": 0.1605,
-      "Nuclear": 0.0379,
-      "Other Fossil": 0.0039,
-      "Other Renewables": 0.0011,
-      "Solar": 0.0315,
-      "Wind": 0.0531
+      "Bioenergy": 0.0191,
+      "Coal": 0.3404,
+      "Gas": 0.257,
+      "Hydro": 0.2272,
+      "Nuclear": 0.0557,
+      "Other Fossil": 0.0059,
+      "Other Renewables": 0.0017,
+      "Solar": 0.0222,
+      "Wind": 0.0709
     }
   },
   "ML": {
@@ -9877,80 +9877,80 @@
   "MO": {
     "2019": {
       "Bioenergy": 0.051,
-      "Coal": 0.5,
+      "Coal": 0.4999,
       "Gas": 0.1807,
       "Hydro": 0.1185,
       "Nuclear": 0.0457,
       "Other Fossil": 0.0381,
       "Other Renewables": 0.0048,
-      "Solar": 0.0261,
+      "Solar": 0.0263,
       "Wind": 0.0351
     },
     "2020": {
       "Bioenergy": 0.0525,
-      "Coal": 0.4916,
+      "Coal": 0.4915,
       "Gas": 0.178,
-      "Hydro": 0.1211,
+      "Hydro": 0.121,
       "Nuclear": 0.0457,
       "Other Fossil": 0.0371,
       "Other Renewables": 0.0041,
-      "Solar": 0.0309,
+      "Solar": 0.0312,
       "Wind": 0.0389
     },
     "2021": {
       "Bioenergy": 0.0542,
-      "Coal": 0.4895,
-      "Gas": 0.1726,
+      "Coal": 0.4893,
+      "Gas": 0.1725,
       "Hydro": 0.1118,
       "Nuclear": 0.0457,
       "Other Fossil": 0.0375,
       "Other Renewables": 0.0043,
-      "Solar": 0.0356,
+      "Solar": 0.0359,
       "Wind": 0.0488
     },
     "2022": {
       "Bioenergy": 0.0557,
-      "Coal": 0.4792,
+      "Coal": 0.4789,
       "Gas": 0.168,
       "Hydro": 0.1118,
       "Nuclear": 0.0455,
       "Other Fossil": 0.0377,
       "Other Renewables": 0.0044,
-      "Solar": 0.0435,
+      "Solar": 0.0439,
       "Wind": 0.0542
     },
     "2023": {
-      "Bioenergy": 0.0561,
-      "Coal": 0.4827,
+      "Bioenergy": 0.056,
+      "Coal": 0.4824,
       "Gas": 0.1637,
-      "Hydro": 0.0998,
+      "Hydro": 0.0997,
       "Nuclear": 0.0456,
       "Other Fossil": 0.0354,
       "Other Renewables": 0.0044,
-      "Solar": 0.0522,
-      "Wind": 0.06
+      "Solar": 0.0529,
+      "Wind": 0.0599
     },
     "2024": {
       "Bioenergy": 0.0554,
-      "Coal": 0.4684,
-      "Gas": 0.1607,
-      "Hydro": 0.1031,
+      "Coal": 0.4682,
+      "Gas": 0.1608,
+      "Hydro": 0.1032,
       "Nuclear": 0.0449,
       "Other Fossil": 0.0342,
       "Other Renewables": 0.0045,
       "Solar": 0.0663,
-      "Wind": 0.0624
+      "Wind": 0.0626
     },
     "2025": {
-      "Bioenergy": 0.0573,
-      "Coal": 0.4858,
-      "Gas": 0.1596,
-      "Hydro": 0.0791,
-      "Nuclear": 0.0477,
-      "Other Fossil": 0.0343,
-      "Other Renewables": 0.0044,
-      "Solar": 0.0621,
-      "Wind": 0.0697
+      "Bioenergy": 0.057,
+      "Coal": 0.4698,
+      "Gas": 0.1639,
+      "Hydro": 0.0732,
+      "Nuclear": 0.0484,
+      "Other Fossil": 0.036,
+      "Other Renewables": 0.0049,
+      "Solar": 0.0741,
+      "Wind": 0.0727
     }
   },
   "MQ": {
@@ -10216,7 +10216,7 @@
     "2021": {
       "Bioenergy": 0.0045,
       "Coal": 0.0247,
-      "Gas": 0.8672,
+      "Gas": 0.8673,
       "Hydro": 0.025,
       "Nuclear": 0.0335,
       "Other Fossil": 0.0234,
@@ -10233,7 +10233,7 @@
       "Other Fossil": 0.0277,
       "Other Renewables": 0.0011,
       "Solar": 0.0417,
-      "Wind": 0.0191
+      "Wind": 0.019
     },
     "2023": {
       "Bioenergy": 0.0043,
@@ -10247,26 +10247,26 @@
       "Wind": 0.0199
     },
     "2024": {
-      "Bioenergy": 0.0062,
-      "Coal": 0.0295,
-      "Gas": 0.7048,
-      "Hydro": 0.04,
-      "Nuclear": 0.0452,
-      "Other Fossil": 0.0068,
-      "Other Renewables": 0.0014,
-      "Solar": 0.1386,
-      "Wind": 0.0274
+      "Bioenergy": 0.0064,
+      "Coal": 0.0302,
+      "Gas": 0.7037,
+      "Hydro": 0.0407,
+      "Nuclear": 0.0461,
+      "Other Fossil": 0.0069,
+      "Other Renewables": 0.0015,
+      "Solar": 0.1363,
+      "Wind": 0.0282
     },
     "2025": {
-      "Bioenergy": 0.005,
-      "Coal": 0.0267,
-      "Gas": 0.7752,
-      "Hydro": 0.0285,
-      "Nuclear": 0.0374,
-      "Other Fossil": 0.0038,
-      "Other Renewables": 0.0011,
-      "Solar": 0.096,
-      "Wind": 0.0264
+      "Bioenergy": 0.0067,
+      "Coal": 0.0365,
+      "Gas": 0.7611,
+      "Hydro": 0.038,
+      "Nuclear": 0.0489,
+      "Other Fossil": 0.0052,
+      "Other Renewables": 0.0015,
+      "Solar": 0.07,
+      "Wind": 0.032
     }
   },
   "MU": {
@@ -10643,24 +10643,24 @@
     },
     "2024": {
       "Bioenergy": 0.0236,
-      "Coal": 0.4382,
-      "Gas": 0.343,
-      "Hydro": 0.1745,
+      "Coal": 0.4377,
+      "Gas": 0.3434,
+      "Hydro": 0.1746,
       "Nuclear": 0,
-      "Other Fossil": 0.0042,
+      "Other Fossil": 0.0043,
       "Other Renewables": 0,
       "Solar": 0.0164,
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0237,
-      "Coal": 0.432,
-      "Gas": 0.3284,
-      "Hydro": 0.195,
+      "Bioenergy": 0.0243,
+      "Coal": 0.4278,
+      "Gas": 0.3375,
+      "Hydro": 0.1865,
       "Nuclear": 0,
-      "Other Fossil": 0.0041,
+      "Other Fossil": 0.0056,
       "Other Renewables": 0,
-      "Solar": 0.0169,
+      "Solar": 0.0184,
       "Wind": 0
     }
   },
@@ -11077,7 +11077,7 @@
       "Gas": 0.0221,
       "Hydro": 0.0876,
       "Nuclear": 0.002,
-      "Other Fossil": 0.3999,
+      "Other Fossil": 0.3998,
       "Other Renewables": 0.1563,
       "Solar": 0.0082,
       "Wind": 0.1515
@@ -11096,7 +11096,7 @@
     "2022": {
       "Bioenergy": 0.1684,
       "Coal": 0.0029,
-      "Gas": 0.0205,
+      "Gas": 0.0206,
       "Hydro": 0.0878,
       "Nuclear": 0.0017,
       "Other Fossil": 0.3997,
@@ -11119,23 +11119,23 @@
       "Bioenergy": 0.1685,
       "Coal": 0.0032,
       "Gas": 0.0212,
-      "Hydro": 0.0843,
+      "Hydro": 0.0842,
       "Nuclear": 0.0019,
-      "Other Fossil": 0.3984,
+      "Other Fossil": 0.3985,
       "Other Renewables": 0.1562,
       "Solar": 0.0123,
-      "Wind": 0.1541
+      "Wind": 0.154
     },
     "2025": {
-      "Bioenergy": 0.1683,
-      "Coal": 0.0028,
-      "Gas": 0.0191,
-      "Hydro": 0.0856,
-      "Nuclear": 0.0016,
-      "Other Fossil": 0.3979,
+      "Bioenergy": 0.1682,
+      "Coal": 0.0024,
+      "Gas": 0.0188,
+      "Hydro": 0.0887,
+      "Nuclear": 0.0019,
+      "Other Fossil": 0.3981,
       "Other Renewables": 0.1562,
-      "Solar": 0.0137,
-      "Wind": 0.1549
+      "Solar": 0.0133,
+      "Wind": 0.1524
     }
   },
   "NL": {
@@ -11162,59 +11162,59 @@
       "Wind": 0.1301
     },
     "2021": {
-      "Bioenergy": 0.0828,
-      "Coal": 0.1418,
-      "Gas": 0.4679,
+      "Bioenergy": 0.0829,
+      "Coal": 0.1421,
+      "Gas": 0.4689,
       "Hydro": 0.0054,
-      "Nuclear": 0.0361,
+      "Nuclear": 0.0362,
       "Other Fossil": 0.0143,
       "Other Renewables": 0.004,
-      "Solar": 0.0966,
-      "Wind": 0.1512
+      "Solar": 0.0968,
+      "Wind": 0.1493
     },
     "2022": {
-      "Bioenergy": 0.0742,
-      "Coal": 0.1411,
-      "Gas": 0.3996,
+      "Bioenergy": 0.0751,
+      "Coal": 0.142,
+      "Gas": 0.402,
       "Hydro": 0.0014,
-      "Nuclear": 0.0348,
-      "Other Fossil": 0.0137,
+      "Nuclear": 0.035,
+      "Other Fossil": 0.0138,
       "Other Renewables": 0.005,
-      "Solar": 0.145,
-      "Wind": 0.1853
+      "Solar": 0.1422,
+      "Wind": 0.1836
     },
     "2023": {
-      "Bioenergy": 0.0582,
-      "Coal": 0.0878,
-      "Gas": 0.3833,
-      "Hydro": 0.0012,
-      "Nuclear": 0.0332,
-      "Other Fossil": 0.0121,
-      "Other Renewables": 0.0039,
-      "Solar": 0.1676,
-      "Wind": 0.2525
+      "Bioenergy": 0.0581,
+      "Coal": 0.0883,
+      "Gas": 0.3851,
+      "Hydro": 0.0013,
+      "Nuclear": 0.0334,
+      "Other Fossil": 0.0126,
+      "Other Renewables": 0.0046,
+      "Solar": 0.165,
+      "Wind": 0.2517
     },
     "2024": {
-      "Bioenergy": 0.053,
-      "Coal": 0.0782,
-      "Gas": 0.3594,
-      "Hydro": 0.0017,
+      "Bioenergy": 0.0533,
+      "Coal": 0.0806,
+      "Gas": 0.3595,
+      "Hydro": 0.0018,
       "Nuclear": 0.0293,
-      "Other Fossil": 0.0117,
+      "Other Fossil": 0.0129,
       "Other Renewables": 0.0048,
-      "Solar": 0.1866,
-      "Wind": 0.2752
+      "Solar": 0.1846,
+      "Wind": 0.2732
     },
     "2025": {
-      "Bioenergy": 0.0782,
-      "Coal": 0.1388,
-      "Gas": 0.4244,
-      "Hydro": 0,
-      "Nuclear": 0.0316,
-      "Other Fossil": 0.0114,
-      "Other Renewables": 0.0044,
-      "Solar": 0.0448,
-      "Wind": 0.2663
+      "Bioenergy": 0.0693,
+      "Coal": 0.1558,
+      "Gas": 0.4093,
+      "Hydro": 0.0009,
+      "Nuclear": 0.0301,
+      "Other Fossil": 0.0139,
+      "Other Renewables": 0.0039,
+      "Solar": 0.0733,
+      "Wind": 0.2434
     }
   },
   "NO": {
@@ -11288,12 +11288,12 @@
       "Bioenergy": 0,
       "Coal": 0,
       "Gas": 0.0071,
-      "Hydro": 0.9062,
+      "Hydro": 0.9081,
       "Nuclear": 0,
       "Other Fossil": 0.0006,
-      "Other Renewables": 0.0024,
+      "Other Renewables": 0.0025,
       "Solar": 0,
-      "Wind": 0.0837
+      "Wind": 0.0816
     }
   },
   "NP": {
@@ -11316,12 +11316,12 @@
       "Nuclear": 0.0111,
       "Other Fossil": 0.0019,
       "Other Renewables": 0.001,
-      "Solar": 0.0178,
+      "Solar": 0.0179,
       "Wind": 0.0107
     },
     "2021": {
       "Bioenergy": 0.004,
-      "Coal": 0.1193,
+      "Coal": 0.1192,
       "Gas": 0.0232,
       "Hydro": 0.8072,
       "Nuclear": 0.0111,
@@ -11332,24 +11332,24 @@
     },
     "2022": {
       "Bioenergy": 0.0044,
-      "Coal": 0.1168,
+      "Coal": 0.1167,
       "Gas": 0.0221,
       "Hydro": 0.8072,
       "Nuclear": 0.0111,
       "Other Fossil": 0.0021,
       "Other Renewables": 0.0011,
-      "Solar": 0.0209,
+      "Solar": 0.021,
       "Wind": 0.0145
     },
     "2023": {
-      "Bioenergy": 0.0045,
-      "Coal": 0.1176,
-      "Gas": 0.0211,
-      "Hydro": 0.8043,
+      "Bioenergy": 0.0044,
+      "Coal": 0.1175,
+      "Gas": 0.021,
+      "Hydro": 0.8042,
       "Nuclear": 0.0111,
       "Other Fossil": 0.0015,
       "Other Renewables": 0.0011,
-      "Solar": 0.023,
+      "Solar": 0.0232,
       "Wind": 0.0159
     },
     "2024": {
@@ -11364,15 +11364,15 @@
       "Wind": 0.0165
     },
     "2025": {
-      "Bioenergy": 0.0048,
-      "Coal": 0.1184,
-      "Gas": 0.0201,
-      "Hydro": 0.7992,
-      "Nuclear": 0.0116,
-      "Other Fossil": 0.0012,
-      "Other Renewables": 0.0011,
-      "Solar": 0.0254,
-      "Wind": 0.0183
+      "Bioenergy": 0.0047,
+      "Coal": 0.1145,
+      "Gas": 0.0211,
+      "Hydro": 0.7978,
+      "Nuclear": 0.0118,
+      "Other Fossil": 0.0016,
+      "Other Renewables": 0.0012,
+      "Solar": 0.0283,
+      "Wind": 0.019
     }
   },
   "NR": {
@@ -11601,15 +11601,15 @@
       "Wind": 0.0917
     },
     "2025": {
-      "Bioenergy": 0.0032,
-      "Coal": 0.0194,
-      "Gas": 0.0777,
-      "Hydro": 0.589,
+      "Bioenergy": 0.0016,
+      "Coal": 0.0362,
+      "Gas": 0.1119,
+      "Hydro": 0.5477,
       "Nuclear": 0,
       "Other Fossil": 0,
-      "Other Renewables": 0.2395,
+      "Other Renewables": 0.2335,
       "Solar": 0,
-      "Wind": 0.0712
+      "Wind": 0.0691
     }
   },
   "OM": {
@@ -11838,15 +11838,15 @@
       "Wind": 0.0651
     },
     "2025": {
-      "Bioenergy": 0.0077,
+      "Bioenergy": 0.007,
       "Coal": 0,
-      "Gas": 0.2495,
-      "Hydro": 0.6557,
+      "Gas": 0.2781,
+      "Hydro": 0.6411,
       "Nuclear": 0,
-      "Other Fossil": 0.0019,
+      "Other Fossil": 0.002,
       "Other Renewables": 0,
-      "Solar": 0.0232,
-      "Wind": 0.0619
+      "Solar": 0.0209,
+      "Wind": 0.0509
     }
   },
   "PF": {
@@ -12064,105 +12064,105 @@
       "Wind": 0.0112
     },
     "2024": {
-      "Bioenergy": 0.0079,
-      "Coal": 0.624,
-      "Gas": 0.1495,
-      "Hydro": 0.0904,
+      "Bioenergy": 0.0091,
+      "Coal": 0.6209,
+      "Gas": 0.1496,
+      "Hydro": 0.0892,
       "Nuclear": 0,
-      "Other Fossil": 0.0084,
-      "Other Renewables": 0.0826,
-      "Solar": 0.0292,
-      "Wind": 0.008
+      "Other Fossil": 0.0086,
+      "Other Renewables": 0.0825,
+      "Solar": 0.03,
+      "Wind": 0.01
     },
     "2025": {
-      "Bioenergy": 0.0068,
-      "Coal": 0.6174,
-      "Gas": 0.1341,
-      "Hydro": 0.1252,
+      "Bioenergy": 0.0146,
+      "Coal": 0.604,
+      "Gas": 0.1421,
+      "Hydro": 0.1066,
       "Nuclear": 0,
-      "Other Fossil": 0.0049,
-      "Other Renewables": 0.0812,
-      "Solar": 0.0254,
-      "Wind": 0.0049
+      "Other Fossil": 0.0042,
+      "Other Renewables": 0.0836,
+      "Solar": 0.0282,
+      "Wind": 0.0167
     }
   },
   "PK": {
     "2019": {
-      "Bioenergy": 0.0052,
-      "Coal": 0.1705,
-      "Gas": 0.3801,
-      "Hydro": 0.29,
-      "Nuclear": 0.0732,
-      "Other Fossil": 0.0499,
+      "Bioenergy": 0.0051,
+      "Coal": 0.1679,
+      "Gas": 0.3743,
+      "Hydro": 0.2856,
+      "Nuclear": 0.072,
+      "Other Fossil": 0.0491,
       "Other Renewables": 0,
-      "Solar": 0.0057,
-      "Wind": 0.0255
+      "Solar": 0.0209,
+      "Wind": 0.0251
     },
     "2020": {
-      "Bioenergy": 0.0053,
-      "Coal": 0.2079,
-      "Gas": 0.3156,
-      "Hydro": 0.3253,
-      "Nuclear": 0.0763,
-      "Other Fossil": 0.0416,
+      "Bioenergy": 0.0051,
+      "Coal": 0.2023,
+      "Gas": 0.3071,
+      "Hydro": 0.3165,
+      "Nuclear": 0.0742,
+      "Other Fossil": 0.0404,
       "Other Renewables": 0,
-      "Solar": 0.0057,
-      "Wind": 0.0222
+      "Solar": 0.0326,
+      "Wind": 0.0216
     },
     "2021": {
-      "Bioenergy": 0.0053,
-      "Coal": 0.2006,
-      "Gas": 0.2931,
-      "Hydro": 0.2794,
-      "Nuclear": 0.1151,
-      "Other Fossil": 0.0757,
+      "Bioenergy": 0.0051,
+      "Coal": 0.193,
+      "Gas": 0.282,
+      "Hydro": 0.2688,
+      "Nuclear": 0.1108,
+      "Other Fossil": 0.0728,
       "Other Renewables": 0,
-      "Solar": 0.0054,
-      "Wind": 0.0254
+      "Solar": 0.043,
+      "Wind": 0.0245
     },
     "2022": {
-      "Bioenergy": 0.0066,
-      "Coal": 0.1732,
-      "Gas": 0.2777,
-      "Hydro": 0.2564,
-      "Nuclear": 0.1623,
-      "Other Fossil": 0.0832,
+      "Bioenergy": 0.0062,
+      "Coal": 0.1645,
+      "Gas": 0.2637,
+      "Hydro": 0.2435,
+      "Nuclear": 0.1541,
+      "Other Fossil": 0.079,
       "Other Renewables": 0,
-      "Solar": 0.0066,
-      "Wind": 0.0341
+      "Solar": 0.0566,
+      "Wind": 0.0324
     },
     "2023": {
-      "Bioenergy": 0.0059,
-      "Coal": 0.1751,
-      "Gas": 0.2823,
-      "Hydro": 0.2969,
-      "Nuclear": 0.1729,
-      "Other Fossil": 0.025,
+      "Bioenergy": 0.0054,
+      "Coal": 0.1616,
+      "Gas": 0.2605,
+      "Hydro": 0.2739,
+      "Nuclear": 0.1596,
+      "Other Fossil": 0.023,
       "Other Renewables": 0,
-      "Solar": 0.0081,
-      "Wind": 0.0338
+      "Solar": 0.0848,
+      "Wind": 0.0312
     },
     "2024": {
-      "Bioenergy": 0.0065,
-      "Coal": 0.1659,
-      "Gas": 0.2822,
-      "Hydro": 0.3127,
-      "Nuclear": 0.1839,
-      "Other Fossil": 0.0111,
+      "Bioenergy": 0.0056,
+      "Coal": 0.1435,
+      "Gas": 0.2442,
+      "Hydro": 0.2705,
+      "Nuclear": 0.1592,
+      "Other Fossil": 0.0096,
       "Other Renewables": 0,
-      "Solar": 0.0093,
-      "Wind": 0.0282
+      "Solar": 0.143,
+      "Wind": 0.0244
     },
     "2025": {
-      "Bioenergy": 0.0129,
-      "Coal": 0.1171,
-      "Gas": 0.3308,
-      "Hydro": 0.2291,
-      "Nuclear": 0.2664,
+      "Bioenergy": 0.0099,
+      "Coal": 0.0905,
+      "Gas": 0.2555,
+      "Hydro": 0.1769,
+      "Nuclear": 0.2058,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0103,
-      "Wind": 0.0335
+      "Solar": 0.2356,
+      "Wind": 0.0258
     }
   },
   "PL": {
@@ -12233,15 +12233,15 @@
       "Wind": 0.1488
     },
     "2025": {
-      "Bioenergy": 0.0166,
-      "Coal": 0.5696,
-      "Gas": 0.1213,
-      "Hydro": 0.0096,
+      "Bioenergy": 0.0173,
+      "Coal": 0.5982,
+      "Gas": 0.1232,
+      "Hydro": 0.0091,
       "Nuclear": 0,
-      "Other Fossil": 0.0536,
-      "Other Renewables": 0.0019,
-      "Solar": 0.0275,
-      "Wind": 0.1999
+      "Other Fossil": 0.0538,
+      "Other Renewables": 0.002,
+      "Solar": 0.0468,
+      "Wind": 0.1496
     }
   },
   "PM": {
@@ -12381,25 +12381,25 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.1766,
-      "Gas": 0.4064,
+      "Coal": 0.1827,
+      "Gas": 0.4024,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.3958,
+      "Other Fossil": 0.3936,
       "Other Renewables": 0,
       "Solar": 0.0119,
       "Wind": 0.0094
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.1719,
-      "Gas": 0.5,
+      "Coal": 0.25,
+      "Gas": 0.4516,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.3125,
+      "Other Fossil": 0.2823,
       "Other Renewables": 0,
-      "Solar": 0.0078,
-      "Wind": 0.0078
+      "Solar": 0.0081,
+      "Wind": 0.0081
     }
   },
   "PS": {
@@ -12517,14 +12517,14 @@
     },
     "2022": {
       "Bioenergy": 0.0707,
-      "Coal": 0.0318,
+      "Coal": 0.0319,
       "Gas": 0.3732,
       "Hydro": 0.1348,
-      "Nuclear": 0.038,
+      "Nuclear": 0.0381,
       "Other Fossil": 0.0081,
       "Other Renewables": 0.0013,
       "Solar": 0.0659,
-      "Wind": 0.2761
+      "Wind": 0.276
     },
     "2023": {
       "Bioenergy": 0.0634,
@@ -12546,18 +12546,18 @@
       "Other Fossil": 0.0092,
       "Other Renewables": 0.0014,
       "Solar": 0.1288,
-      "Wind": 0.3023
+      "Wind": 0.3022
     },
     "2025": {
-      "Bioenergy": 0.0549,
-      "Coal": 0.0164,
-      "Gas": 0.1707,
-      "Hydro": 0.2769,
-      "Nuclear": 0.023,
-      "Other Fossil": 0.0065,
-      "Other Renewables": 0.0007,
-      "Solar": 0.0612,
-      "Wind": 0.3897
+      "Bioenergy": 0.0546,
+      "Coal": 0.0152,
+      "Gas": 0.1636,
+      "Hydro": 0.3499,
+      "Nuclear": 0.0205,
+      "Other Fossil": 0.0066,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0777,
+      "Wind": 0.3113
     }
   },
   "PY": {
@@ -12861,19 +12861,19 @@
       "Nuclear": 0.2036,
       "Other Fossil": 0.0014,
       "Other Renewables": 0.0004,
-      "Solar": 0.078,
+      "Solar": 0.0779,
       "Wind": 0.1188
     },
     "2025": {
       "Bioenergy": 0.0116,
-      "Coal": 0.1436,
-      "Gas": 0.2774,
-      "Hydro": 0.1997,
-      "Nuclear": 0.2221,
+      "Coal": 0.1552,
+      "Gas": 0.2567,
+      "Hydro": 0.195,
+      "Nuclear": 0.2105,
       "Other Fossil": 0.0024,
       "Other Renewables": 0.0007,
-      "Solar": 0.0222,
-      "Wind": 0.1202
+      "Solar": 0.0476,
+      "Wind": 0.1204
     }
   },
   "RS": {
@@ -12906,7 +12906,7 @@
       "Hydro": 0.3097,
       "Nuclear": 0.0122,
       "Other Fossil": 0.0232,
-      "Other Renewables": 0.0003,
+      "Other Renewables": 0.0004,
       "Solar": 0.0018,
       "Wind": 0.036
     },
@@ -12945,14 +12945,14 @@
     },
     "2025": {
       "Bioenergy": 0.0063,
-      "Coal": 0.615,
-      "Gas": 0.0771,
-      "Hydro": 0.2561,
-      "Nuclear": 0.0041,
+      "Coal": 0.6308,
+      "Gas": 0.073,
+      "Hydro": 0.2408,
+      "Nuclear": 0.0021,
       "Other Fossil": 0.0062,
       "Other Renewables": 0.0001,
-      "Solar": 0.0006,
-      "Wind": 0.0346
+      "Solar": 0.0003,
+      "Wind": 0.0404
     }
   },
   "RU": {
@@ -13023,15 +13023,15 @@
       "Wind": 0.0044
     },
     "2025": {
-      "Bioenergy": 0.0007,
-      "Coal": 0.1919,
-      "Gas": 0.4644,
-      "Hydro": 0.1343,
-      "Nuclear": 0.1935,
-      "Other Fossil": 0.0111,
+      "Bioenergy": 0.0008,
+      "Coal": 0.1942,
+      "Gas": 0.4849,
+      "Hydro": 0.1342,
+      "Nuclear": 0.1701,
+      "Other Fossil": 0.0114,
       "Other Renewables": 0,
-      "Solar": 0.0004,
-      "Wind": 0.0038
+      "Solar": 0.0002,
+      "Wind": 0.0042
     }
   },
   "RW": {
@@ -13497,15 +13497,15 @@
       "Wind": 0.2507
     },
     "2025": {
-      "Bioenergy": 0.0393,
+      "Bioenergy": 0.0431,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4173,
-      "Nuclear": 0.2609,
+      "Hydro": 0.4221,
+      "Nuclear": 0.2797,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0006,
-      "Wind": 0.282
+      "Solar": 0.0016,
+      "Wind": 0.2535
     }
   },
   "SG": {
@@ -13734,15 +13734,15 @@
       "Wind": 0.0022
     },
     "2025": {
-      "Bioenergy": 0.0082,
-      "Coal": 0.2213,
-      "Gas": 0.0738,
-      "Hydro": 0.2623,
-      "Nuclear": 0.4262,
-      "Other Fossil": 0,
-      "Other Renewables": 0,
-      "Solar": 0.0082,
-      "Wind": 0
+      "Bioenergy": 0.0085,
+      "Coal": 0.2386,
+      "Gas": 0.0645,
+      "Hydro": 0.2305,
+      "Nuclear": 0.4065,
+      "Other Fossil": 0.0003,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0496,
+      "Wind": 0.0015
     }
   },
   "SK": {
@@ -13813,14 +13813,14 @@
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0261,
-      "Coal": 0.0037,
+      "Bioenergy": 0.0255,
+      "Coal": 0.0039,
       "Gas": 0.1157,
-      "Hydro": 0.1045,
-      "Nuclear": 0.6828,
-      "Other Fossil": 0.0485,
-      "Other Renewables": 0.0149,
-      "Solar": 0.0037,
+      "Hydro": 0.0959,
+      "Nuclear": 0.6823,
+      "Other Fossil": 0.051,
+      "Other Renewables": 0.0157,
+      "Solar": 0.0099,
       "Wind": 0
     }
   },
@@ -14336,7 +14336,7 @@
       "Bioenergy": 0.0757,
       "Coal": 0.002,
       "Gas": 0.1524,
-      "Hydro": 0.3218,
+      "Hydro": 0.3219,
       "Nuclear": 0.0012,
       "Other Fossil": 0.0729,
       "Other Renewables": 0.197,
@@ -14781,12 +14781,12 @@
       "Nuclear": 0.0058,
       "Other Fossil": 0.0064,
       "Other Renewables": 0.0006,
-      "Solar": 0.0282,
+      "Solar": 0.0283,
       "Wind": 0.0218
     },
     "2020": {
       "Bioenergy": 0.0632,
-      "Coal": 0.2528,
+      "Coal": 0.2527,
       "Gas": 0.5803,
       "Hydro": 0.0409,
       "Nuclear": 0.0065,
@@ -14810,45 +14810,45 @@
       "Bioenergy": 0.0681,
       "Coal": 0.253,
       "Gas": 0.5526,
-      "Hydro": 0.0523,
+      "Hydro": 0.0522,
       "Nuclear": 0.0082,
       "Other Fossil": 0.0096,
       "Other Renewables": 0.0008,
-      "Solar": 0.0316,
+      "Solar": 0.0317,
       "Wind": 0.0238
     },
     "2023": {
       "Bioenergy": 0.0675,
-      "Coal": 0.2154,
+      "Coal": 0.2153,
       "Gas": 0.5992,
       "Hydro": 0.0466,
       "Nuclear": 0.0074,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.0007,
-      "Solar": 0.0318,
+      "Solar": 0.0319,
       "Wind": 0.0263
     },
     "2024": {
-      "Bioenergy": 0.0597,
-      "Coal": 0.223,
-      "Gas": 0.6012,
-      "Hydro": 0.0441,
-      "Nuclear": 0.0076,
+      "Bioenergy": 0.0609,
+      "Coal": 0.2227,
+      "Gas": 0.5969,
+      "Hydro": 0.0459,
+      "Nuclear": 0.0077,
       "Other Fossil": 0.002,
       "Other Renewables": 0.0008,
-      "Solar": 0.0364,
-      "Wind": 0.0253
+      "Solar": 0.0366,
+      "Wind": 0.0265
     },
     "2025": {
-      "Bioenergy": 0.0558,
-      "Coal": 0.2434,
-      "Gas": 0.5899,
-      "Hydro": 0.0362,
-      "Nuclear": 0.0078,
+      "Bioenergy": 0.0735,
+      "Coal": 0.2358,
+      "Gas": 0.5424,
+      "Hydro": 0.0572,
+      "Nuclear": 0.0092,
       "Other Fossil": 0.0013,
-      "Other Renewables": 0.0007,
-      "Solar": 0.0351,
-      "Wind": 0.0296
+      "Other Renewables": 0.0009,
+      "Solar": 0.04,
+      "Wind": 0.0398
     }
   },
   "TJ": {
@@ -15147,13 +15147,13 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.9813,
+      "Gas": 0.9833,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0187
+      "Wind": 0.0167
     },
     "2025": {
       "Bioenergy": 0,
@@ -15314,15 +15314,15 @@
       "Wind": 0.107
     },
     "2025": {
-      "Bioenergy": 0.0248,
-      "Coal": 0.3688,
-      "Gas": 0.2707,
-      "Hydro": 0.1614,
+      "Bioenergy": 0.0241,
+      "Coal": 0.3559,
+      "Gas": 0.2686,
+      "Hydro": 0.1529,
       "Nuclear": 0.0002,
-      "Other Fossil": 0.0037,
-      "Other Renewables": 0.0335,
-      "Solar": 0.0419,
-      "Wind": 0.095
+      "Other Fossil": 0.0029,
+      "Other Renewables": 0.0327,
+      "Solar": 0.0624,
+      "Wind": 0.1003
     }
   },
   "TT": {
@@ -15778,25 +15778,25 @@
     },
     "2024": {
       "Bioenergy": 0.0106,
-      "Coal": 0.149,
-      "Gas": 0.4256,
-      "Hydro": 0.0537,
+      "Coal": 0.1489,
+      "Gas": 0.4255,
+      "Hydro": 0.0536,
       "Nuclear": 0.1782,
-      "Other Fossil": 0.0067,
+      "Other Fossil": 0.0069,
       "Other Renewables": 0.004,
-      "Solar": 0.0687,
-      "Wind": 0.1036
+      "Solar": 0.0688,
+      "Wind": 0.1035
     },
     "2025": {
-      "Bioenergy": 0.0099,
-      "Coal": 0.2047,
-      "Gas": 0.3865,
-      "Hydro": 0.0536,
-      "Nuclear": 0.1776,
-      "Other Fossil": 0.0083,
-      "Other Renewables": 0.0035,
-      "Solar": 0.0507,
-      "Wind": 0.1053
+      "Bioenergy": 0.0102,
+      "Coal": 0.1924,
+      "Gas": 0.3851,
+      "Hydro": 0.0547,
+      "Nuclear": 0.1784,
+      "Other Fossil": 0.0091,
+      "Other Renewables": 0.0038,
+      "Solar": 0.0582,
+      "Wind": 0.1082
     }
   },
   "UY": {
@@ -15852,7 +15852,7 @@
       "Nuclear": 0.0025,
       "Other Fossil": 0.0169,
       "Other Renewables": 0.0007,
-      "Solar": 0.0387,
+      "Solar": 0.0386,
       "Wind": 0.4065
     },
     "2024": {
@@ -15867,15 +15867,15 @@
       "Wind": 0.3322
     },
     "2025": {
-      "Bioenergy": 0.1551,
-      "Coal": 0.0024,
-      "Gas": 0.0435,
-      "Hydro": 0.3973,
-      "Nuclear": 0.0013,
-      "Other Fossil": 0.013,
-      "Other Renewables": 0.0004,
-      "Solar": 0.0519,
-      "Wind": 0.335
+      "Bioenergy": 0.1407,
+      "Coal": 0.0025,
+      "Gas": 0.0569,
+      "Hydro": 0.4041,
+      "Nuclear": 0.002,
+      "Other Fossil": 0.0238,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0496,
+      "Wind": 0.32
     }
   },
   "UZ": {
@@ -15947,14 +15947,14 @@
     },
     "2025": {
       "Bioenergy": 0.0005,
-      "Coal": 0.0704,
-      "Gas": 0.8121,
-      "Hydro": 0.1014,
+      "Coal": 0.07,
+      "Gas": 0.8122,
+      "Hydro": 0.1013,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
-      "Solar": 0.0017,
-      "Wind": 0.0016
+      "Solar": 0.0019,
+      "Wind": 0.0017
     }
   },
   "VC": {
@@ -16331,25 +16331,25 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.4854,
-      "Gas": 0.0691,
-      "Hydro": 0.322,
+      "Coal": 0.4792,
+      "Gas": 0.0761,
+      "Hydro": 0.3183,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0873,
-      "Wind": 0.0362
+      "Solar": 0.0884,
+      "Wind": 0.0379
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.4207,
-      "Gas": 0.0498,
-      "Hydro": 0.4215,
+      "Coal": 0.5651,
+      "Gas": 0.0615,
+      "Hydro": 0.2113,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0801,
-      "Wind": 0.0279
+      "Solar": 0.0929,
+      "Wind": 0.0692
     }
   },
   "VU": {
@@ -16567,26 +16567,26 @@
       "Wind": 0.0739
     },
     "2024": {
-      "Bioenergy": 0.0028,
-      "Coal": 0.8394,
-      "Gas": 0.0252,
-      "Hydro": 0.0448,
-      "Nuclear": 0.0207,
-      "Other Fossil": 0.0021,
-      "Other Renewables": 0.0006,
-      "Solar": 0.0046,
-      "Wind": 0.0598
+      "Bioenergy": 0.0034,
+      "Coal": 0.8205,
+      "Gas": 0.0306,
+      "Hydro": 0.0472,
+      "Nuclear": 0.0251,
+      "Other Fossil": 0.0025,
+      "Other Renewables": 0.0008,
+      "Solar": 0.005,
+      "Wind": 0.065
     },
     "2025": {
-      "Bioenergy": 0.0059,
-      "Coal": 0.775,
-      "Gas": 0.057,
-      "Hydro": 0.0474,
-      "Nuclear": 0.0445,
-      "Other Fossil": 0.0046,
-      "Other Renewables": 0.0013,
-      "Solar": 0.006,
-      "Wind": 0.0584
+      "Bioenergy": 0.0082,
+      "Coal": 0.6821,
+      "Gas": 0.0785,
+      "Hydro": 0.0686,
+      "Nuclear": 0.0599,
+      "Other Fossil": 0.0063,
+      "Other Renewables": 0.0018,
+      "Solar": 0.0115,
+      "Wind": 0.0831
     }
   },
   "YE": {
@@ -16671,10 +16671,10 @@
   "ZA": {
     "2019": {
       "Bioenergy": 0,
-      "Coal": 0.889,
+      "Coal": 0.8891,
       "Gas": 0,
       "Hydro": 0.0027,
-      "Nuclear": 0.0538,
+      "Nuclear": 0.0537,
       "Other Fossil": 0.0085,
       "Other Renewables": 0.0004,
       "Solar": 0.0193,
@@ -16685,7 +16685,7 @@
       "Coal": 0.8886,
       "Gas": 0,
       "Hydro": 0.0031,
-      "Nuclear": 0.0481,
+      "Nuclear": 0.048,
       "Other Fossil": 0.008,
       "Other Renewables": 0.0005,
       "Solar": 0.0241,
@@ -16704,7 +16704,7 @@
     },
     "2022": {
       "Bioenergy": 0,
-      "Coal": 0.8421,
+      "Coal": 0.8422,
       "Gas": 0,
       "Hydro": 0.0133,
       "Nuclear": 0.0429,
@@ -16715,7 +16715,7 @@
     },
     "2023": {
       "Bioenergy": 0,
-      "Coal": 0.8079,
+      "Coal": 0.808,
       "Gas": 0.0005,
       "Hydro": 0.009,
       "Nuclear": 0.0362,
@@ -16726,25 +16726,25 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.814,
+      "Coal": 0.8145,
       "Gas": 0.0004,
       "Hydro": 0.0047,
-      "Nuclear": 0.0332,
-      "Other Fossil": 0.0143,
+      "Nuclear": 0.0331,
+      "Other Fossil": 0.0142,
       "Other Renewables": 0.001,
-      "Solar": 0.085,
-      "Wind": 0.0473
+      "Solar": 0.0848,
+      "Wind": 0.0472
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.7735,
+      "Coal": 0.7431,
       "Gas": 0,
-      "Hydro": 0.0032,
-      "Nuclear": 0.0354,
-      "Other Fossil": 0.0222,
-      "Other Renewables": 0.0011,
-      "Solar": 0.1159,
-      "Wind": 0.0487
+      "Hydro": 0.0031,
+      "Nuclear": 0.0655,
+      "Other Fossil": 0.025,
+      "Other Renewables": 0.001,
+      "Solar": 0.1128,
+      "Wind": 0.0494
     }
   },
   "ZM": {