@digital4better/data 1.3.10 → 1.3.11

package/data/mix/country-yearly.json

@@ -146,15 +146,15 @@
       "Wind": 0.0567
     },
     "2025": {
-      "Bioenergy": 0.0158,
-      "Coal": 0.415,
-      "Gas": 0.0732,
-      "Hydro": 0.2715,
-      "Nuclear": 0.0435,
+      "Bioenergy": 0.0156,
+      "Coal": 0.4124,
+      "Gas": 0.0728,
+      "Hydro": 0.278,
+      "Nuclear": 0.0426,
       "Other Fossil": 0.02,
-      "Other Renewables": 0.0045,
-      "Solar": 0.0868,
-      "Wind": 0.0697
+      "Other Renewables": 0.0044,
+      "Solar": 0.0881,
+      "Wind": 0.0659
     }
   },
   "AG": {
@@ -275,11 +275,11 @@
       "Coal": 0.0524,
       "Gas": 0.0817,
       "Hydro": 0.7299,
-      "Nuclear": 0.062,
-      "Other Fossil": 0.007,
+      "Nuclear": 0.0619,
+      "Other Fossil": 0.0071,
       "Other Renewables": 0.0022,
       "Solar": 0.0191,
-      "Wind": 0.0361
+      "Wind": 0.036
     },
     "2023": {
       "Bioenergy": 0.0088,
@@ -287,7 +287,7 @@
       "Gas": 0.0757,
       "Hydro": 0.7351,
       "Nuclear": 0.0631,
-      "Other Fossil": 0.0066,
+      "Other Fossil": 0.0067,
       "Other Renewables": 0.0022,
       "Solar": 0.0229,
       "Wind": 0.0398
@@ -298,21 +298,21 @@
       "Gas": 0.0717,
       "Hydro": 0.7379,
       "Nuclear": 0.0639,
-      "Other Fossil": 0.0065,
+      "Other Fossil": 0.0066,
       "Other Renewables": 0.0022,
       "Solar": 0.027,
-      "Wind": 0.0404
+      "Wind": 0.0403
     },
     "2025": {
       "Bioenergy": 0.0087,
-      "Coal": 0.0392,
-      "Gas": 0.0725,
-      "Hydro": 0.7352,
-      "Nuclear": 0.0614,
+      "Coal": 0.0396,
+      "Gas": 0.0733,
+      "Hydro": 0.7347,
+      "Nuclear": 0.062,
       "Other Fossil": 0.0075,
       "Other Renewables": 0.0022,
-      "Solar": 0.0349,
-      "Wind": 0.0383
+      "Solar": 0.0347,
+      "Wind": 0.0372
     }
   },
   "AM": {
@@ -541,15 +541,15 @@
       "Wind": 0.1137
     },
     "2025": {
-      "Bioenergy": 0.01,
+      "Bioenergy": 0.0101,
       "Coal": 0.0081,
-      "Gas": 0.5307,
-      "Hydro": 0.2201,
-      "Nuclear": 0.07,
+      "Gas": 0.5309,
+      "Hydro": 0.2198,
+      "Nuclear": 0.0701,
       "Other Fossil": 0.0095,
       "Other Renewables": 0.0001,
-      "Solar": 0.03,
-      "Wind": 0.1215
+      "Solar": 0.0299,
+      "Wind": 0.1216
     }
   },
   "AS": {
@@ -690,24 +690,24 @@
     "2024": {
       "Bioenergy": 0.0272,
       "Coal": 0.0026,
-      "Gas": 0.093,
-      "Hydro": 0.62,
+      "Gas": 0.0931,
+      "Hydro": 0.6199,
       "Nuclear": 0.0036,
       "Other Fossil": 0.0152,
       "Other Renewables": 0.0001,
       "Solar": 0.1044,
-      "Wind": 0.1338
+      "Wind": 0.1337
     },
     "2025": {
-      "Bioenergy": 0.0291,
-      "Coal": 0.0093,
-      "Gas": 0.1241,
-      "Hydro": 0.5309,
-      "Nuclear": 0.0129,
-      "Other Fossil": 0.0162,
+      "Bioenergy": 0.0283,
+      "Coal": 0.0092,
+      "Gas": 0.1233,
+      "Hydro": 0.5344,
+      "Nuclear": 0.0127,
+      "Other Fossil": 0.016,
       "Other Renewables": 0.0004,
-      "Solar": 0.1546,
-      "Wind": 0.1225
+      "Solar": 0.151,
+      "Wind": 0.1247
     }
   },
   "AU": {
@@ -778,15 +778,15 @@
       "Wind": 0.1343
     },
     "2025": {
-      "Bioenergy": 0.001,
-      "Coal": 0.53,
-      "Gas": 0.0763,
-      "Hydro": 0.055,
+      "Bioenergy": 0.0012,
+      "Coal": 0.5292,
+      "Gas": 0.0734,
+      "Hydro": 0.0531,
       "Nuclear": 0,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.1935,
-      "Wind": 0.1441
+      "Solar": 0.1941,
+      "Wind": 0.1489
     }
   },
   "AW": {
@@ -1005,9 +1005,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.6341,
+      "Coal": 0.6347,
       "Gas": 0,
-      "Hydro": 0.3283,
+      "Hydro": 0.3278,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -1016,14 +1016,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5962,
+      "Coal": 0.5959,
       "Gas": 0,
-      "Hydro": 0.3547,
+      "Hydro": 0.3551,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.034,
-      "Wind": 0.0152
+      "Solar": 0.0338,
+      "Wind": 0.0151
     }
   },
   "BB": {
@@ -1173,15 +1173,15 @@
       "Wind": 0.0115
     },
     "2025": {
-      "Bioenergy": 0.0034,
-      "Coal": 0.3538,
-      "Gas": 0.4415,
-      "Hydro": 0.0186,
-      "Nuclear": 0.0093,
-      "Other Fossil": 0.1272,
-      "Other Renewables": 0.001,
+      "Bioenergy": 0.0033,
+      "Coal": 0.3518,
+      "Gas": 0.4462,
+      "Hydro": 0.0229,
+      "Nuclear": 0.0091,
+      "Other Fossil": 0.1215,
+      "Other Renewables": 0.0009,
       "Solar": 0.0303,
-      "Wind": 0.0149
+      "Wind": 0.014
     }
   },
   "BE": {
@@ -1241,26 +1241,26 @@
       "Wind": 0.1828
     },
     "2024": {
-      "Bioenergy": 0.0118,
-      "Coal": 0.0178,
-      "Gas": 0.1661,
-      "Hydro": 0.026,
-      "Nuclear": 0.3956,
-      "Other Fossil": 0.092,
+      "Bioenergy": 0.0122,
+      "Coal": 0.0176,
+      "Gas": 0.1672,
+      "Hydro": 0.0261,
+      "Nuclear": 0.3924,
+      "Other Fossil": 0.0951,
       "Other Renewables": 0.0009,
-      "Solar": 0.112,
-      "Wind": 0.1778
+      "Solar": 0.1111,
+      "Wind": 0.1772
     },
     "2025": {
-      "Bioenergy": 0.0124,
-      "Coal": 0.0182,
-      "Gas": 0.1945,
-      "Hydro": 0.0271,
-      "Nuclear": 0.3338,
-      "Other Fossil": 0.0982,
-      "Other Renewables": 0.001,
-      "Solar": 0.1616,
-      "Wind": 0.1532
+      "Bioenergy": 0.0125,
+      "Coal": 0.0194,
+      "Gas": 0.2026,
+      "Hydro": 0.0283,
+      "Nuclear": 0.3306,
+      "Other Fossil": 0.0987,
+      "Other Renewables": 0.0011,
+      "Solar": 0.1609,
+      "Wind": 0.1459
     }
   },
   "BF": {
@@ -1400,25 +1400,25 @@
     },
     "2024": {
       "Bioenergy": 0.0044,
-      "Coal": 0.265,
+      "Coal": 0.2649,
       "Gas": 0.0639,
       "Hydro": 0.082,
       "Nuclear": 0.4136,
       "Other Fossil": 0.0008,
       "Other Renewables": 0.0002,
       "Solar": 0.1291,
-      "Wind": 0.0411
+      "Wind": 0.0413
     },
     "2025": {
       "Bioenergy": 0.0032,
-      "Coal": 0.2673,
-      "Gas": 0.0536,
-      "Hydro": 0.0749,
-      "Nuclear": 0.395,
+      "Coal": 0.2692,
+      "Gas": 0.0522,
+      "Hydro": 0.0735,
+      "Nuclear": 0.3913,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.1734,
-      "Wind": 0.0324
+      "Solar": 0.1784,
+      "Wind": 0.0321
     }
   },
   "BH": {
@@ -1954,24 +1954,24 @@
     "2024": {
       "Bioenergy": 0.0136,
       "Coal": 0.0131,
-      "Gas": 0.0649,
+      "Gas": 0.0651,
       "Hydro": 0.6148,
       "Nuclear": 0.0226,
-      "Other Fossil": 0.0113,
+      "Other Fossil": 0.0111,
       "Other Renewables": 0,
-      "Solar": 0.1076,
-      "Wind": 0.1521
+      "Solar": 0.1066,
+      "Wind": 0.1531
     },
     "2025": {
-      "Bioenergy": 0.0101,
+      "Bioenergy": 0.01,
       "Coal": 0.0108,
-      "Gas": 0.0483,
-      "Hydro": 0.6312,
-      "Nuclear": 0.0198,
-      "Other Fossil": 0.0096,
+      "Gas": 0.0532,
+      "Hydro": 0.6242,
+      "Nuclear": 0.0205,
+      "Other Fossil": 0.0095,
       "Other Renewables": 0,
-      "Solar": 0.1207,
-      "Wind": 0.1494
+      "Solar": 0.1218,
+      "Wind": 0.15
     }
   },
   "BS": {
@@ -2352,21 +2352,21 @@
       "Gas": 0.1042,
       "Hydro": 0.5109,
       "Nuclear": 0.0092,
-      "Other Fossil": 0.1034,
+      "Other Fossil": 0.1033,
       "Other Renewables": 0.0024,
-      "Solar": 0.042,
-      "Wind": 0.041
+      "Solar": 0.0419,
+      "Wind": 0.0412
     },
     "2025": {
-      "Bioenergy": 0.1703,
-      "Coal": 0.0162,
-      "Gas": 0.0983,
-      "Hydro": 0.5183,
-      "Nuclear": 0.0081,
-      "Other Fossil": 0.1001,
+      "Bioenergy": 0.1704,
+      "Coal": 0.0164,
+      "Gas": 0.0997,
+      "Hydro": 0.5163,
+      "Nuclear": 0.0085,
+      "Other Fossil": 0.1004,
       "Other Renewables": 0.0023,
-      "Solar": 0.0453,
-      "Wind": 0.0409
+      "Solar": 0.0448,
+      "Wind": 0.0412
     }
   },
   "CA": {
@@ -2437,15 +2437,15 @@
       "Wind": 0.0757
     },
     "2025": {
-      "Bioenergy": 0.0157,
-      "Coal": 0.0352,
-      "Gas": 0.1438,
+      "Bioenergy": 0.0154,
+      "Coal": 0.0345,
+      "Gas": 0.1409,
       "Hydro": 0.5686,
-      "Nuclear": 0.1307,
-      "Other Fossil": 0.0077,
+      "Nuclear": 0.1368,
+      "Other Fossil": 0.0075,
       "Other Renewables": 0.0006,
-      "Solar": 0.0094,
-      "Wind": 0.0883
+      "Solar": 0.0103,
+      "Wind": 0.0854
     }
   },
   "CD": {
@@ -2700,68 +2700,68 @@
     "2020": {
       "Bioenergy": 0.0011,
       "Coal": 0.006,
-      "Gas": 0.0101,
-      "Hydro": 0.5603,
-      "Nuclear": 0.3296,
-      "Other Fossil": 0.0512,
+      "Gas": 0.01,
+      "Hydro": 0.5571,
+      "Nuclear": 0.3275,
+      "Other Fossil": 0.0548,
       "Other Renewables": 0.0002,
-      "Solar": 0.0347,
-      "Wind": 0.0067
+      "Solar": 0.036,
+      "Wind": 0.0073
     },
     "2021": {
       "Bioenergy": 0.0031,
-      "Coal": 0.017,
-      "Gas": 0.0276,
-      "Hydro": 0.5602,
-      "Nuclear": 0.2879,
-      "Other Fossil": 0.0479,
+      "Coal": 0.0168,
+      "Gas": 0.0273,
+      "Hydro": 0.5548,
+      "Nuclear": 0.2849,
+      "Other Fossil": 0.0557,
       "Other Renewables": 0.0007,
-      "Solar": 0.0416,
+      "Solar": 0.0428,
       "Wind": 0.0138
     },
     "2022": {
       "Bioenergy": 0.0028,
-      "Coal": 0.0158,
-      "Gas": 0.0245,
-      "Hydro": 0.4896,
-      "Nuclear": 0.351,
-      "Other Fossil": 0.0443,
+      "Coal": 0.0156,
+      "Gas": 0.0242,
+      "Hydro": 0.4829,
+      "Nuclear": 0.3461,
+      "Other Fossil": 0.0546,
       "Other Renewables": 0.0006,
-      "Solar": 0.0567,
-      "Wind": 0.0145
+      "Solar": 0.0588,
+      "Wind": 0.0144
     },
     "2023": {
       "Bioenergy": 0.001,
       "Coal": 0.0055,
-      "Gas": 0.0088,
-      "Hydro": 0.5479,
-      "Nuclear": 0.3242,
-      "Other Fossil": 0.0437,
+      "Gas": 0.0087,
+      "Hydro": 0.5433,
+      "Nuclear": 0.3213,
+      "Other Fossil": 0.0485,
       "Other Renewables": 0.0002,
-      "Solar": 0.0612,
-      "Wind": 0.0073
+      "Solar": 0.0641,
+      "Wind": 0.0074
     },
     "2024": {
       "Bioenergy": 0.0004,
       "Coal": 0.002,
-      "Gas": 0.0036,
-      "Hydro": 0.5893,
-      "Nuclear": 0.292,
-      "Other Fossil": 0.0397,
+      "Gas": 0.0035,
+      "Hydro": 0.5854,
+      "Nuclear": 0.29,
+      "Other Fossil": 0.0453,
       "Other Renewables": 0.0001,
-      "Solar": 0.0683,
-      "Wind": 0.0046
+      "Solar": 0.0688,
+      "Wind": 0.0045
     },
     "2025": {
-      "Bioenergy": 0.0017,
-      "Coal": 0.0086,
-      "Gas": 0.0156,
-      "Hydro": 0.4949,
-      "Nuclear": 0.2942,
-      "Other Fossil": 0.0484,
+      "Bioenergy": 0.0016,
+      "Coal": 0.0082,
+      "Gas": 0.0149,
+      "Hydro": 0.4948,
+      "Nuclear": 0.2997,
+      "Other Fossil": 0.0456,
       "Other Renewables": 0.0004,
-      "Solar": 0.1265,
-      "Wind": 0.0097
+      "Solar": 0.1256,
+      "Wind": 0.0092
     }
   },
   "CI": {
@@ -2990,15 +2990,15 @@
       "Wind": 0.1296
     },
     "2025": {
-      "Bioenergy": 0.0252,
-      "Coal": 0.174,
-      "Gas": 0.1825,
-      "Hydro": 0.2501,
+      "Bioenergy": 0.0249,
+      "Coal": 0.1779,
+      "Gas": 0.1848,
+      "Hydro": 0.2395,
       "Nuclear": 0,
-      "Other Fossil": 0.0183,
+      "Other Fossil": 0.0168,
       "Other Renewables": 0.0014,
-      "Solar": 0.2123,
-      "Wind": 0.1362
+      "Solar": 0.2161,
+      "Wind": 0.1387
     }
   },
   "CM": {
@@ -3148,15 +3148,15 @@
       "Wind": 0.1001
     },
     "2025": {
-      "Bioenergy": 0.0188,
-      "Coal": 0.5539,
-      "Gas": 0.0268,
-      "Hydro": 0.1195,
-      "Nuclear": 0.0481,
+      "Bioenergy": 0.0187,
+      "Coal": 0.5522,
+      "Gas": 0.0267,
+      "Hydro": 0.1191,
+      "Nuclear": 0.0479,
       "Other Fossil": 0.0016,
       "Other Renewables": 0,
-      "Solar": 0.1148,
-      "Wind": 0.1167
+      "Solar": 0.1177,
+      "Wind": 0.1161
     }
   },
   "CO": {
@@ -3218,24 +3218,24 @@
     "2024": {
       "Bioenergy": 0.0011,
       "Coal": 0.1201,
-      "Gas": 0.0886,
+      "Gas": 0.0887,
       "Hydro": 0.7128,
       "Nuclear": 0.0023,
       "Other Fossil": 0.0134,
       "Other Renewables": 0.0006,
-      "Solar": 0.0485,
-      "Wind": 0.0125
+      "Solar": 0.0484,
+      "Wind": 0.0126
     },
     "2025": {
       "Bioenergy": 0.0001,
-      "Coal": 0.0479,
-      "Gas": 0.0689,
-      "Hydro": 0.8226,
+      "Coal": 0.0466,
+      "Gas": 0.0726,
+      "Hydro": 0.8187,
       "Nuclear": 0.0002,
-      "Other Fossil": 0.0074,
+      "Other Fossil": 0.0075,
       "Other Renewables": 0.0001,
-      "Solar": 0.0505,
-      "Wind": 0.0023
+      "Solar": 0.0515,
+      "Wind": 0.0028
     }
   },
   "CR": {
@@ -3303,18 +3303,18 @@
       "Other Fossil": 0.106,
       "Other Renewables": 0.1171,
       "Solar": 0.0019,
-      "Wind": 0.098
+      "Wind": 0.0981
     },
     "2025": {
       "Bioenergy": 0.0052,
       "Coal": 0.0004,
       "Gas": 0.0027,
-      "Hydro": 0.7324,
+      "Hydro": 0.7298,
       "Nuclear": 0.0003,
-      "Other Fossil": 0.018,
-      "Other Renewables": 0.1124,
+      "Other Fossil": 0.0179,
+      "Other Renewables": 0.1077,
       "Solar": 0.001,
-      "Wind": 0.1275
+      "Wind": 0.135
     }
   },
   "CU": {
@@ -3622,15 +3622,15 @@
       "Wind": 0.0103
     },
     "2025": {
-      "Bioenergy": 0.0417,
-      "Coal": 0.3179,
-      "Gas": 0.0627,
-      "Hydro": 0.0283,
-      "Nuclear": 0.4139,
-      "Other Fossil": 0.0094,
-      "Other Renewables": 0.0326,
-      "Solar": 0.0839,
-      "Wind": 0.0097
+      "Bioenergy": 0.0404,
+      "Coal": 0.335,
+      "Gas": 0.0616,
+      "Hydro": 0.0259,
+      "Nuclear": 0.4083,
+      "Other Fossil": 0.0093,
+      "Other Renewables": 0.0324,
+      "Solar": 0.0788,
+      "Wind": 0.0083
     }
   },
   "DE": {
@@ -3704,12 +3704,12 @@
       "Bioenergy": 0.0806,
       "Coal": 0.1953,
       "Gas": 0.1623,
-      "Hydro": 0.0412,
+      "Hydro": 0.0411,
       "Nuclear": 0.0058,
       "Other Fossil": 0.0692,
       "Other Renewables": 0.0002,
       "Solar": 0.2013,
-      "Wind": 0.2442
+      "Wind": 0.2441
     }
   },
   "DJ": {
@@ -3849,25 +3849,25 @@
     },
     "2024": {
       "Bioenergy": 0.1064,
-      "Coal": 0.0985,
-      "Gas": 0.0711,
+      "Coal": 0.0986,
+      "Gas": 0.0712,
       "Hydro": 0.0191,
       "Nuclear": 0.0215,
-      "Other Fossil": 0.0341,
+      "Other Fossil": 0.0339,
       "Other Renewables": 0.0007,
       "Solar": 0.1054,
-      "Wind": 0.5431
+      "Wind": 0.5432
     },
     "2025": {
-      "Bioenergy": 0.091,
-      "Coal": 0.0847,
-      "Gas": 0.0845,
-      "Hydro": 0.0304,
-      "Nuclear": 0.0337,
-      "Other Fossil": 0.0378,
-      "Other Renewables": 0.0012,
-      "Solar": 0.1442,
-      "Wind": 0.4927
+      "Bioenergy": 0.0931,
+      "Coal": 0.0876,
+      "Gas": 0.0888,
+      "Hydro": 0.0329,
+      "Nuclear": 0.0372,
+      "Other Fossil": 0.0386,
+      "Other Renewables": 0.0013,
+      "Solar": 0.1485,
+      "Wind": 0.472
     }
   },
   "DM": {
@@ -4177,12 +4177,12 @@
     "2025": {
       "Bioenergy": 0.0002,
       "Coal": 0.001,
-      "Gas": 0.034,
-      "Hydro": 0.7198,
+      "Gas": 0.0341,
+      "Hydro": 0.7197,
       "Nuclear": 0.0006,
       "Other Fossil": 0.2361,
       "Other Renewables": 0.0002,
-      "Solar": 0.0023,
+      "Solar": 0.0022,
       "Wind": 0.0058
     }
   },
@@ -4243,26 +4243,26 @@
       "Wind": 0.1554
     },
     "2024": {
-      "Bioenergy": 0.0674,
-      "Coal": 0.0501,
-      "Gas": 0.0866,
-      "Hydro": 0.0656,
-      "Nuclear": 0.0751,
-      "Other Fossil": 0.3039,
+      "Bioenergy": 0.0673,
+      "Coal": 0.05,
+      "Gas": 0.0865,
+      "Hydro": 0.0655,
+      "Nuclear": 0.075,
+      "Other Fossil": 0.3036,
       "Other Renewables": 0.0025,
-      "Solar": 0.1471,
-      "Wind": 0.2016
+      "Solar": 0.1482,
+      "Wind": 0.2013
     },
     "2025": {
-      "Bioenergy": 0.0706,
-      "Coal": 0.0386,
-      "Gas": 0.0712,
-      "Hydro": 0.0507,
-      "Nuclear": 0.0587,
-      "Other Fossil": 0.3077,
-      "Other Renewables": 0.0021,
-      "Solar": 0.1874,
-      "Wind": 0.213
+      "Bioenergy": 0.0687,
+      "Coal": 0.0413,
+      "Gas": 0.0763,
+      "Hydro": 0.0538,
+      "Nuclear": 0.0633,
+      "Other Fossil": 0.2914,
+      "Other Renewables": 0.0022,
+      "Solar": 0.1963,
+      "Wind": 0.2066
     }
   },
   "EG": {
@@ -4333,15 +4333,15 @@
       "Wind": 0.0282
     },
     "2025": {
-      "Bioenergy": 0.0006,
+      "Bioenergy": 0.0005,
       "Coal": 0,
-      "Gas": 0.7883,
-      "Hydro": 0.0673,
+      "Gas": 0.7839,
+      "Hydro": 0.0721,
       "Nuclear": 0,
-      "Other Fossil": 0.0729,
+      "Other Fossil": 0.0725,
       "Other Renewables": 0,
-      "Solar": 0.0307,
-      "Wind": 0.0401
+      "Solar": 0.0353,
+      "Wind": 0.0357
     }
   },
   "ER": {
@@ -4491,15 +4491,15 @@
       "Wind": 0.2368
     },
     "2025": {
-      "Bioenergy": 0.0139,
-      "Coal": 0.0091,
-      "Gas": 0.185,
-      "Hydro": 0.146,
-      "Nuclear": 0.1942,
-      "Other Fossil": 0.007,
+      "Bioenergy": 0.014,
+      "Coal": 0.0081,
+      "Gas": 0.18,
+      "Hydro": 0.1409,
+      "Nuclear": 0.1985,
+      "Other Fossil": 0.0069,
       "Other Renewables": 0.0023,
-      "Solar": 0.2357,
-      "Wind": 0.2068
+      "Solar": 0.236,
+      "Wind": 0.2133
     }
   },
   "ET": {
@@ -4587,7 +4587,7 @@
       "Coal": 0.092,
       "Gas": 0.1047,
       "Hydro": 0.1815,
-      "Nuclear": 0.3152,
+      "Nuclear": 0.3153,
       "Other Fossil": 0.0609,
       "Other Renewables": 0.004,
       "Solar": 0.0089,
@@ -4621,7 +4621,7 @@
       "Gas": 0.0512,
       "Hydro": 0.1864,
       "Nuclear": 0.3193,
-      "Other Fossil": 0.0568,
+      "Other Fossil": 0.0569,
       "Other Renewables": 0.0011,
       "Solar": 0.0121,
       "Wind": 0.1509
@@ -4649,15 +4649,15 @@
       "Wind": 0.2352
     },
     "2025": {
-      "Bioenergy": 0.1179,
-      "Coal": 0.0174,
-      "Gas": 0.0274,
-      "Hydro": 0.17,
-      "Nuclear": 0.3432,
-      "Other Fossil": 0.0444,
+      "Bioenergy": 0.1184,
+      "Coal": 0.0173,
+      "Gas": 0.0271,
+      "Hydro": 0.1649,
+      "Nuclear": 0.3559,
+      "Other Fossil": 0.044,
       "Other Renewables": 0.0032,
-      "Solar": 0.0265,
-      "Wind": 0.2498
+      "Solar": 0.0258,
+      "Wind": 0.2434
     }
   },
   "FJ": {
@@ -4956,24 +4956,24 @@
     "2024": {
       "Bioenergy": 0.006,
       "Coal": 0.0012,
-      "Gas": 0.0342,
+      "Gas": 0.0341,
       "Hydro": 0.1223,
-      "Nuclear": 0.696,
+      "Nuclear": 0.6964,
       "Other Fossil": 0.0062,
       "Other Renewables": 0,
       "Solar": 0.0443,
-      "Wind": 0.0899
+      "Wind": 0.0895
     },
     "2025": {
-      "Bioenergy": 0.0057,
+      "Bioenergy": 0.0055,
       "Coal": 0.0023,
-      "Gas": 0.033,
-      "Hydro": 0.1115,
-      "Nuclear": 0.6924,
+      "Gas": 0.0336,
+      "Hydro": 0.1067,
+      "Nuclear": 0.6962,
       "Other Fossil": 0.0077,
       "Other Renewables": 0,
-      "Solar": 0.0619,
-      "Wind": 0.0854
+      "Solar": 0.0621,
+      "Wind": 0.0859
     }
   },
   "GA": {
@@ -5090,48 +5090,48 @@
       "Wind": 0.2307
     },
     "2022": {
-      "Bioenergy": 0.0548,
-      "Coal": 0.0197,
-      "Gas": 0.4059,
-      "Hydro": 0.0156,
-      "Nuclear": 0.1661,
+      "Bioenergy": 0.0549,
+      "Coal": 0.0198,
+      "Gas": 0.4064,
+      "Hydro": 0.0157,
+      "Nuclear": 0.1663,
       "Other Fossil": 0.0097,
       "Other Renewables": 0.0002,
-      "Solar": 0.0457,
-      "Wind": 0.2823
+      "Solar": 0.0458,
+      "Wind": 0.2815
     },
     "2023": {
       "Bioenergy": 0.0536,
-      "Coal": 0.0234,
-      "Gas": 0.3517,
-      "Hydro": 0.0278,
-      "Nuclear": 0.164,
+      "Coal": 0.0235,
+      "Gas": 0.3519,
+      "Hydro": 0.0279,
+      "Nuclear": 0.1641,
       "Other Fossil": 0.0117,
       "Other Renewables": 0.0006,
       "Solar": 0.0524,
-      "Wind": 0.3147
+      "Wind": 0.3143
     },
     "2024": {
-      "Bioenergy": 0.074,
-      "Coal": 0.0221,
-      "Gas": 0.3002,
-      "Hydro": 0.0363,
-      "Nuclear": 0.1687,
+      "Bioenergy": 0.0742,
+      "Coal": 0.0222,
+      "Gas": 0.3011,
+      "Hydro": 0.0364,
+      "Nuclear": 0.1692,
       "Other Fossil": 0.0151,
       "Other Renewables": 0.0009,
-      "Solar": 0.0623,
-      "Wind": 0.3204
+      "Solar": 0.0625,
+      "Wind": 0.3183
     },
     "2025": {
-      "Bioenergy": 0.0729,
-      "Coal": 0.0136,
-      "Gas": 0.3118,
-      "Hydro": 0.0289,
-      "Nuclear": 0.1595,
-      "Other Fossil": 0.0195,
+      "Bioenergy": 0.075,
+      "Coal": 0.0145,
+      "Gas": 0.3229,
+      "Hydro": 0.0302,
+      "Nuclear": 0.161,
+      "Other Fossil": 0.0193,
       "Other Renewables": 0.0008,
-      "Solar": 0.0898,
-      "Wind": 0.3033
+      "Solar": 0.0901,
+      "Wind": 0.2863
     }
   },
   "GD": {
@@ -5283,12 +5283,12 @@
     "2025": {
       "Bioenergy": 0.0025,
       "Coal": 0.0634,
-      "Gas": 0.1271,
-      "Hydro": 0.7709,
-      "Nuclear": 0.0066,
+      "Gas": 0.1291,
+      "Hydro": 0.7689,
+      "Nuclear": 0.0065,
       "Other Fossil": 0.0007,
       "Other Renewables": 0.0006,
-      "Solar": 0.01,
+      "Solar": 0.0099,
       "Wind": 0.0181
     }
   },
@@ -5993,14 +5993,14 @@
     },
     "2025": {
       "Bioenergy": 0.0006,
-      "Coal": 0.0539,
-      "Gas": 0.4204,
-      "Hydro": 0.0486,
-      "Nuclear": 0.0039,
+      "Coal": 0.0608,
+      "Gas": 0.4169,
+      "Hydro": 0.0493,
+      "Nuclear": 0.0037,
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0001,
-      "Solar": 0.2751,
-      "Wind": 0.197
+      "Solar": 0.2753,
+      "Wind": 0.1928
     }
   },
   "GT": {
@@ -6372,7 +6372,7 @@
       "Nuclear": 0.0134,
       "Other Fossil": 0.0054,
       "Other Renewables": 0.0013,
-      "Solar": 0.0158,
+      "Solar": 0.0159,
       "Wind": 0.0176
     },
     "2024": {
@@ -6387,15 +6387,15 @@
       "Wind": 0.0185
     },
     "2025": {
-      "Bioenergy": 0.008,
-      "Coal": 0.5581,
-      "Gas": 0.3389,
-      "Hydro": 0.026,
-      "Nuclear": 0.0142,
+      "Bioenergy": 0.0079,
+      "Coal": 0.5572,
+      "Gas": 0.3388,
+      "Hydro": 0.0282,
+      "Nuclear": 0.0139,
       "Other Fossil": 0.0051,
-      "Other Renewables": 0.0015,
-      "Solar": 0.0256,
-      "Wind": 0.0227
+      "Other Renewables": 0.0014,
+      "Solar": 0.026,
+      "Wind": 0.0215
     }
   },
   "HN": {
@@ -6467,13 +6467,13 @@
     },
     "2025": {
       "Bioenergy": 0.1282,
-      "Coal": 0.0052,
-      "Gas": 0.0051,
-      "Hydro": 0.2233,
+      "Coal": 0.0053,
+      "Gas": 0.0052,
+      "Hydro": 0.2232,
       "Nuclear": 0.0004,
       "Other Fossil": 0.4371,
       "Other Renewables": 0.0264,
-      "Solar": 0.1,
+      "Solar": 0.0999,
       "Wind": 0.074
     }
   },
@@ -6517,7 +6517,7 @@
       "Gas": 0.2541,
       "Hydro": 0.297,
       "Nuclear": 0.0571,
-      "Other Fossil": 0.0076,
+      "Other Fossil": 0.0077,
       "Other Renewables": 0.0245,
       "Solar": 0.0273,
       "Wind": 0.1601
@@ -6525,7 +6525,7 @@
     "2023": {
       "Bioenergy": 0.0378,
       "Coal": 0.0878,
-      "Gas": 0.2241,
+      "Gas": 0.224,
       "Hydro": 0.4061,
       "Nuclear": 0.0293,
       "Other Fossil": 0.0091,
@@ -6536,24 +6536,24 @@
     "2024": {
       "Bioenergy": 0.0399,
       "Coal": 0.0738,
-      "Gas": 0.2145,
+      "Gas": 0.2146,
       "Hydro": 0.3471,
       "Nuclear": 0.0541,
       "Other Fossil": 0.0099,
       "Other Renewables": 0.0164,
       "Solar": 0.0708,
-      "Wind": 0.1734
+      "Wind": 0.1733
     },
     "2025": {
-      "Bioenergy": 0.0412,
-      "Coal": 0.0375,
-      "Gas": 0.1807,
-      "Hydro": 0.3345,
-      "Nuclear": 0.0606,
-      "Other Fossil": 0.0111,
-      "Other Renewables": 0.0162,
-      "Solar": 0.1117,
-      "Wind": 0.2066
+      "Bioenergy": 0.0395,
+      "Coal": 0.0445,
+      "Gas": 0.1891,
+      "Hydro": 0.3293,
+      "Nuclear": 0.0598,
+      "Other Fossil": 0.0108,
+      "Other Renewables": 0.0168,
+      "Solar": 0.1091,
+      "Wind": 0.2011
     }
   },
   "HT": {
@@ -6653,7 +6653,7 @@
       "Gas": 0.2511,
       "Hydro": 0.0536,
       "Nuclear": 0.4032,
-      "Other Fossil": 0.0218,
+      "Other Fossil": 0.0219,
       "Other Renewables": 0.0046,
       "Solar": 0.065,
       "Wind": 0.0434
@@ -6664,7 +6664,7 @@
       "Gas": 0.2574,
       "Hydro": 0.0509,
       "Nuclear": 0.3865,
-      "Other Fossil": 0.0226,
+      "Other Fossil": 0.0227,
       "Other Renewables": 0.0045,
       "Solar": 0.0948,
       "Wind": 0.042
@@ -6700,18 +6700,18 @@
       "Other Fossil": 0.0179,
       "Other Renewables": 0.0041,
       "Solar": 0.2117,
-      "Wind": 0.0448
+      "Wind": 0.0447
     },
     "2025": {
-      "Bioenergy": 0.0373,
-      "Coal": 0.0596,
-      "Gas": 0.1829,
-      "Hydro": 0.0364,
+      "Bioenergy": 0.0364,
+      "Coal": 0.0587,
+      "Gas": 0.1857,
+      "Hydro": 0.0349,
       "Nuclear": 0.3618,
-      "Other Fossil": 0.0173,
+      "Other Fossil": 0.0174,
       "Other Renewables": 0.0038,
-      "Solar": 0.2654,
-      "Wind": 0.0356
+      "Solar": 0.2665,
+      "Wind": 0.0348
     }
   },
   "ID": {
@@ -6861,15 +6861,15 @@
       "Wind": 0.3483
     },
     "2025": {
-      "Bioenergy": 0.0082,
-      "Coal": 0.0565,
-      "Gas": 0.4233,
-      "Hydro": 0.0465,
-      "Nuclear": 0.0344,
-      "Other Fossil": 0.0412,
-      "Other Renewables": 0.0012,
-      "Solar": 0.0485,
-      "Wind": 0.3402
+      "Bioenergy": 0.0089,
+      "Coal": 0.0478,
+      "Gas": 0.4132,
+      "Hydro": 0.0498,
+      "Nuclear": 0.0393,
+      "Other Fossil": 0.0404,
+      "Other Renewables": 0.0014,
+      "Solar": 0.0565,
+      "Wind": 0.3427
     }
   },
   "IL": {
@@ -7019,15 +7019,15 @@
       "Wind": 0.0452
     },
     "2025": {
-      "Bioenergy": 0.0076,
-      "Coal": 0.7297,
-      "Gas": 0.0152,
-      "Hydro": 0.0691,
-      "Nuclear": 0.0327,
+      "Bioenergy": 0.0073,
+      "Coal": 0.7196,
+      "Gas": 0.0153,
+      "Hydro": 0.0758,
+      "Nuclear": 0.0311,
       "Other Fossil": 0.0019,
       "Other Renewables": 0.0016,
-      "Solar": 0.0929,
-      "Wind": 0.0495
+      "Solar": 0.0902,
+      "Wind": 0.0573
     }
   },
   "IQ": {
@@ -7310,7 +7310,7 @@
       "Other Fossil": 0.0321,
       "Other Renewables": 0.019,
       "Solar": 0.0988,
-      "Wind": 0.0829
+      "Wind": 0.0828
     },
     "2023": {
       "Bioenergy": 0.0561,
@@ -7326,24 +7326,24 @@
     "2024": {
       "Bioenergy": 0.0554,
       "Coal": 0.0347,
-      "Gas": 0.408,
-      "Hydro": 0.186,
+      "Gas": 0.4079,
+      "Hydro": 0.1861,
       "Nuclear": 0.0345,
-      "Other Fossil": 0.0336,
+      "Other Fossil": 0.0337,
       "Other Renewables": 0.0189,
       "Solar": 0.1323,
-      "Wind": 0.0965
+      "Wind": 0.0964
     },
     "2025": {
       "Bioenergy": 0.0492,
-      "Coal": 0.0298,
-      "Gas": 0.4245,
-      "Hydro": 0.1595,
-      "Nuclear": 0.0302,
+      "Coal": 0.03,
+      "Gas": 0.4248,
+      "Hydro": 0.1593,
+      "Nuclear": 0.0304,
       "Other Fossil": 0.0282,
       "Other Renewables": 0.0193,
-      "Solar": 0.159,
-      "Wind": 0.1003
+      "Solar": 0.1589,
+      "Wind": 0.0998
     }
   },
   "JM": {
@@ -7572,15 +7572,15 @@
       "Wind": 0.0198
     },
     "2025": {
-      "Bioenergy": 0.068,
-      "Coal": 0.264,
-      "Gas": 0.2825,
-      "Hydro": 0.0866,
-      "Nuclear": 0.1066,
-      "Other Fossil": 0.0279,
-      "Other Renewables": 0.0122,
-      "Solar": 0.1229,
-      "Wind": 0.0292
+      "Bioenergy": 0.0661,
+      "Coal": 0.2703,
+      "Gas": 0.2877,
+      "Hydro": 0.0827,
+      "Nuclear": 0.1035,
+      "Other Fossil": 0.0299,
+      "Other Renewables": 0.0114,
+      "Solar": 0.1208,
+      "Wind": 0.0275
     }
   },
   "KE": {
@@ -7651,15 +7651,15 @@
       "Wind": 0.1313
     },
     "2025": {
-      "Bioenergy": 0.0267,
-      "Coal": 0.0307,
-      "Gas": 0.0421,
-      "Hydro": 0.2502,
+      "Bioenergy": 0.0263,
+      "Coal": 0.0302,
+      "Gas": 0.0414,
+      "Hydro": 0.2635,
       "Nuclear": 0.0015,
-      "Other Fossil": 0.0857,
+      "Other Fossil": 0.0877,
       "Other Renewables": 0.3963,
-      "Solar": 0.0349,
-      "Wind": 0.1317
+      "Solar": 0.0342,
+      "Wind": 0.1188
     }
   },
   "KG": {
@@ -7731,14 +7731,14 @@
     },
     "2025": {
       "Bioenergy": 0.0015,
-      "Coal": 0.0967,
+      "Coal": 0.0964,
       "Gas": 0.0153,
-      "Hydro": 0.8342,
-      "Nuclear": 0.0042,
+      "Hydro": 0.8348,
+      "Nuclear": 0.0041,
       "Other Fossil": 0.0335,
       "Other Renewables": 0.0004,
-      "Solar": 0.0075,
-      "Wind": 0.0067
+      "Solar": 0.0076,
+      "Wind": 0.0064
     }
   },
   "KH": {
@@ -7809,15 +7809,15 @@
       "Wind": 0.0186
     },
     "2025": {
-      "Bioenergy": 0.0135,
-      "Coal": 0.4568,
-      "Gas": 0.024,
-      "Hydro": 0.3766,
-      "Nuclear": 0.0143,
+      "Bioenergy": 0.0134,
+      "Coal": 0.456,
+      "Gas": 0.0239,
+      "Hydro": 0.3788,
+      "Nuclear": 0.014,
       "Other Fossil": 0.0551,
-      "Other Renewables": 0.0015,
-      "Solar": 0.0353,
-      "Wind": 0.0229
+      "Other Renewables": 0.0014,
+      "Solar": 0.0358,
+      "Wind": 0.0216
     }
   },
   "KI": {
@@ -8955,7 +8955,7 @@
       "Gas": 0.2749,
       "Hydro": 0.1487,
       "Nuclear": 0.1592,
-      "Other Fossil": 0.0371,
+      "Other Fossil": 0.0372,
       "Other Renewables": 0.0049,
       "Solar": 0.037,
       "Wind": 0.1714
@@ -8964,12 +8964,12 @@
       "Bioenergy": 0.0518,
       "Coal": 0.1191,
       "Gas": 0.2264,
-      "Hydro": 0.143,
+      "Hydro": 0.1429,
       "Nuclear": 0.1409,
-      "Other Fossil": 0.0476,
+      "Other Fossil": 0.0477,
       "Other Renewables": 0.005,
       "Solar": 0.0647,
-      "Wind": 0.2014
+      "Wind": 0.2013
     },
     "2023": {
       "Bioenergy": 0.0386,
@@ -8988,21 +8988,21 @@
       "Gas": 0.1657,
       "Hydro": 0.1097,
       "Nuclear": 0.091,
-      "Other Fossil": 0.0843,
+      "Other Fossil": 0.0844,
       "Other Renewables": 0.0031,
       "Solar": 0.1408,
-      "Wind": 0.3148
+      "Wind": 0.3147
     },
     "2025": {
-      "Bioenergy": 0.0191,
-      "Coal": 0.0309,
-      "Gas": 0.1941,
-      "Hydro": 0.0604,
-      "Nuclear": 0.0449,
-      "Other Fossil": 0.1016,
-      "Other Renewables": 0.0016,
-      "Solar": 0.1834,
-      "Wind": 0.3641
+      "Bioenergy": 0.0197,
+      "Coal": 0.0341,
+      "Gas": 0.2094,
+      "Hydro": 0.0646,
+      "Nuclear": 0.0505,
+      "Other Fossil": 0.1018,
+      "Other Renewables": 0.0017,
+      "Solar": 0.1835,
+      "Wind": 0.3346
     }
   },
   "LU": {
@@ -9021,9 +9021,9 @@
       "Bioenergy": 0.0716,
       "Coal": 0.115,
       "Gas": 0.2387,
-      "Hydro": 0.1522,
+      "Hydro": 0.1521,
       "Nuclear": 0.1667,
-      "Other Fossil": 0.0393,
+      "Other Fossil": 0.0394,
       "Other Renewables": 0.0054,
       "Solar": 0.0574,
       "Wind": 0.1537
@@ -9034,7 +9034,7 @@
       "Gas": 0.2384,
       "Hydro": 0.1479,
       "Nuclear": 0.1683,
-      "Other Fossil": 0.038,
+      "Other Fossil": 0.0382,
       "Other Renewables": 0.0052,
       "Solar": 0.0657,
       "Wind": 0.1373
@@ -9042,13 +9042,13 @@
     "2022": {
       "Bioenergy": 0.0846,
       "Coal": 0.1266,
-      "Gas": 0.2274,
-      "Hydro": 0.1304,
-      "Nuclear": 0.1498,
-      "Other Fossil": 0.0388,
+      "Gas": 0.2273,
+      "Hydro": 0.1303,
+      "Nuclear": 0.1497,
+      "Other Fossil": 0.0389,
       "Other Renewables": 0.0053,
       "Solar": 0.0886,
-      "Wind": 0.1486
+      "Wind": 0.1485
     },
     "2023": {
       "Bioenergy": 0.0551,
@@ -9058,30 +9058,30 @@
       "Nuclear": 0.1504,
       "Other Fossil": 0.0372,
       "Other Renewables": 0.0053,
-      "Solar": 0.1003,
+      "Solar": 0.1004,
       "Wind": 0.2004
     },
     "2024": {
       "Bioenergy": 0.0734,
-      "Coal": 0.0968,
-      "Gas": 0.1812,
+      "Coal": 0.0969,
+      "Gas": 0.1813,
       "Hydro": 0.1556,
       "Nuclear": 0.1476,
-      "Other Fossil": 0.0375,
+      "Other Fossil": 0.0376,
       "Other Renewables": 0.005,
       "Solar": 0.1172,
-      "Wind": 0.1857
+      "Wind": 0.1855
     },
     "2025": {
-      "Bioenergy": 0.0724,
-      "Coal": 0.0894,
-      "Gas": 0.1791,
-      "Hydro": 0.131,
-      "Nuclear": 0.1377,
+      "Bioenergy": 0.0686,
+      "Coal": 0.0908,
+      "Gas": 0.1817,
+      "Hydro": 0.1309,
+      "Nuclear": 0.1399,
       "Other Fossil": 0.0413,
-      "Other Renewables": 0.0049,
+      "Other Renewables": 0.005,
       "Solar": 0.1699,
-      "Wind": 0.1742
+      "Wind": 0.1718
     }
   },
   "LV": {
@@ -9101,7 +9101,7 @@
       "Coal": 0.0347,
       "Gas": 0.3002,
       "Hydro": 0.3948,
-      "Nuclear": 0.05,
+      "Nuclear": 0.0499,
       "Other Fossil": 0.087,
       "Other Renewables": 0.0016,
       "Solar": 0.0098,
@@ -9113,7 +9113,7 @@
       "Gas": 0.3106,
       "Hydro": 0.3884,
       "Nuclear": 0.0575,
-      "Other Fossil": 0.0714,
+      "Other Fossil": 0.0715,
       "Other Renewables": 0.0018,
       "Solar": 0.0124,
       "Wind": 0.0405
@@ -9124,9 +9124,9 @@
       "Gas": 0.2507,
       "Hydro": 0.4325,
       "Nuclear": 0.0676,
-      "Other Fossil": 0.0451,
+      "Other Fossil": 0.0452,
       "Other Renewables": 0.0025,
-      "Solar": 0.0234,
+      "Solar": 0.0235,
       "Wind": 0.0623
     },
     "2023": {
@@ -9141,26 +9141,26 @@
       "Wind": 0.0637
     },
     "2024": {
-      "Bioenergy": 0.0543,
-      "Coal": 0.0385,
-      "Gas": 0.266,
-      "Hydro": 0.425,
-      "Nuclear": 0.0585,
-      "Other Fossil": 0.0104,
+      "Bioenergy": 0.0562,
+      "Coal": 0.0384,
+      "Gas": 0.2653,
+      "Hydro": 0.4255,
+      "Nuclear": 0.0583,
+      "Other Fossil": 0.0094,
       "Other Renewables": 0.002,
-      "Solar": 0.0779,
-      "Wind": 0.0675
+      "Solar": 0.0777,
+      "Wind": 0.0672
     },
     "2025": {
-      "Bioenergy": 0.0617,
-      "Coal": 0.0129,
-      "Gas": 0.2294,
-      "Hydro": 0.5193,
-      "Nuclear": 0.0212,
-      "Other Fossil": 0.0027,
-      "Other Renewables": 0.0008,
-      "Solar": 0.1094,
-      "Wind": 0.0427
+      "Bioenergy": 0.0589,
+      "Coal": 0.0153,
+      "Gas": 0.2432,
+      "Hydro": 0.4932,
+      "Nuclear": 0.0254,
+      "Other Fossil": 0.0081,
+      "Other Renewables": 0.0009,
+      "Solar": 0.1109,
+      "Wind": 0.044
     }
   },
   "LY": {
@@ -9310,15 +9310,15 @@
       "Wind": 0.2171
     },
     "2025": {
-      "Bioenergy": 0,
-      "Coal": 0.6601,
-      "Gas": 0.0935,
-      "Hydro": 0.0198,
-      "Nuclear": 0,
-      "Other Fossil": 0.0198,
-      "Other Renewables": 0,
-      "Solar": 0.0227,
-      "Wind": 0.1841
+      "Bioenergy": 0.0002,
+      "Coal": 0.6074,
+      "Gas": 0.1126,
+      "Hydro": 0.0318,
+      "Nuclear": 0.0007,
+      "Other Fossil": 0.0208,
+      "Other Renewables": 0.0003,
+      "Solar": 0.0321,
+      "Wind": 0.1942
     }
   },
   "MD": {
@@ -9393,11 +9393,11 @@
       "Coal": 0.0026,
       "Gas": 0.9215,
       "Hydro": 0.0453,
-      "Nuclear": 0.004,
+      "Nuclear": 0.0041,
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0001,
       "Solar": 0.023,
-      "Wind": 0.0025
+      "Wind": 0.0024
     }
   },
   "ME": {
@@ -9459,24 +9459,24 @@
     "2024": {
       "Bioenergy": 0.0039,
       "Coal": 0.3764,
-      "Gas": 0.031,
+      "Gas": 0.0311,
       "Hydro": 0.4323,
       "Nuclear": 0.0288,
       "Other Fossil": 0.003,
       "Other Renewables": 0.001,
       "Solar": 0.032,
-      "Wind": 0.0917
+      "Wind": 0.0916
     },
     "2025": {
-      "Bioenergy": 0.0126,
-      "Coal": 0.2161,
-      "Gas": 0.096,
-      "Hydro": 0.3695,
-      "Nuclear": 0.0869,
-      "Other Fossil": 0.0107,
-      "Other Renewables": 0.0033,
-      "Solar": 0.0735,
-      "Wind": 0.1315
+      "Bioenergy": 0.0132,
+      "Coal": 0.2119,
+      "Gas": 0.1039,
+      "Hydro": 0.3583,
+      "Nuclear": 0.0938,
+      "Other Fossil": 0.0113,
+      "Other Renewables": 0.0034,
+      "Solar": 0.0768,
+      "Wind": 0.1274
     }
   },
   "MG": {
@@ -9576,7 +9576,7 @@
       "Gas": 0.2281,
       "Hydro": 0.2314,
       "Nuclear": 0.0609,
-      "Other Fossil": 0.006,
+      "Other Fossil": 0.0061,
       "Other Renewables": 0.0019,
       "Solar": 0.0081,
       "Wind": 0.0469
@@ -9587,7 +9587,7 @@
       "Gas": 0.2819,
       "Hydro": 0.2474,
       "Nuclear": 0.0611,
-      "Other Fossil": 0.006,
+      "Other Fossil": 0.0061,
       "Other Renewables": 0.0019,
       "Solar": 0.0098,
       "Wind": 0.044
@@ -9627,14 +9627,14 @@
     },
     "2025": {
       "Bioenergy": 0.0082,
-      "Coal": 0.3994,
-      "Gas": 0.2654,
-      "Hydro": 0.1739,
-      "Nuclear": 0.0453,
+      "Coal": 0.3997,
+      "Gas": 0.2659,
+      "Hydro": 0.1736,
+      "Nuclear": 0.0457,
       "Other Fossil": 0.0055,
       "Other Renewables": 0.0016,
-      "Solar": 0.0477,
-      "Wind": 0.0531
+      "Solar": 0.0476,
+      "Wind": 0.0523
     }
   },
   "ML": {
@@ -9864,14 +9864,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.9052,
+      "Coal": 0.9048,
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0948
+      "Wind": 0.0952
     }
   },
   "MO": {
@@ -9942,15 +9942,15 @@
       "Wind": 0.063
     },
     "2025": {
-      "Bioenergy": 0.0553,
-      "Coal": 0.4468,
-      "Gas": 0.1586,
-      "Hydro": 0.0888,
-      "Nuclear": 0.0483,
+      "Bioenergy": 0.0551,
+      "Coal": 0.4439,
+      "Gas": 0.1582,
+      "Hydro": 0.096,
+      "Nuclear": 0.0473,
       "Other Fossil": 0.034,
-      "Other Renewables": 0.005,
-      "Solar": 0.0859,
-      "Wind": 0.0774
+      "Other Renewables": 0.0049,
+      "Solar": 0.0874,
+      "Wind": 0.0732
     }
   },
   "MQ": {
@@ -10238,13 +10238,13 @@
     "2023": {
       "Bioenergy": 0.0043,
       "Coal": 0.0224,
-      "Gas": 0.7654,
+      "Gas": 0.7653,
       "Hydro": 0.0265,
       "Nuclear": 0.0311,
       "Other Fossil": 0.0081,
       "Other Renewables": 0.0011,
       "Solar": 0.1213,
-      "Wind": 0.02
+      "Wind": 0.0199
     },
     "2024": {
       "Bioenergy": 0.0063,
@@ -10255,18 +10255,18 @@
       "Other Fossil": 0.007,
       "Other Renewables": 0.0016,
       "Solar": 0.1369,
-      "Wind": 0.0282
+      "Wind": 0.0281
     },
     "2025": {
       "Bioenergy": 0.0064,
-      "Coal": 0.0289,
-      "Gas": 0.6779,
-      "Hydro": 0.0395,
-      "Nuclear": 0.045,
+      "Coal": 0.0292,
+      "Gas": 0.6784,
+      "Hydro": 0.0392,
+      "Nuclear": 0.0454,
       "Other Fossil": 0.0142,
       "Other Renewables": 0.0016,
-      "Solar": 0.1582,
-      "Wind": 0.0282
+      "Solar": 0.1581,
+      "Wind": 0.0275
     }
   },
   "MU": {
@@ -10653,14 +10653,14 @@
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0245,
-      "Coal": 0.461,
-      "Gas": 0.3101,
-      "Hydro": 0.18,
+      "Bioenergy": 0.0244,
+      "Coal": 0.4567,
+      "Gas": 0.3132,
+      "Hydro": 0.181,
       "Nuclear": 0,
-      "Other Fossil": 0.006,
+      "Other Fossil": 0.0061,
       "Other Renewables": 0,
-      "Solar": 0.0184,
+      "Solar": 0.0185,
       "Wind": 0
     }
   },
@@ -11050,8 +11050,8 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.718,
-      "Hydro": 0.282,
+      "Gas": 0.7116,
+      "Hydro": 0.2884,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -11129,35 +11129,35 @@
     "2025": {
       "Bioenergy": 0.1684,
       "Coal": 0.0033,
-      "Gas": 0.02,
-      "Hydro": 0.0858,
+      "Gas": 0.0203,
+      "Hydro": 0.0853,
       "Nuclear": 0.0017,
-      "Other Fossil": 0.3977,
+      "Other Fossil": 0.3978,
       "Other Renewables": 0.1562,
-      "Solar": 0.013,
-      "Wind": 0.154
+      "Solar": 0.0129,
+      "Wind": 0.1541
     }
   },
   "NL": {
     "2019": {
       "Bioenergy": 0.0421,
-      "Coal": 0.1601,
-      "Gas": 0.5732,
+      "Coal": 0.1602,
+      "Gas": 0.5734,
       "Hydro": 0.0048,
       "Nuclear": 0.0356,
       "Other Fossil": 0.0268,
-      "Other Renewables": 0.0158,
+      "Other Renewables": 0.0154,
       "Solar": 0.0457,
-      "Wind": 0.0958
+      "Wind": 0.0959
     },
     "2020": {
       "Bioenergy": 0.0646,
       "Coal": 0.08,
-      "Gas": 0.5819,
+      "Gas": 0.582,
       "Hydro": 0.0021,
       "Nuclear": 0.0336,
       "Other Fossil": 0.027,
-      "Other Renewables": 0.0145,
+      "Other Renewables": 0.0144,
       "Solar": 0.0694,
       "Wind": 0.1269
     },
@@ -11288,12 +11288,12 @@
       "Bioenergy": 0,
       "Coal": 0,
       "Gas": 0.0057,
-      "Hydro": 0.9072,
+      "Hydro": 0.9116,
       "Nuclear": 0,
-      "Other Fossil": 0.0014,
-      "Other Renewables": 0.0031,
+      "Other Fossil": 0.0015,
+      "Other Renewables": 0.003,
       "Solar": 0,
-      "Wind": 0.0825
+      "Wind": 0.0781
     }
   },
   "NP": {
@@ -11364,15 +11364,15 @@
       "Wind": 0.0166
     },
     "2025": {
-      "Bioenergy": 0.0043,
-      "Coal": 0.1089,
-      "Gas": 0.0198,
-      "Hydro": 0.8016,
-      "Nuclear": 0.0118,
+      "Bioenergy": 0.0042,
+      "Coal": 0.1082,
+      "Gas": 0.0197,
+      "Hydro": 0.8034,
+      "Nuclear": 0.0115,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.0012,
-      "Solar": 0.0312,
-      "Wind": 0.0201
+      "Solar": 0.0316,
+      "Wind": 0.0191
     }
   },
   "NR": {
@@ -12123,46 +12123,46 @@
     "2022": {
       "Bioenergy": 0.0062,
       "Coal": 0.1645,
-      "Gas": 0.2637,
+      "Gas": 0.2636,
       "Hydro": 0.2435,
       "Nuclear": 0.1541,
       "Other Fossil": 0.079,
       "Other Renewables": 0,
-      "Solar": 0.0566,
+      "Solar": 0.0567,
       "Wind": 0.0324
     },
     "2023": {
       "Bioenergy": 0.0054,
-      "Coal": 0.1616,
-      "Gas": 0.2605,
-      "Hydro": 0.2739,
-      "Nuclear": 0.1596,
+      "Coal": 0.1615,
+      "Gas": 0.2603,
+      "Hydro": 0.2737,
+      "Nuclear": 0.1594,
       "Other Fossil": 0.023,
       "Other Renewables": 0,
-      "Solar": 0.0848,
+      "Solar": 0.0854,
       "Wind": 0.0312
     },
     "2024": {
       "Bioenergy": 0.0056,
-      "Coal": 0.1435,
-      "Gas": 0.2442,
-      "Hydro": 0.2705,
-      "Nuclear": 0.1592,
+      "Coal": 0.1433,
+      "Gas": 0.2439,
+      "Hydro": 0.2702,
+      "Nuclear": 0.159,
       "Other Fossil": 0.0096,
       "Other Renewables": 0,
-      "Solar": 0.143,
+      "Solar": 0.144,
       "Wind": 0.0244
     },
     "2025": {
       "Bioenergy": 0.0039,
-      "Coal": 0.1558,
-      "Gas": 0.2072,
-      "Hydro": 0.2284,
-      "Nuclear": 0.1547,
-      "Other Fossil": 0.0027,
+      "Coal": 0.168,
+      "Gas": 0.2061,
+      "Hydro": 0.2364,
+      "Nuclear": 0.1382,
+      "Other Fossil": 0.0055,
       "Other Renewables": 0,
-      "Solar": 0.2212,
-      "Wind": 0.026
+      "Solar": 0.2144,
+      "Wind": 0.0274
     }
   },
   "PL": {
@@ -12223,25 +12223,25 @@
     },
     "2024": {
       "Bioenergy": 0.0151,
-      "Coal": 0.5564,
-      "Gas": 0.1066,
-      "Hydro": 0.0153,
+      "Coal": 0.5565,
+      "Gas": 0.1076,
+      "Hydro": 0.0152,
       "Nuclear": 0.0037,
-      "Other Fossil": 0.0411,
-      "Other Renewables": 0.0013,
+      "Other Fossil": 0.0395,
+      "Other Renewables": 0.0019,
       "Solar": 0.1098,
-      "Wind": 0.1507
+      "Wind": 0.1506
     },
     "2025": {
-      "Bioenergy": 0.0197,
-      "Coal": 0.5056,
-      "Gas": 0.1191,
-      "Hydro": 0.0108,
-      "Nuclear": 0.0008,
-      "Other Fossil": 0.0524,
+      "Bioenergy": 0.0183,
+      "Coal": 0.5141,
+      "Gas": 0.123,
+      "Hydro": 0.011,
+      "Nuclear": 0.0014,
+      "Other Fossil": 0.0526,
       "Other Renewables": 0.0033,
-      "Solar": 0.1415,
-      "Wind": 0.1468
+      "Solar": 0.1395,
+      "Wind": 0.1369
     }
   },
   "PM": {
@@ -12392,14 +12392,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.2061,
-      "Gas": 0.4062,
+      "Coal": 0.2153,
+      "Gas": 0.425,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.3556,
+      "Other Fossil": 0.3299,
       "Other Renewables": 0,
-      "Solar": 0.016,
-      "Wind": 0.016
+      "Solar": 0.0149,
+      "Wind": 0.0149
     }
   },
   "PS": {
@@ -12508,7 +12508,7 @@
       "Bioenergy": 0.0733,
       "Coal": 0.0331,
       "Gas": 0.3264,
-      "Hydro": 0.2126,
+      "Hydro": 0.2125,
       "Nuclear": 0.0255,
       "Other Fossil": 0.0074,
       "Other Renewables": 0.0008,
@@ -12517,14 +12517,14 @@
     },
     "2022": {
       "Bioenergy": 0.0701,
-      "Coal": 0.0312,
+      "Coal": 0.0311,
       "Gas": 0.3698,
       "Hydro": 0.1335,
       "Nuclear": 0.0376,
-      "Other Fossil": 0.0081,
+      "Other Fossil": 0.0082,
       "Other Renewables": 0.0014,
       "Solar": 0.0749,
-      "Wind": 0.2735
+      "Wind": 0.2734
     },
     "2023": {
       "Bioenergy": 0.0619,
@@ -12538,26 +12538,26 @@
       "Wind": 0.2743
     },
     "2024": {
-      "Bioenergy": 0.0643,
+      "Bioenergy": 0.065,
       "Coal": 0.0275,
-      "Gas": 0.1409,
-      "Hydro": 0.2644,
-      "Nuclear": 0.043,
+      "Gas": 0.141,
+      "Hydro": 0.2642,
+      "Nuclear": 0.0429,
       "Other Fossil": 0.009,
       "Other Renewables": 0.0015,
-      "Solar": 0.1567,
-      "Wind": 0.2927
+      "Solar": 0.1565,
+      "Wind": 0.2925
     },
     "2025": {
-      "Bioenergy": 0.0545,
-      "Coal": 0.0143,
-      "Gas": 0.1577,
-      "Hydro": 0.3068,
-      "Nuclear": 0.0235,
+      "Bioenergy": 0.0539,
+      "Coal": 0.015,
+      "Gas": 0.1593,
+      "Hydro": 0.2962,
+      "Nuclear": 0.0247,
       "Other Fossil": 0.0067,
-      "Other Renewables": 0.0008,
-      "Solar": 0.1782,
-      "Wind": 0.2574
+      "Other Renewables": 0.0009,
+      "Solar": 0.1803,
+      "Wind": 0.263
     }
   },
   "PY": {
@@ -12855,25 +12855,25 @@
     },
     "2024": {
       "Bioenergy": 0.0096,
-      "Coal": 0.1311,
+      "Coal": 0.1314,
       "Gas": 0.1951,
-      "Hydro": 0.2618,
+      "Hydro": 0.2617,
       "Nuclear": 0.2035,
       "Other Fossil": 0.0014,
       "Other Renewables": 0.0005,
       "Solar": 0.0781,
-      "Wind": 0.1188
+      "Wind": 0.1187
     },
     "2025": {
-      "Bioenergy": 0.0105,
-      "Coal": 0.1328,
-      "Gas": 0.1764,
-      "Hydro": 0.2514,
-      "Nuclear": 0.1835,
-      "Other Fossil": 0.0021,
+      "Bioenergy": 0.0108,
+      "Coal": 0.1345,
+      "Gas": 0.1799,
+      "Hydro": 0.2388,
+      "Nuclear": 0.1954,
+      "Other Fossil": 0.0022,
       "Other Renewables": 0.0006,
-      "Solar": 0.1237,
-      "Wind": 0.119
+      "Solar": 0.1211,
+      "Wind": 0.1168
     }
   },
   "RS": {
@@ -12933,26 +12933,26 @@
       "Wind": 0.0268
     },
     "2024": {
-      "Bioenergy": 0.0086,
-      "Coal": 0.6058,
-      "Gas": 0.0331,
+      "Bioenergy": 0.0085,
+      "Coal": 0.6057,
+      "Gas": 0.0339,
       "Hydro": 0.2896,
-      "Nuclear": 0.0114,
-      "Other Fossil": 0.008,
+      "Nuclear": 0.0112,
+      "Other Fossil": 0.0079,
       "Other Renewables": 0.0004,
-      "Solar": 0.0057,
-      "Wind": 0.0375
+      "Solar": 0.0056,
+      "Wind": 0.0372
     },
     "2025": {
-      "Bioenergy": 0.0095,
-      "Coal": 0.6008,
-      "Gas": 0.0577,
-      "Hydro": 0.2695,
-      "Nuclear": 0.0074,
-      "Other Fossil": 0.0079,
-      "Other Renewables": 0.0003,
-      "Solar": 0.005,
-      "Wind": 0.042
+      "Bioenergy": 0.0092,
+      "Coal": 0.6169,
+      "Gas": 0.0564,
+      "Hydro": 0.2604,
+      "Nuclear": 0.0056,
+      "Other Fossil": 0.0071,
+      "Other Renewables": 0.0002,
+      "Solar": 0.0036,
+      "Wind": 0.0405
     }
   },
   "RU": {
@@ -13024,14 +13024,14 @@
     },
     "2025": {
       "Bioenergy": 0.0007,
-      "Coal": 0.1806,
-      "Gas": 0.451,
-      "Hydro": 0.1703,
-      "Nuclear": 0.1789,
-      "Other Fossil": 0.0128,
+      "Coal": 0.1795,
+      "Gas": 0.448,
+      "Hydro": 0.1694,
+      "Nuclear": 0.1838,
+      "Other Fossil": 0.0127,
       "Other Renewables": 0,
-      "Solar": 0.0019,
-      "Wind": 0.0038
+      "Solar": 0.002,
+      "Wind": 0.0039
     }
   },
   "RW": {
@@ -13497,15 +13497,15 @@
       "Wind": 0.2471
     },
     "2025": {
-      "Bioenergy": 0.037,
+      "Bioenergy": 0.0368,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.3928,
-      "Nuclear": 0.2855,
+      "Hydro": 0.4083,
+      "Nuclear": 0.2843,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0353,
-      "Wind": 0.2493
+      "Solar": 0.0329,
+      "Wind": 0.2377
     }
   },
   "SG": {
@@ -13579,12 +13579,12 @@
       "Bioenergy": 0.0001,
       "Coal": 0.0021,
       "Gas": 0.9516,
-      "Hydro": 0.0004,
+      "Hydro": 0.0005,
       "Nuclear": 0.0002,
       "Other Fossil": 0.021,
       "Other Renewables": 0,
       "Solar": 0.024,
-      "Wind": 0.0004
+      "Wind": 0.0003
     }
   },
   "SH": {
@@ -13728,21 +13728,21 @@
       "Gas": 0.0344,
       "Hydro": 0.3227,
       "Nuclear": 0.3496,
-      "Other Fossil": 0.0028,
+      "Other Fossil": 0.0029,
       "Other Renewables": 0.0001,
       "Solar": 0.0748,
       "Wind": 0.0022
     },
     "2025": {
-      "Bioenergy": 0.0085,
-      "Coal": 0.1284,
-      "Gas": 0.0575,
-      "Hydro": 0.2898,
-      "Nuclear": 0.4183,
+      "Bioenergy": 0.0086,
+      "Coal": 0.1302,
+      "Gas": 0.0569,
+      "Hydro": 0.2895,
+      "Nuclear": 0.426,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.097,
-      "Wind": 0.0004
+      "Solar": 0.0883,
+      "Wind": 0.0005
     }
   },
   "SK": {
@@ -13813,14 +13813,14 @@
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0322,
+      "Bioenergy": 0.0331,
       "Coal": 0.0019,
-      "Gas": 0.0894,
-      "Hydro": 0.0998,
-      "Nuclear": 0.6908,
-      "Other Fossil": 0.0447,
-      "Other Renewables": 0.0173,
-      "Solar": 0.0239,
+      "Gas": 0.0942,
+      "Hydro": 0.1044,
+      "Nuclear": 0.6805,
+      "Other Fossil": 0.0449,
+      "Other Renewables": 0.0174,
+      "Solar": 0.0236,
       "Wind": 0
     }
   },
@@ -14366,15 +14366,15 @@
       "Wind": 0.0185
     },
     "2025": {
-      "Bioenergy": 0.152,
+      "Bioenergy": 0.1521,
       "Coal": 0.0023,
-      "Gas": 0.2262,
-      "Hydro": 0.1797,
+      "Gas": 0.2264,
+      "Hydro": 0.1794,
       "Nuclear": 0.0012,
-      "Other Fossil": 0.0335,
+      "Other Fossil": 0.0336,
       "Other Renewables": 0.1973,
       "Solar": 0.1564,
-      "Wind": 0.0513
+      "Wind": 0.0514
     }
   },
   "SY": {
@@ -14841,14 +14841,14 @@
     },
     "2025": {
       "Bioenergy": 0.0589,
-      "Coal": 0.1996,
+      "Coal": 0.1991,
       "Gas": 0.6014,
-      "Hydro": 0.0493,
-      "Nuclear": 0.0067,
+      "Hydro": 0.0504,
+      "Nuclear": 0.0066,
       "Other Fossil": 0.0007,
       "Other Renewables": 0.0007,
-      "Solar": 0.0564,
-      "Wind": 0.0262
+      "Solar": 0.0566,
+      "Wind": 0.0256
     }
   },
   "TJ": {
@@ -14920,14 +14920,14 @@
     },
     "2025": {
       "Bioenergy": 0.0003,
-      "Coal": 0.1127,
+      "Coal": 0.1126,
       "Gas": 0.0244,
-      "Hydro": 0.8583,
+      "Hydro": 0.8584,
       "Nuclear": 0.0009,
       "Other Fossil": 0.0001,
       "Other Renewables": 0.0001,
       "Solar": 0.0017,
-      "Wind": 0.0015
+      "Wind": 0.0014
     }
   },
   "TL": {
@@ -15473,14 +15473,14 @@
     },
     "2025": {
       "Bioenergy": 0.0009,
-      "Coal": 0.3632,
-      "Gas": 0.4646,
-      "Hydro": 0.0203,
-      "Nuclear": 0.0253,
+      "Coal": 0.3656,
+      "Gas": 0.471,
+      "Hydro": 0.0198,
+      "Nuclear": 0.0201,
       "Other Fossil": 0.0293,
       "Other Renewables": 0,
-      "Solar": 0.0521,
-      "Wind": 0.0443
+      "Solar": 0.0517,
+      "Wind": 0.0416
     }
   },
   "TZ": {
@@ -15788,15 +15788,15 @@
       "Wind": 0.1035
     },
     "2025": {
-      "Bioenergy": 0.0101,
-      "Coal": 0.1624,
-      "Gas": 0.3821,
-      "Hydro": 0.0593,
-      "Nuclear": 0.1729,
-      "Other Fossil": 0.008,
-      "Other Renewables": 0.004,
-      "Solar": 0.0904,
-      "Wind": 0.1109
+      "Bioenergy": 0.01,
+      "Coal": 0.1656,
+      "Gas": 0.3885,
+      "Hydro": 0.0565,
+      "Nuclear": 0.172,
+      "Other Fossil": 0.0083,
+      "Other Renewables": 0.0039,
+      "Solar": 0.0885,
+      "Wind": 0.1067
     }
   },
   "UY": {
@@ -15867,15 +15867,15 @@
       "Wind": 0.3322
     },
     "2025": {
-      "Bioenergy": 0.1342,
-      "Coal": 0.0019,
-      "Gas": 0.0296,
-      "Hydro": 0.4589,
+      "Bioenergy": 0.1387,
+      "Coal": 0.0018,
+      "Gas": 0.0307,
+      "Hydro": 0.4519,
       "Nuclear": 0.0012,
-      "Other Fossil": 0.0122,
+      "Other Fossil": 0.0121,
       "Other Renewables": 0.0003,
-      "Solar": 0.039,
-      "Wind": 0.3229
+      "Solar": 0.0388,
+      "Wind": 0.3244
     }
   },
   "UZ": {
@@ -15949,12 +15949,12 @@
       "Bioenergy": 0.0004,
       "Coal": 0.0694,
       "Gas": 0.8121,
-      "Hydro": 0.1016,
+      "Hydro": 0.1018,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
-      "Solar": 0.0022,
-      "Wind": 0.0018
+      "Solar": 0.0023,
+      "Wind": 0.0017
     }
   },
   "VC": {
@@ -16342,14 +16342,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5781,
-      "Gas": 0.0684,
-      "Hydro": 0.2229,
+      "Coal": 0.5408,
+      "Gas": 0.0662,
+      "Hydro": 0.2643,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0928,
-      "Wind": 0.0379
+      "Solar": 0.0866,
+      "Wind": 0.0422
     }
   },
   "VU": {
@@ -16579,14 +16579,14 @@
     },
     "2025": {
       "Bioenergy": 0.0066,
-      "Coal": 0.6903,
-      "Gas": 0.0574,
-      "Hydro": 0.0856,
-      "Nuclear": 0.0466,
+      "Coal": 0.6905,
+      "Gas": 0.0578,
+      "Hydro": 0.0853,
+      "Nuclear": 0.0469,
       "Other Fossil": 0.0055,
       "Other Renewables": 0.0017,
-      "Solar": 0.0202,
-      "Wind": 0.0861
+      "Solar": 0.0201,
+      "Wind": 0.0856
     }
   },
   "YE": {