@digital4better/data 1.3.20 → 1.3.21

package/data/mix/country-yearly.json

@@ -138,23 +138,23 @@
       "Bioenergy": 0.0161,
       "Coal": 0.4336,
       "Gas": 0.0757,
-      "Hydro": 0.2844,
+      "Hydro": 0.2845,
       "Nuclear": 0.0404,
       "Other Fossil": 0.02,
       "Other Renewables": 0.004,
       "Solar": 0.0689,
-      "Wind": 0.0568
+      "Wind": 0.0567
     },
     "2025": {
       "Bioenergy": 0.0158,
-      "Coal": 0.4113,
-      "Gas": 0.0727,
-      "Hydro": 0.2833,
-      "Nuclear": 0.0407,
-      "Other Fossil": 0.0203,
+      "Coal": 0.4134,
+      "Gas": 0.0728,
+      "Hydro": 0.2837,
+      "Nuclear": 0.0409,
+      "Other Fossil": 0.0202,
       "Other Renewables": 0.004,
-      "Solar": 0.0897,
-      "Wind": 0.0624
+      "Solar": 0.0886,
+      "Wind": 0.0606
     }
   },
   "AG": {
@@ -239,10 +239,10 @@
   "AL": {
     "2019": {
       "Bioenergy": 0.0088,
-      "Coal": 0.0528,
-      "Gas": 0.0821,
-      "Hydro": 0.7335,
-      "Nuclear": 0.0719,
+      "Coal": 0.0527,
+      "Gas": 0.082,
+      "Hydro": 0.7338,
+      "Nuclear": 0.0718,
       "Other Fossil": 0.0068,
       "Other Renewables": 0.0025,
       "Solar": 0.0125,
@@ -250,31 +250,31 @@
     },
     "2020": {
       "Bioenergy": 0.0093,
-      "Coal": 0.0468,
-      "Gas": 0.0798,
-      "Hydro": 0.7384,
+      "Coal": 0.0467,
+      "Gas": 0.0797,
+      "Hydro": 0.7387,
       "Nuclear": 0.0682,
       "Other Fossil": 0.0066,
       "Other Renewables": 0.0027,
-      "Solar": 0.0148,
+      "Solar": 0.0147,
       "Wind": 0.0335
     },
     "2021": {
       "Bioenergy": 0.0095,
-      "Coal": 0.049,
-      "Gas": 0.0811,
-      "Hydro": 0.7348,
-      "Nuclear": 0.0693,
+      "Coal": 0.0489,
+      "Gas": 0.081,
+      "Hydro": 0.7351,
+      "Nuclear": 0.0692,
       "Other Fossil": 0.0066,
       "Other Renewables": 0.0026,
-      "Solar": 0.0156,
-      "Wind": 0.0316
+      "Solar": 0.0155,
+      "Wind": 0.0315
     },
     "2022": {
       "Bioenergy": 0.0096,
       "Coal": 0.0523,
-      "Gas": 0.0817,
-      "Hydro": 0.7299,
+      "Gas": 0.0816,
+      "Hydro": 0.7301,
       "Nuclear": 0.0619,
       "Other Fossil": 0.0068,
       "Other Renewables": 0.0026,
@@ -285,7 +285,7 @@
       "Bioenergy": 0.0088,
       "Coal": 0.0456,
       "Gas": 0.0756,
-      "Hydro": 0.7351,
+      "Hydro": 0.7353,
       "Nuclear": 0.0631,
       "Other Fossil": 0.0064,
       "Other Renewables": 0.0026,
@@ -295,24 +295,24 @@
     "2024": {
       "Bioenergy": 0.0089,
       "Coal": 0.0413,
-      "Gas": 0.0716,
-      "Hydro": 0.7378,
-      "Nuclear": 0.0638,
+      "Gas": 0.0715,
+      "Hydro": 0.7381,
+      "Nuclear": 0.0637,
       "Other Fossil": 0.0064,
       "Other Renewables": 0.0026,
       "Solar": 0.027,
-      "Wind": 0.0406
+      "Wind": 0.0405
     },
     "2025": {
-      "Bioenergy": 0.0088,
-      "Coal": 0.0393,
-      "Gas": 0.0724,
-      "Hydro": 0.7333,
-      "Nuclear": 0.0626,
+      "Bioenergy": 0.0087,
+      "Coal": 0.0391,
+      "Gas": 0.072,
+      "Hydro": 0.7338,
+      "Nuclear": 0.063,
       "Other Fossil": 0.0063,
       "Other Renewables": 0.0026,
-      "Solar": 0.0381,
-      "Wind": 0.0367
+      "Solar": 0.0369,
+      "Wind": 0.0377
     }
   },
   "AM": {
@@ -383,15 +383,15 @@
       "Wind": 0.0012
     },
     "2025": {
-      "Bioenergy": 0,
-      "Coal": 0,
-      "Gas": 0.3461,
-      "Hydro": 0.2098,
-      "Nuclear": 0.3828,
-      "Other Fossil": 0,
-      "Other Renewables": 0,
-      "Solar": 0.0613,
-      "Wind": 0
+      "Bioenergy": 0.0005,
+      "Coal": 0.0138,
+      "Gas": 0.3155,
+      "Hydro": 0.3313,
+      "Nuclear": 0.2359,
+      "Other Fossil": 0.0002,
+      "Other Renewables": 0.0001,
+      "Solar": 0.101,
+      "Wind": 0.0018
     }
   },
   "AO": {
@@ -541,15 +541,15 @@
       "Wind": 0.1137
     },
     "2025": {
-      "Bioenergy": 0.0107,
-      "Coal": 0.0084,
-      "Gas": 0.5257,
-      "Hydro": 0.2206,
-      "Nuclear": 0.0701,
-      "Other Fossil": 0.011,
+      "Bioenergy": 0.0108,
+      "Coal": 0.022,
+      "Gas": 0.5142,
+      "Hydro": 0.2155,
+      "Nuclear": 0.0723,
+      "Other Fossil": 0.0093,
       "Other Renewables": 0.0002,
-      "Solar": 0.031,
-      "Wind": 0.1224
+      "Solar": 0.032,
+      "Wind": 0.1237
     }
   },
   "AS": {
@@ -636,7 +636,7 @@
       "Bioenergy": 0.033,
       "Coal": 0.0311,
       "Gas": 0.166,
-      "Hydro": 0.5902,
+      "Hydro": 0.5903,
       "Nuclear": 0.0175,
       "Other Fossil": 0.0168,
       "Other Renewables": 0.0006,
@@ -645,7 +645,7 @@
     },
     "2020": {
       "Bioenergy": 0.0275,
-      "Coal": 0.0153,
+      "Coal": 0.0152,
       "Gas": 0.1532,
       "Hydro": 0.6271,
       "Nuclear": 0.0143,
@@ -656,9 +656,9 @@
     },
     "2021": {
       "Bioenergy": 0.025,
-      "Coal": 0.0221,
-      "Gas": 0.1725,
-      "Hydro": 0.5786,
+      "Coal": 0.022,
+      "Gas": 0.1724,
+      "Hydro": 0.5787,
       "Nuclear": 0.0298,
       "Other Fossil": 0.0181,
       "Other Renewables": 0.0011,
@@ -668,8 +668,8 @@
     "2022": {
       "Bioenergy": 0.0403,
       "Coal": 0.0236,
-      "Gas": 0.1818,
-      "Hydro": 0.535,
+      "Gas": 0.1817,
+      "Hydro": 0.5351,
       "Nuclear": 0.0271,
       "Other Fossil": 0.0183,
       "Other Renewables": 0.0011,
@@ -680,7 +680,7 @@
       "Bioenergy": 0.0228,
       "Coal": 0.0097,
       "Gas": 0.1131,
-      "Hydro": 0.6131,
+      "Hydro": 0.6132,
       "Nuclear": 0.0122,
       "Other Fossil": 0.0171,
       "Other Renewables": 0.0005,
@@ -699,15 +699,15 @@
       "Wind": 0.1338
     },
     "2025": {
-      "Bioenergy": 0.0264,
-      "Coal": 0.0074,
-      "Gas": 0.0999,
-      "Hydro": 0.5557,
-      "Nuclear": 0.0103,
-      "Other Fossil": 0.0159,
-      "Other Renewables": 0.0004,
-      "Solar": 0.164,
-      "Wind": 0.12
+      "Bioenergy": 0.0276,
+      "Coal": 0.0085,
+      "Gas": 0.1041,
+      "Hydro": 0.548,
+      "Nuclear": 0.0122,
+      "Other Fossil": 0.0162,
+      "Other Renewables": 0.0005,
+      "Solar": 0.1604,
+      "Wind": 0.1225
     }
   },
   "AU": {
@@ -779,14 +779,14 @@
     },
     "2025": {
       "Bioenergy": 0.0017,
-      "Coal": 0.526,
-      "Gas": 0.0766,
-      "Hydro": 0.0532,
+      "Coal": 0.5203,
+      "Gas": 0.0734,
+      "Hydro": 0.0537,
       "Nuclear": 0,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.1894,
-      "Wind": 0.153
+      "Solar": 0.1953,
+      "Wind": 0.1556
     }
   },
   "AW": {
@@ -938,12 +938,12 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.8711,
-      "Hydro": 0.1014,
+      "Gas": 0.8192,
+      "Hydro": 0.1678,
       "Nuclear": 0,
-      "Other Fossil": 0.0092,
+      "Other Fossil": 0.0065,
       "Other Renewables": 0,
-      "Solar": 0.0183,
+      "Solar": 0.0065,
       "Wind": 0
     }
   },
@@ -1016,14 +1016,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.6031,
+      "Coal": 0.6051,
       "Gas": 0,
-      "Hydro": 0.3314,
+      "Hydro": 0.3288,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0513,
-      "Wind": 0.0143
+      "Solar": 0.0517,
+      "Wind": 0.0144
     }
   },
   "BB": {
@@ -1174,14 +1174,14 @@
     },
     "2025": {
       "Bioenergy": 0.0033,
-      "Coal": 0.3489,
+      "Coal": 0.3538,
       "Gas": 0.4466,
-      "Hydro": 0.0267,
+      "Hydro": 0.0269,
       "Nuclear": 0.0085,
-      "Other Fossil": 0.1225,
+      "Other Fossil": 0.118,
       "Other Renewables": 0.0008,
-      "Solar": 0.0295,
-      "Wind": 0.0131
+      "Solar": 0.0294,
+      "Wind": 0.0126
     }
   },
   "BE": {
@@ -1233,7 +1233,7 @@
       "Bioenergy": 0.0129,
       "Coal": 0.0075,
       "Gas": 0.1994,
-      "Hydro": 0.0117,
+      "Hydro": 0.0118,
       "Nuclear": 0.3934,
       "Other Fossil": 0.0994,
       "Other Renewables": 0.0005,
@@ -1244,23 +1244,23 @@
       "Bioenergy": 0.0122,
       "Coal": 0.0175,
       "Gas": 0.1672,
-      "Hydro": 0.0261,
+      "Hydro": 0.0262,
       "Nuclear": 0.3924,
       "Other Fossil": 0.095,
       "Other Renewables": 0.0011,
       "Solar": 0.1111,
-      "Wind": 0.1774
+      "Wind": 0.1773
     },
     "2025": {
-      "Bioenergy": 0.0133,
-      "Coal": 0.02,
-      "Gas": 0.1901,
-      "Hydro": 0.0283,
-      "Nuclear": 0.3284,
-      "Other Fossil": 0.0986,
+      "Bioenergy": 0.0147,
+      "Coal": 0.0199,
+      "Gas": 0.1879,
+      "Hydro": 0.0287,
+      "Nuclear": 0.3262,
+      "Other Fossil": 0.0981,
       "Other Renewables": 0.0013,
-      "Solar": 0.176,
-      "Wind": 0.1439
+      "Solar": 0.1699,
+      "Wind": 0.1531
     }
   },
   "BF": {
@@ -1410,15 +1410,15 @@
       "Wind": 0.0413
     },
     "2025": {
-      "Bioenergy": 0.0032,
-      "Coal": 0.2496,
-      "Gas": 0.0479,
-      "Hydro": 0.0739,
-      "Nuclear": 0.4032,
+      "Bioenergy": 0.0033,
+      "Coal": 0.2495,
+      "Gas": 0.0486,
+      "Hydro": 0.0695,
+      "Nuclear": 0.4081,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.1916,
-      "Wind": 0.0305
+      "Solar": 0.1896,
+      "Wind": 0.0314
     }
   },
   "BH": {
@@ -1884,15 +1884,15 @@
       "Wind": 0.0419
     },
     "2025": {
-      "Bioenergy": 0.0092,
+      "Bioenergy": 0.0093,
       "Coal": 0,
-      "Gas": 0.6295,
-      "Hydro": 0.3072,
+      "Gas": 0.6301,
+      "Hydro": 0.3063,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0299,
-      "Wind": 0.0242
+      "Solar": 0.0301,
+      "Wind": 0.0243
     }
   },
   "BR": {
@@ -1963,15 +1963,15 @@
       "Wind": 0.1533
     },
     "2025": {
-      "Bioenergy": 0.0111,
-      "Coal": 0.0129,
-      "Gas": 0.0643,
-      "Hydro": 0.5938,
-      "Nuclear": 0.0219,
-      "Other Fossil": 0.0093,
+      "Bioenergy": 0.0107,
+      "Coal": 0.0128,
+      "Gas": 0.063,
+      "Hydro": 0.5932,
+      "Nuclear": 0.0218,
+      "Other Fossil": 0.0102,
       "Other Renewables": 0,
-      "Solar": 0.1237,
-      "Wind": 0.163
+      "Solar": 0.1244,
+      "Wind": 0.164
     }
   },
   "BS": {
@@ -2272,22 +2272,22 @@
       "Coal": 0.0012,
       "Gas": 0.5339,
       "Hydro": 0.0125,
-      "Nuclear": 0.3625,
+      "Nuclear": 0.3624,
       "Other Fossil": 0.0686,
       "Other Renewables": 0.0001,
       "Solar": 0.0063,
       "Wind": 0.0051
     },
     "2025": {
-      "Bioenergy": 0.0154,
+      "Bioenergy": 0.0175,
       "Coal": 0.0001,
-      "Gas": 0.5814,
-      "Hydro": 0.0104,
-      "Nuclear": 0.3139,
-      "Other Fossil": 0.071,
+      "Gas": 0.4562,
+      "Hydro": 0.016,
+      "Nuclear": 0.4257,
+      "Other Fossil": 0.0713,
       "Other Renewables": 0,
-      "Solar": 0.0026,
-      "Wind": 0.0052
+      "Solar": 0.0067,
+      "Wind": 0.0065
     }
   },
   "BZ": {
@@ -2358,15 +2358,15 @@
       "Wind": 0.0412
     },
     "2025": {
-      "Bioenergy": 0.1705,
-      "Coal": 0.0169,
-      "Gas": 0.1036,
-      "Hydro": 0.5099,
-      "Nuclear": 0.0085,
-      "Other Fossil": 0.1,
+      "Bioenergy": 0.1707,
+      "Coal": 0.0173,
+      "Gas": 0.1042,
+      "Hydro": 0.508,
+      "Nuclear": 0.0087,
+      "Other Fossil": 0.1003,
       "Other Renewables": 0.0022,
-      "Solar": 0.0448,
-      "Wind": 0.0436
+      "Solar": 0.0452,
+      "Wind": 0.0435
     }
   },
   "CA": {
@@ -2437,15 +2437,15 @@
       "Wind": 0.0757
     },
     "2025": {
-      "Bioenergy": 0.0161,
-      "Coal": 0.0362,
-      "Gas": 0.1479,
-      "Hydro": 0.5577,
-      "Nuclear": 0.1404,
-      "Other Fossil": 0.008,
+      "Bioenergy": 0.0173,
+      "Coal": 0.0387,
+      "Gas": 0.158,
+      "Hydro": 0.5565,
+      "Nuclear": 0.1347,
+      "Other Fossil": 0.0084,
       "Other Renewables": 0.0006,
-      "Solar": 0.0117,
-      "Wind": 0.0814
+      "Solar": 0.0113,
+      "Wind": 0.0745
     }
   },
   "CD": {
@@ -2712,7 +2712,7 @@
       "Bioenergy": 0.0031,
       "Coal": 0.0168,
       "Gas": 0.0273,
-      "Hydro": 0.5548,
+      "Hydro": 0.5549,
       "Nuclear": 0.2849,
       "Other Fossil": 0.0556,
       "Other Renewables": 0.0008,
@@ -2754,13 +2754,13 @@
     },
     "2025": {
       "Bioenergy": 0.0013,
-      "Coal": 0.0066,
+      "Coal": 0.0067,
       "Gas": 0.0121,
-      "Hydro": 0.5193,
-      "Nuclear": 0.2681,
-      "Other Fossil": 0.0489,
+      "Hydro": 0.5232,
+      "Nuclear": 0.2692,
+      "Other Fossil": 0.049,
       "Other Renewables": 0.0004,
-      "Solar": 0.1354,
+      "Solar": 0.1303,
       "Wind": 0.0079
     }
   },
@@ -2991,14 +2991,14 @@
     },
     "2025": {
       "Bioenergy": 0.025,
-      "Coal": 0.1803,
-      "Gas": 0.1819,
-      "Hydro": 0.2422,
+      "Coal": 0.1813,
+      "Gas": 0.1742,
+      "Hydro": 0.2426,
       "Nuclear": 0,
-      "Other Fossil": 0.0156,
+      "Other Fossil": 0.0157,
       "Other Renewables": 0.0014,
-      "Solar": 0.2138,
-      "Wind": 0.1397
+      "Solar": 0.2197,
+      "Wind": 0.1402
     }
   },
   "CM": {
@@ -3230,7 +3230,7 @@
       "Bioenergy": 0.0001,
       "Coal": 0.0387,
       "Gas": 0.0746,
-      "Hydro": 0.8246,
+      "Hydro": 0.8245,
       "Nuclear": 0.0002,
       "Other Fossil": 0.0074,
       "Other Renewables": 0.0001,
@@ -3306,15 +3306,15 @@
       "Wind": 0.0981
     },
     "2025": {
-      "Bioenergy": 0.004,
-      "Coal": 0.0003,
-      "Gas": 0.0021,
-      "Hydro": 0.7476,
-      "Nuclear": 0.0002,
-      "Other Fossil": 0.0139,
-      "Other Renewables": 0.106,
-      "Solar": 0.0008,
-      "Wind": 0.1251
+      "Bioenergy": 0.0041,
+      "Coal": 0.0005,
+      "Gas": 0.0029,
+      "Hydro": 0.7452,
+      "Nuclear": 0.0003,
+      "Other Fossil": 0.0162,
+      "Other Renewables": 0.1087,
+      "Solar": 0.0011,
+      "Wind": 0.121
     }
   },
   "CU": {
@@ -3622,15 +3622,15 @@
       "Wind": 0.0103
     },
     "2025": {
-      "Bioenergy": 0.0416,
-      "Coal": 0.3146,
-      "Gas": 0.0549,
-      "Hydro": 0.0243,
-      "Nuclear": 0.4295,
-      "Other Fossil": 0.0092,
-      "Other Renewables": 0.0327,
-      "Solar": 0.0854,
-      "Wind": 0.0077
+      "Bioenergy": 0.0419,
+      "Coal": 0.3188,
+      "Gas": 0.0537,
+      "Hydro": 0.0247,
+      "Nuclear": 0.4277,
+      "Other Fossil": 0.0093,
+      "Other Renewables": 0.0329,
+      "Solar": 0.0828,
+      "Wind": 0.0082
     }
   },
   "DE": {
@@ -3682,7 +3682,7 @@
       "Bioenergy": 0.0847,
       "Coal": 0.2471,
       "Gas": 0.1482,
-      "Hydro": 0.0463,
+      "Hydro": 0.0464,
       "Nuclear": 0.0218,
       "Other Fossil": 0.0399,
       "Other Renewables": 0.0092,
@@ -3701,15 +3701,15 @@
       "Wind": 0.2822
     },
     "2025": {
-      "Bioenergy": 0.0838,
-      "Coal": 0.1929,
-      "Gas": 0.166,
-      "Hydro": 0.0478,
-      "Nuclear": 0.0093,
-      "Other Fossil": 0.036,
-      "Other Renewables": 0.0081,
-      "Solar": 0.2269,
-      "Wind": 0.2293
+      "Bioenergy": 0.0833,
+      "Coal": 0.1932,
+      "Gas": 0.1684,
+      "Hydro": 0.046,
+      "Nuclear": 0.0085,
+      "Other Fossil": 0.0357,
+      "Other Renewables": 0.0079,
+      "Solar": 0.2154,
+      "Wind": 0.2417
     }
   },
   "DJ": {
@@ -3795,8 +3795,8 @@
     "2019": {
       "Bioenergy": 0.1107,
       "Coal": 0.1377,
-      "Gas": 0.1218,
-      "Hydro": 0.0314,
+      "Gas": 0.1217,
+      "Hydro": 0.0316,
       "Nuclear": 0.0408,
       "Other Fossil": 0.049,
       "Other Renewables": 0.0014,
@@ -3805,20 +3805,20 @@
     },
     "2020": {
       "Bioenergy": 0.0921,
-      "Coal": 0.14,
-      "Gas": 0.1052,
-      "Hydro": 0.0396,
+      "Coal": 0.1399,
+      "Gas": 0.1051,
+      "Hydro": 0.0398,
       "Nuclear": 0.045,
       "Other Fossil": 0.0479,
       "Other Renewables": 0.0018,
       "Solar": 0.0455,
-      "Wind": 0.4829
+      "Wind": 0.4828
     },
     "2021": {
       "Bioenergy": 0.1338,
-      "Coal": 0.175,
+      "Coal": 0.1749,
       "Gas": 0.1021,
-      "Hydro": 0.0234,
+      "Hydro": 0.0235,
       "Nuclear": 0.0285,
       "Other Fossil": 0.0508,
       "Other Renewables": 0.0011,
@@ -3840,18 +3840,18 @@
       "Bioenergy": 0.1058,
       "Coal": 0.1049,
       "Gas": 0.0767,
-      "Hydro": 0.0176,
+      "Hydro": 0.0177,
       "Nuclear": 0.0199,
       "Other Fossil": 0.0358,
       "Other Renewables": 0.0008,
       "Solar": 0.0916,
-      "Wind": 0.5468
+      "Wind": 0.5467
     },
     "2024": {
       "Bioenergy": 0.1064,
       "Coal": 0.0985,
       "Gas": 0.0711,
-      "Hydro": 0.019,
+      "Hydro": 0.0192,
       "Nuclear": 0.0215,
       "Other Fossil": 0.0339,
       "Other Renewables": 0.0009,
@@ -3859,15 +3859,15 @@
       "Wind": 0.5433
     },
     "2025": {
-      "Bioenergy": 0.0824,
-      "Coal": 0.0833,
-      "Gas": 0.0891,
-      "Hydro": 0.0355,
-      "Nuclear": 0.042,
-      "Other Fossil": 0.0372,
+      "Bioenergy": 0.0864,
+      "Coal": 0.0814,
+      "Gas": 0.0864,
+      "Hydro": 0.0341,
+      "Nuclear": 0.0401,
+      "Other Fossil": 0.0369,
       "Other Renewables": 0.0017,
-      "Solar": 0.1657,
-      "Wind": 0.4632
+      "Solar": 0.1584,
+      "Wind": 0.4748
     }
   },
   "DM": {
@@ -4189,10 +4189,10 @@
   "EE": {
     "2019": {
       "Bioenergy": 0.0784,
-      "Coal": 0.0467,
-      "Gas": 0.074,
-      "Hydro": 0.0487,
-      "Nuclear": 0.0644,
+      "Coal": 0.0466,
+      "Gas": 0.0739,
+      "Hydro": 0.049,
+      "Nuclear": 0.0643,
       "Other Fossil": 0.5626,
       "Other Renewables": 0.0035,
       "Solar": 0.0093,
@@ -4200,21 +4200,21 @@
     },
     "2020": {
       "Bioenergy": 0.0843,
-      "Coal": 0.0664,
-      "Gas": 0.1129,
-      "Hydro": 0.0822,
-      "Nuclear": 0.0982,
-      "Other Fossil": 0.3606,
+      "Coal": 0.0663,
+      "Gas": 0.1128,
+      "Hydro": 0.0826,
+      "Nuclear": 0.0981,
+      "Other Fossil": 0.3605,
       "Other Renewables": 0.0038,
-      "Solar": 0.0311,
+      "Solar": 0.031,
       "Wind": 0.1606
     },
     "2021": {
       "Bioenergy": 0.065,
       "Coal": 0.0466,
-      "Gas": 0.0786,
-      "Hydro": 0.0537,
-      "Nuclear": 0.0673,
+      "Gas": 0.0785,
+      "Hydro": 0.054,
+      "Nuclear": 0.0672,
       "Other Fossil": 0.5134,
       "Other Renewables": 0.0025,
       "Solar": 0.049,
@@ -4223,7 +4223,7 @@
     "2022": {
       "Bioenergy": 0.095,
       "Coal": 0.0218,
-      "Gas": 0.0356,
+      "Gas": 0.0355,
       "Hydro": 0.0199,
       "Nuclear": 0.0267,
       "Other Fossil": 0.6251,
@@ -4233,36 +4233,36 @@
     },
     "2023": {
       "Bioenergy": 0.0749,
-      "Coal": 0.0604,
-      "Gas": 0.0993,
-      "Hydro": 0.0703,
-      "Nuclear": 0.0824,
+      "Coal": 0.0603,
+      "Gas": 0.0992,
+      "Hydro": 0.0706,
+      "Nuclear": 0.0823,
       "Other Fossil": 0.3374,
       "Other Renewables": 0.0034,
       "Solar": 0.1165,
-      "Wind": 0.1554
+      "Wind": 0.1553
     },
     "2024": {
       "Bioenergy": 0.0673,
-      "Coal": 0.0497,
-      "Gas": 0.0864,
-      "Hydro": 0.0654,
-      "Nuclear": 0.0749,
+      "Coal": 0.0496,
+      "Gas": 0.0863,
+      "Hydro": 0.0658,
+      "Nuclear": 0.0748,
       "Other Fossil": 0.3034,
       "Other Renewables": 0.003,
       "Solar": 0.1482,
-      "Wind": 0.2017
+      "Wind": 0.2016
     },
     "2025": {
-      "Bioenergy": 0.0652,
-      "Coal": 0.0464,
-      "Gas": 0.0854,
-      "Hydro": 0.06,
-      "Nuclear": 0.0729,
-      "Other Fossil": 0.2489,
-      "Other Renewables": 0.003,
-      "Solar": 0.2195,
-      "Wind": 0.1988
+      "Bioenergy": 0.0648,
+      "Coal": 0.0449,
+      "Gas": 0.0829,
+      "Hydro": 0.059,
+      "Nuclear": 0.0715,
+      "Other Fossil": 0.2588,
+      "Other Renewables": 0.0029,
+      "Solar": 0.211,
+      "Wind": 0.2042
     }
   },
   "EG": {
@@ -4428,9 +4428,9 @@
       "Bioenergy": 0.0123,
       "Coal": 0.0485,
       "Gas": 0.311,
-      "Hydro": 0.1099,
+      "Hydro": 0.11,
       "Nuclear": 0.2272,
-      "Other Fossil": 0.0206,
+      "Other Fossil": 0.0205,
       "Other Renewables": 0.0037,
       "Solar": 0.0578,
       "Wind": 0.209
@@ -4450,7 +4450,7 @@
       "Bioenergy": 0.017,
       "Coal": 0.0227,
       "Gas": 0.2484,
-      "Hydro": 0.1332,
+      "Hydro": 0.1333,
       "Nuclear": 0.2198,
       "Other Fossil": 0.0173,
       "Other Renewables": 0.0036,
@@ -4492,14 +4492,14 @@
     },
     "2025": {
       "Bioenergy": 0.0142,
-      "Coal": 0.0063,
-      "Gas": 0.1868,
-      "Hydro": 0.1236,
-      "Nuclear": 0.2057,
-      "Other Fossil": 0.0071,
+      "Coal": 0.0064,
+      "Gas": 0.1864,
+      "Hydro": 0.1244,
+      "Nuclear": 0.2048,
+      "Other Fossil": 0.0072,
       "Other Renewables": 0.0023,
-      "Solar": 0.254,
-      "Wind": 0.2001
+      "Solar": 0.2507,
+      "Wind": 0.2035
     }
   },
   "ET": {
@@ -4584,42 +4584,42 @@
   "FI": {
     "2019": {
       "Bioenergy": 0.1463,
-      "Coal": 0.092,
-      "Gas": 0.1047,
-      "Hydro": 0.1815,
+      "Coal": 0.0919,
+      "Gas": 0.1046,
+      "Hydro": 0.1817,
       "Nuclear": 0.3152,
       "Other Fossil": 0.0607,
       "Other Renewables": 0.0044,
-      "Solar": 0.0089,
+      "Solar": 0.0088,
       "Wind": 0.0864
     },
     "2020": {
       "Bioenergy": 0.1273,
       "Coal": 0.0641,
       "Gas": 0.0957,
-      "Hydro": 0.2286,
+      "Hydro": 0.2287,
       "Nuclear": 0.3136,
       "Other Fossil": 0.0477,
       "Other Renewables": 0.0041,
-      "Solar": 0.0108,
+      "Solar": 0.0107,
       "Wind": 0.1081
     },
     "2021": {
       "Bioenergy": 0.1416,
       "Coal": 0.0709,
       "Gas": 0.0924,
-      "Hydro": 0.2131,
+      "Hydro": 0.2133,
       "Nuclear": 0.3015,
       "Other Fossil": 0.055,
       "Other Renewables": 0.0032,
       "Solar": 0.0122,
-      "Wind": 0.11
+      "Wind": 0.1099
     },
     "2022": {
       "Bioenergy": 0.1519,
       "Coal": 0.0702,
       "Gas": 0.0512,
-      "Hydro": 0.1864,
+      "Hydro": 0.1865,
       "Nuclear": 0.3193,
       "Other Fossil": 0.0567,
       "Other Renewables": 0.0013,
@@ -4650,14 +4650,14 @@
     },
     "2025": {
       "Bioenergy": 0.1104,
-      "Coal": 0.0162,
-      "Gas": 0.0276,
-      "Hydro": 0.1646,
-      "Nuclear": 0.3754,
-      "Other Fossil": 0.0388,
-      "Other Renewables": 0.0027,
-      "Solar": 0.0294,
-      "Wind": 0.2347
+      "Coal": 0.0156,
+      "Gas": 0.0277,
+      "Hydro": 0.1652,
+      "Nuclear": 0.3683,
+      "Other Fossil": 0.0396,
+      "Other Renewables": 0.003,
+      "Solar": 0.0277,
+      "Wind": 0.2424
     }
   },
   "FJ": {
@@ -4935,8 +4935,8 @@
       "Bioenergy": 0.0092,
       "Coal": 0.014,
       "Gas": 0.1059,
-      "Hydro": 0.1027,
-      "Nuclear": 0.6301,
+      "Hydro": 0.1028,
+      "Nuclear": 0.63,
       "Other Fossil": 0.0082,
       "Other Renewables": 0.0003,
       "Solar": 0.0427,
@@ -4965,15 +4965,15 @@
       "Wind": 0.0895
     },
     "2025": {
-      "Bioenergy": 0.0054,
+      "Bioenergy": 0.0053,
       "Coal": 0.0018,
-      "Gas": 0.0312,
-      "Hydro": 0.1001,
-      "Nuclear": 0.7032,
-      "Other Fossil": 0.0079,
+      "Gas": 0.0301,
+      "Hydro": 0.1003,
+      "Nuclear": 0.7036,
+      "Other Fossil": 0.0078,
       "Other Renewables": 0,
-      "Solar": 0.0681,
-      "Wind": 0.0824
+      "Solar": 0.0657,
+      "Wind": 0.0853
     }
   },
   "GA": {
@@ -5058,7 +5058,7 @@
   "GB": {
     "2019": {
       "Bioenergy": 0.0617,
-      "Coal": 0.0329,
+      "Coal": 0.0328,
       "Gas": 0.4161,
       "Hydro": 0.0247,
       "Nuclear": 0.1996,
@@ -5071,7 +5071,7 @@
       "Bioenergy": 0.0677,
       "Coal": 0.0259,
       "Gas": 0.3646,
-      "Hydro": 0.0279,
+      "Hydro": 0.028,
       "Nuclear": 0.188,
       "Other Fossil": 0.0068,
       "Other Renewables": 0.0006,
@@ -5082,9 +5082,9 @@
       "Bioenergy": 0.0713,
       "Coal": 0.0316,
       "Gas": 0.4095,
-      "Hydro": 0.0271,
+      "Hydro": 0.0272,
       "Nuclear": 0.1762,
-      "Other Fossil": 0.0085,
+      "Other Fossil": 0.0084,
       "Other Renewables": 0.0007,
       "Solar": 0.0443,
       "Wind": 0.2307
@@ -5113,9 +5113,9 @@
     },
     "2024": {
       "Bioenergy": 0.0742,
-      "Coal": 0.0221,
+      "Coal": 0.022,
       "Gas": 0.3011,
-      "Hydro": 0.0364,
+      "Hydro": 0.0365,
       "Nuclear": 0.1692,
       "Other Fossil": 0.0151,
       "Other Renewables": 0.001,
@@ -5123,15 +5123,15 @@
       "Wind": 0.3184
     },
     "2025": {
-      "Bioenergy": 0.0775,
-      "Coal": 0.015,
-      "Gas": 0.3148,
-      "Hydro": 0.0305,
-      "Nuclear": 0.1583,
+      "Bioenergy": 0.0766,
+      "Coal": 0.0144,
+      "Gas": 0.3107,
+      "Hydro": 0.0302,
+      "Nuclear": 0.1554,
       "Other Fossil": 0.0194,
-      "Other Renewables": 0.001,
-      "Solar": 0.098,
-      "Wind": 0.2855
+      "Other Renewables": 0.0009,
+      "Solar": 0.0939,
+      "Wind": 0.2985
     }
   },
   "GD": {
@@ -5281,15 +5281,15 @@
       "Wind": 0.0136
     },
     "2025": {
-      "Bioenergy": 0.0019,
-      "Coal": 0.0468,
-      "Gas": 0.1104,
-      "Hydro": 0.8125,
-      "Nuclear": 0.0048,
-      "Other Fossil": 0.0005,
+      "Bioenergy": 0.0023,
+      "Coal": 0.0559,
+      "Gas": 0.1581,
+      "Hydro": 0.7515,
+      "Nuclear": 0.0057,
+      "Other Fossil": 0.0006,
       "Other Renewables": 0.0005,
-      "Solar": 0.0074,
-      "Wind": 0.0152
+      "Solar": 0.0092,
+      "Wind": 0.0162
     }
   },
   "GF": {
@@ -5928,8 +5928,8 @@
     "2019": {
       "Bioenergy": 0.0055,
       "Coal": 0.2449,
-      "Gas": 0.3951,
-      "Hydro": 0.0916,
+      "Gas": 0.395,
+      "Hydro": 0.0918,
       "Nuclear": 0.045,
       "Other Fossil": 0.0042,
       "Other Renewables": 0.0016,
@@ -5938,20 +5938,20 @@
     },
     "2020": {
       "Bioenergy": 0.0055,
-      "Coal": 0.1502,
-      "Gas": 0.4453,
-      "Hydro": 0.0858,
-      "Nuclear": 0.0402,
+      "Coal": 0.1501,
+      "Gas": 0.4452,
+      "Hydro": 0.086,
+      "Nuclear": 0.0401,
       "Other Fossil": 0.0039,
       "Other Renewables": 0.0016,
-      "Solar": 0.0911,
-      "Wind": 0.1767
+      "Solar": 0.091,
+      "Wind": 0.1766
     },
     "2021": {
       "Bioenergy": 0.0024,
       "Coal": 0.1223,
       "Gas": 0.4655,
-      "Hydro": 0.1067,
+      "Hydro": 0.1068,
       "Nuclear": 0.0178,
       "Other Fossil": 0.0017,
       "Other Renewables": 0.0007,
@@ -5963,7 +5963,7 @@
       "Coal": 0.1324,
       "Gas": 0.4241,
       "Hydro": 0.0858,
-      "Nuclear": 0.0186,
+      "Nuclear": 0.0185,
       "Other Fossil": 0.002,
       "Other Renewables": 0.0008,
       "Solar": 0.1233,
@@ -5978,12 +5978,12 @@
       "Other Fossil": 0.0023,
       "Other Renewables": 0.0009,
       "Solar": 0.1783,
-      "Wind": 0.2195
+      "Wind": 0.2194
     },
     "2024": {
       "Bioenergy": 0.0007,
       "Coal": 0.0675,
-      "Gas": 0.4221,
+      "Gas": 0.422,
       "Hydro": 0.0576,
       "Nuclear": 0.0053,
       "Other Fossil": 0.0005,
@@ -5993,14 +5993,14 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0492,
-      "Gas": 0.4094,
+      "Coal": 0.0509,
+      "Gas": 0.4127,
       "Hydro": 0.0489,
-      "Nuclear": 0.0028,
+      "Nuclear": 0.0029,
       "Other Fossil": 0.0003,
       "Other Renewables": 0.0001,
-      "Solar": 0.289,
-      "Wind": 0.1998
+      "Solar": 0.2852,
+      "Wind": 0.1985
     }
   },
   "GT": {
@@ -6383,19 +6383,19 @@
       "Nuclear": 0.0131,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.0013,
-      "Solar": 0.0197,
+      "Solar": 0.0198,
       "Wind": 0.0185
     },
     "2025": {
       "Bioenergy": 0.008,
-      "Coal": 0.5568,
+      "Coal": 0.5575,
       "Gas": 0.3388,
-      "Hydro": 0.0299,
+      "Hydro": 0.03,
       "Nuclear": 0.0133,
-      "Other Fossil": 0.0052,
+      "Other Fossil": 0.0051,
       "Other Renewables": 0.0013,
-      "Solar": 0.0265,
-      "Wind": 0.0203
+      "Solar": 0.0262,
+      "Wind": 0.0197
     }
   },
   "HN": {
@@ -6469,21 +6469,21 @@
       "Bioenergy": 0.1282,
       "Coal": 0.0053,
       "Gas": 0.0054,
-      "Hydro": 0.2229,
-      "Nuclear": 0.0004,
+      "Hydro": 0.2228,
+      "Nuclear": 0.0005,
       "Other Fossil": 0.4371,
       "Other Renewables": 0.0264,
-      "Solar": 0.0999,
-      "Wind": 0.0742
+      "Solar": 0.1,
+      "Wind": 0.0741
     }
   },
   "HR": {
     "2019": {
-      "Bioenergy": 0.0341,
+      "Bioenergy": 0.034,
       "Coal": 0.1432,
-      "Gas": 0.2138,
-      "Hydro": 0.3586,
-      "Nuclear": 0.0802,
+      "Gas": 0.2137,
+      "Hydro": 0.3588,
+      "Nuclear": 0.0801,
       "Other Fossil": 0.0103,
       "Other Renewables": 0.0289,
       "Solar": 0.0173,
@@ -6491,10 +6491,10 @@
     },
     "2020": {
       "Bioenergy": 0.0377,
-      "Coal": 0.1104,
-      "Gas": 0.253,
-      "Hydro": 0.3433,
-      "Nuclear": 0.0647,
+      "Coal": 0.1103,
+      "Gas": 0.2529,
+      "Hydro": 0.3436,
+      "Nuclear": 0.0646,
       "Other Fossil": 0.0087,
       "Other Renewables": 0.0314,
       "Solar": 0.0181,
@@ -6502,20 +6502,20 @@
     },
     "2021": {
       "Bioenergy": 0.0403,
-      "Coal": 0.1126,
-      "Gas": 0.2098,
-      "Hydro": 0.3909,
-      "Nuclear": 0.0548,
+      "Coal": 0.1125,
+      "Gas": 0.2097,
+      "Hydro": 0.3912,
+      "Nuclear": 0.0547,
       "Other Fossil": 0.0074,
       "Other Renewables": 0.0288,
-      "Solar": 0.0175,
+      "Solar": 0.0174,
       "Wind": 0.1379
     },
     "2022": {
       "Bioenergy": 0.0448,
-      "Coal": 0.1276,
+      "Coal": 0.1275,
       "Gas": 0.254,
-      "Hydro": 0.297,
+      "Hydro": 0.2972,
       "Nuclear": 0.057,
       "Other Fossil": 0.0074,
       "Other Renewables": 0.0249,
@@ -6526,34 +6526,34 @@
       "Bioenergy": 0.0378,
       "Coal": 0.0878,
       "Gas": 0.224,
-      "Hydro": 0.406,
+      "Hydro": 0.4062,
       "Nuclear": 0.0293,
       "Other Fossil": 0.0089,
       "Other Renewables": 0.0156,
       "Solar": 0.0327,
-      "Wind": 0.1578
+      "Wind": 0.1577
     },
     "2024": {
       "Bioenergy": 0.0399,
       "Coal": 0.0736,
-      "Gas": 0.2145,
-      "Hydro": 0.3469,
-      "Nuclear": 0.0541,
+      "Gas": 0.2144,
+      "Hydro": 0.3473,
+      "Nuclear": 0.054,
       "Other Fossil": 0.0098,
       "Other Renewables": 0.0168,
-      "Solar": 0.0708,
-      "Wind": 0.1736
+      "Solar": 0.0707,
+      "Wind": 0.1735
     },
     "2025": {
-      "Bioenergy": 0.0396,
-      "Coal": 0.0556,
-      "Gas": 0.1876,
-      "Hydro": 0.3093,
-      "Nuclear": 0.0631,
-      "Other Fossil": 0.0091,
-      "Other Renewables": 0.0166,
-      "Solar": 0.1202,
-      "Wind": 0.1988
+      "Bioenergy": 0.0402,
+      "Coal": 0.0606,
+      "Gas": 0.1867,
+      "Hydro": 0.3078,
+      "Nuclear": 0.0649,
+      "Other Fossil": 0.0093,
+      "Other Renewables": 0.0169,
+      "Solar": 0.1177,
+      "Wind": 0.1958
     }
   },
   "HT": {
@@ -6639,20 +6639,20 @@
     "2019": {
       "Bioenergy": 0.0301,
       "Coal": 0.1401,
-      "Gas": 0.2463,
-      "Hydro": 0.0532,
-      "Nuclear": 0.415,
+      "Gas": 0.2462,
+      "Hydro": 0.0534,
+      "Nuclear": 0.4149,
       "Other Fossil": 0.0258,
       "Other Renewables": 0.005,
       "Solar": 0.0417,
-      "Wind": 0.0428
+      "Wind": 0.0427
     },
     "2020": {
       "Bioenergy": 0.0311,
-      "Coal": 0.126,
-      "Gas": 0.2511,
-      "Hydro": 0.0536,
-      "Nuclear": 0.4032,
+      "Coal": 0.1259,
+      "Gas": 0.251,
+      "Hydro": 0.0538,
+      "Nuclear": 0.4031,
       "Other Fossil": 0.0216,
       "Other Renewables": 0.005,
       "Solar": 0.065,
@@ -6660,10 +6660,10 @@
     },
     "2021": {
       "Bioenergy": 0.0325,
-      "Coal": 0.1087,
-      "Gas": 0.2574,
-      "Hydro": 0.0508,
-      "Nuclear": 0.3865,
+      "Coal": 0.1086,
+      "Gas": 0.2573,
+      "Hydro": 0.0511,
+      "Nuclear": 0.3864,
       "Other Fossil": 0.0224,
       "Other Renewables": 0.0048,
       "Solar": 0.0948,
@@ -6673,7 +6673,7 @@
       "Bioenergy": 0.0333,
       "Coal": 0.109,
       "Gas": 0.2424,
-      "Hydro": 0.0448,
+      "Hydro": 0.0449,
       "Nuclear": 0.3817,
       "Other Fossil": 0.0218,
       "Other Renewables": 0.0049,
@@ -6683,19 +6683,19 @@
     "2023": {
       "Bioenergy": 0.024,
       "Coal": 0.0979,
-      "Gas": 0.2078,
-      "Hydro": 0.0474,
-      "Nuclear": 0.3887,
+      "Gas": 0.2077,
+      "Hydro": 0.0476,
+      "Nuclear": 0.3886,
       "Other Fossil": 0.0193,
       "Other Renewables": 0.0032,
-      "Solar": 0.1648,
+      "Solar": 0.1647,
       "Wind": 0.047
     },
     "2024": {
       "Bioenergy": 0.0264,
       "Coal": 0.0873,
       "Gas": 0.1911,
-      "Hydro": 0.0454,
+      "Hydro": 0.0456,
       "Nuclear": 0.3709,
       "Other Fossil": 0.0178,
       "Other Renewables": 0.0044,
@@ -6703,15 +6703,15 @@
       "Wind": 0.0449
     },
     "2025": {
-      "Bioenergy": 0.0356,
-      "Coal": 0.0553,
-      "Gas": 0.1691,
-      "Hydro": 0.0316,
-      "Nuclear": 0.3488,
+      "Bioenergy": 0.0353,
+      "Coal": 0.0562,
+      "Gas": 0.1726,
+      "Hydro": 0.0327,
+      "Nuclear": 0.3599,
       "Other Fossil": 0.0157,
       "Other Renewables": 0.0039,
-      "Solar": 0.3078,
-      "Wind": 0.0322
+      "Solar": 0.2907,
+      "Wind": 0.033
     }
   },
   "ID": {
@@ -6797,8 +6797,8 @@
     "2019": {
       "Bioenergy": 0.0089,
       "Coal": 0.0362,
-      "Gas": 0.4792,
-      "Hydro": 0.0454,
+      "Gas": 0.4791,
+      "Hydro": 0.0455,
       "Nuclear": 0.0256,
       "Other Fossil": 0.0867,
       "Other Renewables": 0.0009,
@@ -6808,8 +6808,8 @@
     "2020": {
       "Bioenergy": 0.0076,
       "Coal": 0.0381,
-      "Gas": 0.4697,
-      "Hydro": 0.0466,
+      "Gas": 0.4696,
+      "Hydro": 0.0467,
       "Nuclear": 0.0233,
       "Other Fossil": 0.0607,
       "Other Renewables": 0.0009,
@@ -6820,7 +6820,7 @@
       "Bioenergy": 0.0066,
       "Coal": 0.0992,
       "Gas": 0.4477,
-      "Hydro": 0.0397,
+      "Hydro": 0.0398,
       "Nuclear": 0.0219,
       "Other Fossil": 0.0757,
       "Other Renewables": 0.0008,
@@ -6829,9 +6829,9 @@
     },
     "2022": {
       "Bioenergy": 0.006,
-      "Coal": 0.0868,
+      "Coal": 0.0867,
       "Gas": 0.4646,
-      "Hydro": 0.0324,
+      "Hydro": 0.0325,
       "Nuclear": 0.0163,
       "Other Fossil": 0.0583,
       "Other Renewables": 0.0007,
@@ -6841,8 +6841,8 @@
     "2023": {
       "Bioenergy": 0.0069,
       "Coal": 0.0537,
-      "Gas": 0.4505,
-      "Hydro": 0.0484,
+      "Gas": 0.4504,
+      "Hydro": 0.0485,
       "Nuclear": 0.0245,
       "Other Fossil": 0.0359,
       "Other Renewables": 0.001,
@@ -6853,8 +6853,8 @@
       "Bioenergy": 0.0079,
       "Coal": 0.0481,
       "Gas": 0.4402,
-      "Hydro": 0.0499,
-      "Nuclear": 0.0318,
+      "Hydro": 0.0501,
+      "Nuclear": 0.0317,
       "Other Fossil": 0.0387,
       "Other Renewables": 0.0013,
       "Solar": 0.0333,
@@ -6862,14 +6862,14 @@
     },
     "2025": {
       "Bioenergy": 0.0086,
-      "Coal": 0.0403,
-      "Gas": 0.4504,
-      "Hydro": 0.0453,
-      "Nuclear": 0.0375,
+      "Coal": 0.0401,
+      "Gas": 0.4502,
+      "Hydro": 0.0456,
+      "Nuclear": 0.0377,
       "Other Fossil": 0.0365,
       "Other Renewables": 0.0015,
-      "Solar": 0.062,
-      "Wind": 0.3177
+      "Solar": 0.0614,
+      "Wind": 0.3183
     }
   },
   "IL": {
@@ -7019,15 +7019,15 @@
       "Wind": 0.0452
     },
     "2025": {
-      "Bioenergy": 0.0081,
-      "Coal": 0.6933,
-      "Gas": 0.015,
-      "Hydro": 0.0965,
-      "Nuclear": 0.0294,
+      "Bioenergy": 0.0068,
+      "Coal": 0.6969,
+      "Gas": 0.0145,
+      "Hydro": 0.1,
+      "Nuclear": 0.029,
       "Other Fossil": 0.0002,
       "Other Renewables": 0.0016,
-      "Solar": 0.0853,
-      "Wind": 0.0705
+      "Solar": 0.0867,
+      "Wind": 0.0643
     }
   },
   "IQ": {
@@ -7269,81 +7269,81 @@
   },
   "IT": {
     "2019": {
-      "Bioenergy": 0.0612,
-      "Coal": 0.0753,
-      "Gas": 0.4794,
-      "Hydro": 0.1571,
-      "Nuclear": 0.0278,
-      "Other Fossil": 0.0256,
-      "Other Renewables": 0.0193,
-      "Solar": 0.0787,
-      "Wind": 0.0757
+      "Bioenergy": 0.0602,
+      "Coal": 0.074,
+      "Gas": 0.4717,
+      "Hydro": 0.1706,
+      "Nuclear": 0.0274,
+      "Other Fossil": 0.0252,
+      "Other Renewables": 0.0189,
+      "Solar": 0.0775,
+      "Wind": 0.0745
     },
     "2020": {
-      "Bioenergy": 0.0654,
-      "Coal": 0.0594,
-      "Gas": 0.4674,
-      "Hydro": 0.1702,
-      "Nuclear": 0.0241,
-      "Other Fossil": 0.0281,
-      "Other Renewables": 0.0204,
-      "Solar": 0.0881,
-      "Wind": 0.0768
+      "Bioenergy": 0.0643,
+      "Coal": 0.0584,
+      "Gas": 0.4591,
+      "Hydro": 0.185,
+      "Nuclear": 0.0236,
+      "Other Fossil": 0.0276,
+      "Other Renewables": 0.02,
+      "Solar": 0.0866,
+      "Wind": 0.0754
     },
     "2021": {
-      "Bioenergy": 0.0615,
-      "Coal": 0.0646,
-      "Gas": 0.4753,
-      "Hydro": 0.1583,
-      "Nuclear": 0.0307,
-      "Other Fossil": 0.022,
-      "Other Renewables": 0.0193,
-      "Solar": 0.0866,
-      "Wind": 0.0817
+      "Bioenergy": 0.0603,
+      "Coal": 0.0634,
+      "Gas": 0.4662,
+      "Hydro": 0.1744,
+      "Nuclear": 0.0301,
+      "Other Fossil": 0.0216,
+      "Other Renewables": 0.0189,
+      "Solar": 0.0849,
+      "Wind": 0.0802
     },
     "2022": {
-      "Bioenergy": 0.0573,
-      "Coal": 0.0918,
-      "Gas": 0.4816,
-      "Hydro": 0.109,
-      "Nuclear": 0.0275,
-      "Other Fossil": 0.0319,
-      "Other Renewables": 0.0191,
-      "Solar": 0.0988,
-      "Wind": 0.0828
+      "Bioenergy": 0.0566,
+      "Coal": 0.0908,
+      "Gas": 0.4761,
+      "Hydro": 0.1193,
+      "Nuclear": 0.0272,
+      "Other Fossil": 0.0315,
+      "Other Renewables": 0.0189,
+      "Solar": 0.0977,
+      "Wind": 0.0819
     },
     "2023": {
-      "Bioenergy": 0.0561,
-      "Coal": 0.0664,
-      "Gas": 0.4225,
-      "Hydro": 0.1516,
-      "Nuclear": 0.0346,
-      "Other Fossil": 0.033,
-      "Other Renewables": 0.0196,
-      "Solar": 0.1145,
-      "Wind": 0.1017
+      "Bioenergy": 0.0554,
+      "Coal": 0.0655,
+      "Gas": 0.417,
+      "Hydro": 0.1628,
+      "Nuclear": 0.0342,
+      "Other Fossil": 0.0326,
+      "Other Renewables": 0.0193,
+      "Solar": 0.113,
+      "Wind": 0.1003
     },
     "2024": {
-      "Bioenergy": 0.0554,
-      "Coal": 0.0346,
-      "Gas": 0.4079,
-      "Hydro": 0.1861,
-      "Nuclear": 0.0345,
-      "Other Fossil": 0.0336,
-      "Other Renewables": 0.0191,
-      "Solar": 0.1323,
-      "Wind": 0.0966
+      "Bioenergy": 0.0543,
+      "Coal": 0.0338,
+      "Gas": 0.3998,
+      "Hydro": 0.2023,
+      "Nuclear": 0.0338,
+      "Other Fossil": 0.0329,
+      "Other Renewables": 0.0187,
+      "Solar": 0.1297,
+      "Wind": 0.0947
     },
     "2025": {
-      "Bioenergy": 0.0501,
-      "Coal": 0.0319,
-      "Gas": 0.4132,
-      "Hydro": 0.1412,
-      "Nuclear": 0.0323,
-      "Other Fossil": 0.0211,
-      "Other Renewables": 0.02,
-      "Solar": 0.1961,
-      "Wind": 0.094
+      "Bioenergy": 0.0475,
+      "Coal": 0.0307,
+      "Gas": 0.3989,
+      "Hydro": 0.1818,
+      "Nuclear": 0.0314,
+      "Other Fossil": 0.0197,
+      "Other Renewables": 0.0189,
+      "Solar": 0.1819,
+      "Wind": 0.089
     }
   },
   "JM": {
@@ -7651,15 +7651,15 @@
       "Wind": 0.1313
     },
     "2025": {
-      "Bioenergy": 0.0227,
+      "Bioenergy": 0.0248,
       "Coal": 0.0305,
       "Gas": 0.0418,
-      "Hydro": 0.2558,
+      "Hydro": 0.2575,
       "Nuclear": 0.0015,
-      "Other Fossil": 0.078,
-      "Other Renewables": 0.4054,
-      "Solar": 0.031,
-      "Wind": 0.1332
+      "Other Fossil": 0.0788,
+      "Other Renewables": 0.4026,
+      "Solar": 0.0302,
+      "Wind": 0.1323
     }
   },
   "KG": {
@@ -7709,10 +7709,10 @@
     },
     "2023": {
       "Bioenergy": 0.0017,
-      "Coal": 0.1592,
+      "Coal": 0.1588,
       "Gas": 0.0147,
-      "Hydro": 0.8072,
-      "Nuclear": 0.004,
+      "Hydro": 0.8077,
+      "Nuclear": 0.0039,
       "Other Fossil": 0.0037,
       "Other Renewables": 0.0004,
       "Solar": 0.0038,
@@ -7731,14 +7731,14 @@
     },
     "2025": {
       "Bioenergy": 0.0015,
-      "Coal": 0.0963,
+      "Coal": 0.0965,
       "Gas": 0.0153,
-      "Hydro": 0.8353,
+      "Hydro": 0.8354,
       "Nuclear": 0.0039,
       "Other Fossil": 0.0335,
       "Other Renewables": 0.0004,
-      "Solar": 0.0077,
-      "Wind": 0.006
+      "Solar": 0.0076,
+      "Wind": 0.0058
     }
   },
   "KH": {
@@ -7810,14 +7810,14 @@
     },
     "2025": {
       "Bioenergy": 0.0135,
-      "Coal": 0.4556,
+      "Coal": 0.4563,
       "Gas": 0.0239,
-      "Hydro": 0.3805,
+      "Hydro": 0.3807,
       "Nuclear": 0.0134,
       "Other Fossil": 0.0552,
       "Other Renewables": 0.0013,
-      "Solar": 0.0363,
-      "Wind": 0.0205
+      "Solar": 0.0359,
+      "Wind": 0.0199
     }
   },
   "KI": {
@@ -8929,54 +8929,54 @@
   "LT": {
     "2019": {
       "Bioenergy": 0.0548,
-      "Coal": 0.1272,
-      "Gas": 0.2292,
-      "Hydro": 0.1558,
-      "Nuclear": 0.1728,
-      "Other Fossil": 0.0412,
+      "Coal": 0.1271,
+      "Gas": 0.229,
+      "Hydro": 0.1564,
+      "Nuclear": 0.1726,
+      "Other Fossil": 0.0411,
       "Other Renewables": 0.0061,
       "Solar": 0.0292,
-      "Wind": 0.1837
+      "Wind": 0.1836
     },
     "2020": {
       "Bioenergy": 0.0532,
-      "Coal": 0.0994,
-      "Gas": 0.293,
-      "Hydro": 0.1413,
-      "Nuclear": 0.1446,
+      "Coal": 0.0993,
+      "Gas": 0.2928,
+      "Hydro": 0.142,
+      "Nuclear": 0.1444,
       "Other Fossil": 0.0377,
       "Other Renewables": 0.0056,
-      "Solar": 0.0301,
+      "Solar": 0.03,
       "Wind": 0.195
     },
     "2021": {
-      "Bioenergy": 0.0535,
-      "Coal": 0.1133,
-      "Gas": 0.2748,
-      "Hydro": 0.1487,
-      "Nuclear": 0.1591,
+      "Bioenergy": 0.0534,
+      "Coal": 0.1132,
+      "Gas": 0.2746,
+      "Hydro": 0.1494,
+      "Nuclear": 0.1589,
       "Other Fossil": 0.0364,
       "Other Renewables": 0.0059,
-      "Solar": 0.037,
+      "Solar": 0.0369,
       "Wind": 0.1713
     },
     "2022": {
       "Bioenergy": 0.0518,
-      "Coal": 0.1191,
-      "Gas": 0.2264,
-      "Hydro": 0.1429,
-      "Nuclear": 0.1408,
+      "Coal": 0.119,
+      "Gas": 0.2262,
+      "Hydro": 0.1434,
+      "Nuclear": 0.1407,
       "Other Fossil": 0.047,
       "Other Renewables": 0.006,
       "Solar": 0.0647,
-      "Wind": 0.2013
+      "Wind": 0.2012
     },
     "2023": {
       "Bioenergy": 0.0386,
       "Coal": 0.0877,
-      "Gas": 0.1948,
-      "Hydro": 0.1348,
-      "Nuclear": 0.12,
+      "Gas": 0.1947,
+      "Hydro": 0.1352,
+      "Nuclear": 0.1199,
       "Other Fossil": 0.0573,
       "Other Renewables": 0.005,
       "Solar": 0.0901,
@@ -8985,103 +8985,103 @@
     "2024": {
       "Bioenergy": 0.0306,
       "Coal": 0.0594,
-      "Gas": 0.1656,
-      "Hydro": 0.1096,
-      "Nuclear": 0.091,
+      "Gas": 0.1655,
+      "Hydro": 0.11,
+      "Nuclear": 0.0908,
       "Other Fossil": 0.0842,
       "Other Renewables": 0.0037,
       "Solar": 0.1408,
-      "Wind": 0.3151
+      "Wind": 0.315
     },
     "2025": {
       "Bioenergy": 0.0198,
       "Coal": 0.0352,
-      "Gas": 0.1953,
-      "Hydro": 0.0683,
-      "Nuclear": 0.0537,
-      "Other Fossil": 0.0999,
+      "Gas": 0.1981,
+      "Hydro": 0.0666,
+      "Nuclear": 0.0543,
+      "Other Fossil": 0.0983,
       "Other Renewables": 0.0022,
-      "Solar": 0.2035,
-      "Wind": 0.322
+      "Solar": 0.1961,
+      "Wind": 0.3295
     }
   },
   "LU": {
     "2019": {
       "Bioenergy": 0.0571,
-      "Coal": 0.1332,
-      "Gas": 0.2556,
-      "Hydro": 0.1483,
-      "Nuclear": 0.1811,
+      "Coal": 0.1331,
+      "Gas": 0.2554,
+      "Hydro": 0.149,
+      "Nuclear": 0.1809,
       "Other Fossil": 0.0404,
       "Other Renewables": 0.0064,
-      "Solar": 0.05,
-      "Wind": 0.1278
+      "Solar": 0.0499,
+      "Wind": 0.1277
     },
     "2020": {
       "Bioenergy": 0.0716,
-      "Coal": 0.115,
-      "Gas": 0.2386,
-      "Hydro": 0.1521,
-      "Nuclear": 0.1666,
-      "Other Fossil": 0.0386,
+      "Coal": 0.1148,
+      "Gas": 0.2384,
+      "Hydro": 0.1528,
+      "Nuclear": 0.1665,
+      "Other Fossil": 0.0385,
       "Other Renewables": 0.0065,
       "Solar": 0.0574,
       "Wind": 0.1536
     },
     "2021": {
       "Bioenergy": 0.0795,
-      "Coal": 0.1194,
-      "Gas": 0.2383,
-      "Hydro": 0.1479,
-      "Nuclear": 0.1682,
+      "Coal": 0.1193,
+      "Gas": 0.2381,
+      "Hydro": 0.1487,
+      "Nuclear": 0.168,
       "Other Fossil": 0.0374,
-      "Other Renewables": 0.0063,
+      "Other Renewables": 0.0062,
       "Solar": 0.0657,
-      "Wind": 0.1373
+      "Wind": 0.1372
     },
     "2022": {
       "Bioenergy": 0.0846,
-      "Coal": 0.1266,
-      "Gas": 0.2273,
-      "Hydro": 0.1303,
-      "Nuclear": 0.1497,
+      "Coal": 0.1264,
+      "Gas": 0.2271,
+      "Hydro": 0.1308,
+      "Nuclear": 0.1496,
       "Other Fossil": 0.0381,
       "Other Renewables": 0.0063,
       "Solar": 0.0886,
-      "Wind": 0.1485
+      "Wind": 0.1484
     },
     "2023": {
       "Bioenergy": 0.0551,
-      "Coal": 0.1093,
-      "Gas": 0.1977,
-      "Hydro": 0.144,
-      "Nuclear": 0.1504,
+      "Coal": 0.1092,
+      "Gas": 0.1976,
+      "Hydro": 0.1446,
+      "Nuclear": 0.1502,
       "Other Fossil": 0.0365,
-      "Other Renewables": 0.0063,
-      "Solar": 0.1004,
-      "Wind": 0.2003
+      "Other Renewables": 0.0062,
+      "Solar": 0.1003,
+      "Wind": 0.2002
     },
     "2024": {
       "Bioenergy": 0.0733,
-      "Coal": 0.0962,
-      "Gas": 0.1811,
-      "Hydro": 0.1554,
-      "Nuclear": 0.1474,
+      "Coal": 0.096,
+      "Gas": 0.1809,
+      "Hydro": 0.1561,
+      "Nuclear": 0.1472,
       "Other Fossil": 0.0372,
       "Other Renewables": 0.0059,
-      "Solar": 0.1172,
-      "Wind": 0.1862
+      "Solar": 0.1171,
+      "Wind": 0.1861
     },
     "2025": {
-      "Bioenergy": 0.0702,
+      "Bioenergy": 0.07,
       "Coal": 0.0893,
-      "Gas": 0.1753,
-      "Hydro": 0.1255,
-      "Nuclear": 0.14,
-      "Other Fossil": 0.0393,
-      "Other Renewables": 0.0057,
-      "Solar": 0.1904,
-      "Wind": 0.1642
+      "Gas": 0.1754,
+      "Hydro": 0.1272,
+      "Nuclear": 0.1416,
+      "Other Fossil": 0.0392,
+      "Other Renewables": 0.0058,
+      "Solar": 0.1796,
+      "Wind": 0.1719
     }
   },
   "LV": {
@@ -9089,30 +9089,30 @@
       "Bioenergy": 0.0834,
       "Coal": 0.0273,
       "Gas": 0.4215,
-      "Hydro": 0.304,
+      "Hydro": 0.3042,
       "Nuclear": 0.0372,
       "Other Fossil": 0.0864,
       "Other Renewables": 0.0013,
       "Solar": 0.0055,
-      "Wind": 0.0333
+      "Wind": 0.0332
     },
     "2020": {
       "Bioenergy": 0.0802,
       "Coal": 0.0347,
       "Gas": 0.3001,
-      "Hydro": 0.3948,
+      "Hydro": 0.3951,
       "Nuclear": 0.0499,
-      "Other Fossil": 0.0868,
+      "Other Fossil": 0.0867,
       "Other Renewables": 0.002,
       "Solar": 0.0098,
-      "Wind": 0.0417
+      "Wind": 0.0416
     },
     "2021": {
       "Bioenergy": 0.0761,
-      "Coal": 0.0412,
-      "Gas": 0.3106,
-      "Hydro": 0.3884,
-      "Nuclear": 0.0575,
+      "Coal": 0.0411,
+      "Gas": 0.3105,
+      "Hydro": 0.3887,
+      "Nuclear": 0.0574,
       "Other Fossil": 0.0712,
       "Other Renewables": 0.0021,
       "Solar": 0.0124,
@@ -9121,20 +9121,20 @@
     "2022": {
       "Bioenergy": 0.0581,
       "Coal": 0.0577,
-      "Gas": 0.2507,
-      "Hydro": 0.4325,
+      "Gas": 0.2506,
+      "Hydro": 0.4327,
       "Nuclear": 0.0675,
-      "Other Fossil": 0.0449,
+      "Other Fossil": 0.0448,
       "Other Renewables": 0.0029,
-      "Solar": 0.0235,
-      "Wind": 0.0623
+      "Solar": 0.0234,
+      "Wind": 0.0622
     },
     "2023": {
       "Bioenergy": 0.0367,
-      "Coal": 0.0383,
-      "Gas": 0.2483,
-      "Hydro": 0.4886,
-      "Nuclear": 0.0567,
+      "Coal": 0.0382,
+      "Gas": 0.2482,
+      "Hydro": 0.4888,
+      "Nuclear": 0.0566,
       "Other Fossil": 0.0241,
       "Other Renewables": 0.0023,
       "Solar": 0.0414,
@@ -9142,25 +9142,25 @@
     },
     "2024": {
       "Bioenergy": 0.0562,
-      "Coal": 0.0382,
+      "Coal": 0.0381,
       "Gas": 0.2652,
-      "Hydro": 0.4253,
-      "Nuclear": 0.0583,
+      "Hydro": 0.4257,
+      "Nuclear": 0.0582,
       "Other Fossil": 0.0092,
       "Other Renewables": 0.0023,
       "Solar": 0.0777,
       "Wind": 0.0675
     },
     "2025": {
-      "Bioenergy": 0.058,
-      "Coal": 0.0182,
-      "Gas": 0.2209,
-      "Hydro": 0.4698,
-      "Nuclear": 0.0302,
-      "Other Fossil": 0.0144,
-      "Other Renewables": 0.0013,
-      "Solar": 0.144,
-      "Wind": 0.0433
+      "Bioenergy": 0.0568,
+      "Coal": 0.0201,
+      "Gas": 0.2292,
+      "Hydro": 0.4554,
+      "Nuclear": 0.034,
+      "Other Fossil": 0.0148,
+      "Other Renewables": 0.0014,
+      "Solar": 0.1418,
+      "Wind": 0.0465
     }
   },
   "LY": {
@@ -9324,9 +9324,9 @@
   "MD": {
     "2019": {
       "Bioenergy": 0.0076,
-      "Coal": 0.0169,
-      "Gas": 0.8667,
-      "Hydro": 0.0642,
+      "Coal": 0.0168,
+      "Gas": 0.8666,
+      "Hydro": 0.0643,
       "Nuclear": 0.0229,
       "Other Fossil": 0.0022,
       "Other Renewables": 0.0008,
@@ -9349,7 +9349,7 @@
       "Coal": 0.0042,
       "Gas": 0.9286,
       "Hydro": 0.0551,
-      "Nuclear": 0.0063,
+      "Nuclear": 0.0062,
       "Other Fossil": 0.0006,
       "Other Renewables": 0.0002,
       "Solar": 0.0016,
@@ -9357,11 +9357,11 @@
     },
     "2022": {
       "Bioenergy": 0.0049,
-      "Coal": 0.0275,
+      "Coal": 0.0274,
       "Gas": 0.8342,
-      "Hydro": 0.0717,
+      "Hydro": 0.0718,
       "Nuclear": 0.0307,
-      "Other Fossil": 0.0035,
+      "Other Fossil": 0.0034,
       "Other Renewables": 0.0013,
       "Solar": 0.008,
       "Wind": 0.0182
@@ -9391,33 +9391,33 @@
     "2025": {
       "Bioenergy": 0.0006,
       "Coal": 0.0026,
-      "Gas": 0.9215,
+      "Gas": 0.9214,
       "Hydro": 0.0452,
       "Nuclear": 0.0041,
       "Other Fossil": 0.0004,
       "Other Renewables": 0.0002,
-      "Solar": 0.0232,
-      "Wind": 0.0024
+      "Solar": 0.0231,
+      "Wind": 0.0025
     }
   },
   "ME": {
     "2019": {
       "Bioenergy": 0.0073,
-      "Coal": 0.3521,
+      "Coal": 0.352,
       "Gas": 0.0682,
-      "Hydro": 0.4065,
-      "Nuclear": 0.0599,
+      "Hydro": 0.4068,
+      "Nuclear": 0.0598,
       "Other Fossil": 0.0056,
-      "Other Renewables": 0.0022,
+      "Other Renewables": 0.0021,
       "Solar": 0.01,
       "Wind": 0.0882
     },
     "2020": {
       "Bioenergy": 0.0069,
-      "Coal": 0.4025,
-      "Gas": 0.0578,
-      "Hydro": 0.3623,
-      "Nuclear": 0.0514,
+      "Coal": 0.4024,
+      "Gas": 0.0577,
+      "Hydro": 0.3625,
+      "Nuclear": 0.0513,
       "Other Fossil": 0.0048,
       "Other Renewables": 0.002,
       "Solar": 0.0084,
@@ -9426,9 +9426,9 @@
     "2021": {
       "Bioenergy": 0.0043,
       "Coal": 0.3609,
-      "Gas": 0.0351,
-      "Hydro": 0.4625,
-      "Nuclear": 0.0315,
+      "Gas": 0.035,
+      "Hydro": 0.4627,
+      "Nuclear": 0.0314,
       "Other Fossil": 0.003,
       "Other Renewables": 0.0012,
       "Solar": 0.0087,
@@ -9449,7 +9449,7 @@
       "Bioenergy": 0.0008,
       "Coal": 0.3958,
       "Gas": 0.0072,
-      "Hydro": 0.4975,
+      "Hydro": 0.4976,
       "Nuclear": 0.006,
       "Other Fossil": 0.0006,
       "Other Renewables": 0.0002,
@@ -9459,24 +9459,24 @@
     "2024": {
       "Bioenergy": 0.0038,
       "Coal": 0.3763,
-      "Gas": 0.0311,
-      "Hydro": 0.4322,
+      "Gas": 0.031,
+      "Hydro": 0.4323,
       "Nuclear": 0.0288,
       "Other Fossil": 0.003,
       "Other Renewables": 0.0011,
-      "Solar": 0.032,
+      "Solar": 0.0319,
       "Wind": 0.0917
     },
     "2025": {
-      "Bioenergy": 0.0145,
-      "Coal": 0.1845,
-      "Gas": 0.1149,
-      "Hydro": 0.3343,
-      "Nuclear": 0.1045,
-      "Other Fossil": 0.0105,
-      "Other Renewables": 0.0043,
-      "Solar": 0.1041,
-      "Wind": 0.1284
+      "Bioenergy": 0.0139,
+      "Coal": 0.1853,
+      "Gas": 0.1094,
+      "Hydro": 0.3494,
+      "Nuclear": 0.101,
+      "Other Fossil": 0.0101,
+      "Other Renewables": 0.0042,
+      "Solar": 0.1004,
+      "Wind": 0.1265
     }
   },
   "MG": {
@@ -9562,10 +9562,10 @@
     "2019": {
       "Bioenergy": 0.0176,
       "Coal": 0.4987,
-      "Gas": 0.1869,
-      "Hydro": 0.2006,
-      "Nuclear": 0.0476,
-      "Other Fossil": 0.0046,
+      "Gas": 0.1868,
+      "Hydro": 0.2008,
+      "Nuclear": 0.0475,
+      "Other Fossil": 0.0045,
       "Other Renewables": 0.0017,
       "Solar": 0.005,
       "Wind": 0.0373
@@ -9574,18 +9574,18 @@
       "Bioenergy": 0.0221,
       "Coal": 0.3945,
       "Gas": 0.228,
-      "Hydro": 0.2314,
-      "Nuclear": 0.0609,
-      "Other Fossil": 0.0058,
+      "Hydro": 0.2316,
+      "Nuclear": 0.0608,
+      "Other Fossil": 0.0057,
       "Other Renewables": 0.0023,
       "Solar": 0.0081,
       "Wind": 0.0469
     },
     "2021": {
       "Bioenergy": 0.0209,
-      "Coal": 0.3269,
-      "Gas": 0.2818,
-      "Hydro": 0.2474,
+      "Coal": 0.3268,
+      "Gas": 0.2817,
+      "Hydro": 0.2477,
       "Nuclear": 0.061,
       "Other Fossil": 0.0058,
       "Other Renewables": 0.0023,
@@ -9595,8 +9595,8 @@
     "2022": {
       "Bioenergy": 0.0124,
       "Coal": 0.4356,
-      "Gas": 0.1884,
-      "Hydro": 0.2296,
+      "Gas": 0.1883,
+      "Hydro": 0.2297,
       "Nuclear": 0.0413,
       "Other Fossil": 0.0395,
       "Other Renewables": 0.0017,
@@ -9623,18 +9623,18 @@
       "Other Fossil": 0.0018,
       "Other Renewables": 0.0007,
       "Solar": 0.0502,
-      "Wind": 0.0429
+      "Wind": 0.0428
     },
     "2025": {
       "Bioenergy": 0.0078,
-      "Coal": 0.403,
-      "Gas": 0.265,
-      "Hydro": 0.1704,
-      "Nuclear": 0.0457,
+      "Coal": 0.4028,
+      "Gas": 0.2647,
+      "Hydro": 0.1707,
+      "Nuclear": 0.046,
       "Other Fossil": 0.0046,
       "Other Renewables": 0.0019,
-      "Solar": 0.05,
-      "Wind": 0.0518
+      "Solar": 0.0492,
+      "Wind": 0.0525
     }
   },
   "ML": {
@@ -9921,7 +9921,7 @@
     },
     "2023": {
       "Bioenergy": 0.0565,
-      "Coal": 0.482,
+      "Coal": 0.4821,
       "Gas": 0.1637,
       "Hydro": 0.0997,
       "Nuclear": 0.0457,
@@ -9938,19 +9938,19 @@
       "Nuclear": 0.0448,
       "Other Fossil": 0.034,
       "Other Renewables": 0.0045,
-      "Solar": 0.066,
+      "Solar": 0.0661,
       "Wind": 0.063
     },
     "2025": {
       "Bioenergy": 0.0553,
-      "Coal": 0.4426,
-      "Gas": 0.158,
-      "Hydro": 0.1018,
-      "Nuclear": 0.0452,
-      "Other Fossil": 0.0343,
+      "Coal": 0.4449,
+      "Gas": 0.1582,
+      "Hydro": 0.1024,
+      "Nuclear": 0.0454,
+      "Other Fossil": 0.0342,
       "Other Renewables": 0.0044,
-      "Solar": 0.0891,
-      "Wind": 0.0692
+      "Solar": 0.088,
+      "Wind": 0.0673
     }
   },
   "MQ": {
@@ -10193,9 +10193,9 @@
   "MT": {
     "2019": {
       "Bioenergy": 0.005,
-      "Coal": 0.0305,
-      "Gas": 0.8539,
-      "Hydro": 0.0301,
+      "Coal": 0.0304,
+      "Gas": 0.8538,
+      "Hydro": 0.0302,
       "Nuclear": 0.0414,
       "Other Fossil": 0.0153,
       "Other Renewables": 0.0015,
@@ -10203,21 +10203,21 @@
       "Wind": 0.0165
     },
     "2020": {
-      "Bioenergy": 0.0037,
+      "Bioenergy": 0.0036,
       "Coal": 0.0195,
-      "Gas": 0.8798,
-      "Hydro": 0.022,
+      "Gas": 0.8797,
+      "Hydro": 0.0221,
       "Nuclear": 0.027,
       "Other Fossil": 0.0297,
-      "Other Renewables": 0.0011,
+      "Other Renewables": 0.001,
       "Solar": 0.0044,
       "Wind": 0.0129
     },
     "2021": {
       "Bioenergy": 0.0045,
-      "Coal": 0.0246,
-      "Gas": 0.8673,
-      "Hydro": 0.025,
+      "Coal": 0.0245,
+      "Gas": 0.8672,
+      "Hydro": 0.0251,
       "Nuclear": 0.0334,
       "Other Fossil": 0.0233,
       "Other Renewables": 0.0012,
@@ -10227,9 +10227,9 @@
     "2022": {
       "Bioenergy": 0.0052,
       "Coal": 0.0284,
-      "Gas": 0.816,
-      "Hydro": 0.0267,
-      "Nuclear": 0.0338,
+      "Gas": 0.8159,
+      "Hydro": 0.0268,
+      "Nuclear": 0.0337,
       "Other Fossil": 0.0276,
       "Other Renewables": 0.0014,
       "Solar": 0.0418,
@@ -10239,9 +10239,9 @@
       "Bioenergy": 0.0043,
       "Coal": 0.0224,
       "Gas": 0.7653,
-      "Hydro": 0.0265,
-      "Nuclear": 0.0311,
-      "Other Fossil": 0.008,
+      "Hydro": 0.0266,
+      "Nuclear": 0.031,
+      "Other Fossil": 0.0079,
       "Other Renewables": 0.0013,
       "Solar": 0.1213,
       "Wind": 0.0199
@@ -10250,23 +10250,23 @@
       "Bioenergy": 0.0063,
       "Coal": 0.0295,
       "Gas": 0.7037,
-      "Hydro": 0.0405,
-      "Nuclear": 0.046,
+      "Hydro": 0.0407,
+      "Nuclear": 0.0459,
       "Other Fossil": 0.007,
       "Other Renewables": 0.0018,
-      "Solar": 0.1369,
+      "Solar": 0.1368,
       "Wind": 0.0283
     },
     "2025": {
       "Bioenergy": 0.0066,
-      "Coal": 0.0299,
-      "Gas": 0.6667,
-      "Hydro": 0.0399,
-      "Nuclear": 0.0478,
+      "Coal": 0.0297,
+      "Gas": 0.6664,
+      "Hydro": 0.0403,
+      "Nuclear": 0.0482,
       "Other Fossil": 0.0109,
       "Other Renewables": 0.002,
-      "Solar": 0.1683,
-      "Wind": 0.0279
+      "Solar": 0.1673,
+      "Wind": 0.0288
     }
   },
   "MU": {
@@ -10575,11 +10575,11 @@
     },
     "2025": {
       "Bioenergy": 0.0002,
-      "Coal": 0.078,
-      "Gas": 0.6034,
-      "Hydro": 0.0726,
+      "Coal": 0.0775,
+      "Gas": 0.6039,
+      "Hydro": 0.0727,
       "Nuclear": 0.0284,
-      "Other Fossil": 0.0903,
+      "Other Fossil": 0.0904,
       "Other Renewables": 0.0089,
       "Solar": 0.0564,
       "Wind": 0.0616
@@ -10654,11 +10654,11 @@
     },
     "2025": {
       "Bioenergy": 0.0247,
-      "Coal": 0.4563,
-      "Gas": 0.3116,
-      "Hydro": 0.1835,
+      "Coal": 0.4535,
+      "Gas": 0.3142,
+      "Hydro": 0.1833,
       "Nuclear": 0,
-      "Other Fossil": 0.0055,
+      "Other Fossil": 0.0058,
       "Other Renewables": 0,
       "Solar": 0.0185,
       "Wind": 0
@@ -11050,8 +11050,8 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.7069,
-      "Hydro": 0.2931,
+      "Gas": 0.7001,
+      "Hydro": 0.2999,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -11127,25 +11127,25 @@
       "Wind": 0.1541
     },
     "2025": {
-      "Bioenergy": 0.1684,
-      "Coal": 0.0034,
-      "Gas": 0.0211,
-      "Hydro": 0.084,
-      "Nuclear": 0.0017,
-      "Other Fossil": 0.3977,
+      "Bioenergy": 0.1685,
+      "Coal": 0.0035,
+      "Gas": 0.0212,
+      "Hydro": 0.0837,
+      "Nuclear": 0.0018,
+      "Other Fossil": 0.3978,
       "Other Renewables": 0.1561,
-      "Solar": 0.0129,
+      "Solar": 0.013,
       "Wind": 0.1546
     }
   },
   "NL": {
     "2019": {
-      "Bioenergy": 0.0421,
+      "Bioenergy": 0.0422,
       "Coal": 0.1602,
-      "Gas": 0.5734,
+      "Gas": 0.5735,
       "Hydro": 0.0048,
       "Nuclear": 0.0356,
-      "Other Fossil": 0.0268,
+      "Other Fossil": 0.0267,
       "Other Renewables": 0.0155,
       "Solar": 0.0457,
       "Wind": 0.0959
@@ -11153,11 +11153,11 @@
     "2020": {
       "Bioenergy": 0.0646,
       "Coal": 0.08,
-      "Gas": 0.582,
+      "Gas": 0.5821,
       "Hydro": 0.0021,
       "Nuclear": 0.0336,
-      "Other Fossil": 0.0269,
-      "Other Renewables": 0.0144,
+      "Other Fossil": 0.027,
+      "Other Renewables": 0.0142,
       "Solar": 0.0694,
       "Wind": 0.1269
     },
@@ -11206,15 +11206,15 @@
       "Wind": 0.2649
     },
     "2025": {
-      "Bioenergy": 0.0478,
-      "Coal": 0.0708,
-      "Gas": 0.3297,
+      "Bioenergy": 0.0475,
+      "Coal": 0.0693,
+      "Gas": 0.3257,
       "Hydro": 0.0003,
-      "Nuclear": 0.0266,
-      "Other Fossil": 0.0223,
-      "Other Renewables": 0.0138,
-      "Solar": 0.2861,
-      "Wind": 0.2026
+      "Nuclear": 0.0267,
+      "Other Fossil": 0.0224,
+      "Other Renewables": 0.0139,
+      "Solar": 0.2777,
+      "Wind": 0.2165
     }
   },
   "NO": {
@@ -11255,7 +11255,7 @@
       "Bioenergy": 0.0002,
       "Coal": 0.001,
       "Gas": 0.0101,
-      "Hydro": 0.8789,
+      "Hydro": 0.879,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0018,
       "Other Renewables": 0.0028,
@@ -11287,13 +11287,13 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.0059,
-      "Hydro": 0.9083,
+      "Gas": 0.0063,
+      "Hydro": 0.9077,
       "Nuclear": 0,
-      "Other Fossil": 0.0018,
+      "Other Fossil": 0.0017,
       "Other Renewables": 0.0033,
       "Solar": 0,
-      "Wind": 0.0807
+      "Wind": 0.0811
     }
   },
   "NP": {
@@ -11365,14 +11365,14 @@
     },
     "2025": {
       "Bioenergy": 0.0043,
-      "Coal": 0.1078,
+      "Coal": 0.1084,
       "Gas": 0.0197,
-      "Hydro": 0.8048,
-      "Nuclear": 0.011,
+      "Hydro": 0.8049,
+      "Nuclear": 0.0111,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.0011,
-      "Solar": 0.032,
-      "Wind": 0.0181
+      "Solar": 0.0317,
+      "Wind": 0.0177
     }
   },
   "NR": {
@@ -12156,22 +12156,22 @@
     "2025": {
       "Bioenergy": 0.0036,
       "Coal": 0.1636,
-      "Gas": 0.2108,
-      "Hydro": 0.2636,
-      "Nuclear": 0.1246,
-      "Other Fossil": 0.0055,
+      "Gas": 0.2069,
+      "Hydro": 0.2645,
+      "Nuclear": 0.1371,
+      "Other Fossil": 0.0052,
       "Other Renewables": 0,
-      "Solar": 0.1959,
-      "Wind": 0.0325
+      "Solar": 0.1894,
+      "Wind": 0.0299
     }
   },
   "PL": {
     "2019": {
       "Bioenergy": 0.015,
       "Coal": 0.7422,
-      "Gas": 0.0849,
+      "Gas": 0.0848,
       "Hydro": 0.0209,
-      "Nuclear": 0.015,
+      "Nuclear": 0.0149,
       "Other Fossil": 0.0153,
       "Other Renewables": 0.0005,
       "Solar": 0.0068,
@@ -12181,7 +12181,7 @@
       "Bioenergy": 0.0161,
       "Coal": 0.6979,
       "Gas": 0.1022,
-      "Hydro": 0.0261,
+      "Hydro": 0.0262,
       "Nuclear": 0.0179,
       "Other Fossil": 0.014,
       "Other Renewables": 0.0007,
@@ -12197,7 +12197,7 @@
       "Other Fossil": 0.0167,
       "Other Renewables": 0.0002,
       "Solar": 0.0291,
-      "Wind": 0.0953
+      "Wind": 0.0952
     },
     "2022": {
       "Bioenergy": 0.0101,
@@ -12234,14 +12234,14 @@
     },
     "2025": {
       "Bioenergy": 0.0185,
-      "Coal": 0.5036,
-      "Gas": 0.1232,
-      "Hydro": 0.0114,
+      "Coal": 0.5053,
+      "Gas": 0.1235,
+      "Hydro": 0.0112,
       "Nuclear": 0.0026,
-      "Other Fossil": 0.0527,
+      "Other Fossil": 0.0522,
       "Other Renewables": 0.0033,
-      "Solar": 0.154,
-      "Wind": 0.1305
+      "Solar": 0.1476,
+      "Wind": 0.1357
     }
   },
   "PM": {
@@ -12392,14 +12392,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.2046,
-      "Gas": 0.3981,
+      "Coal": 0.1975,
+      "Gas": 0.4093,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.3646,
+      "Other Fossil": 0.3639,
       "Other Renewables": 0,
-      "Solar": 0.0146,
-      "Wind": 0.018
+      "Solar": 0.0143,
+      "Wind": 0.0151
     }
   },
   "PS": {
@@ -12485,7 +12485,7 @@
     "2019": {
       "Bioenergy": 0.0558,
       "Coal": 0.1182,
-      "Gas": 0.3428,
+      "Gas": 0.3427,
       "Hydro": 0.1514,
       "Nuclear": 0.0206,
       "Other Fossil": 0.0089,
@@ -12497,7 +12497,7 @@
       "Bioenergy": 0.0676,
       "Coal": 0.052,
       "Gas": 0.3495,
-      "Hydro": 0.2236,
+      "Hydro": 0.2237,
       "Nuclear": 0.0134,
       "Other Fossil": 0.0062,
       "Other Renewables": 0.0005,
@@ -12508,8 +12508,8 @@
       "Bioenergy": 0.0733,
       "Coal": 0.033,
       "Gas": 0.3264,
-      "Hydro": 0.2125,
-      "Nuclear": 0.0255,
+      "Hydro": 0.2127,
+      "Nuclear": 0.0254,
       "Other Fossil": 0.0073,
       "Other Renewables": 0.0009,
       "Solar": 0.0494,
@@ -12518,8 +12518,8 @@
     "2022": {
       "Bioenergy": 0.0701,
       "Coal": 0.0311,
-      "Gas": 0.3698,
-      "Hydro": 0.1335,
+      "Gas": 0.3697,
+      "Hydro": 0.1336,
       "Nuclear": 0.0376,
       "Other Fossil": 0.008,
       "Other Renewables": 0.0016,
@@ -12530,34 +12530,34 @@
       "Bioenergy": 0.0619,
       "Coal": 0.028,
       "Gas": 0.2402,
-      "Hydro": 0.2266,
+      "Hydro": 0.2267,
       "Nuclear": 0.0409,
-      "Other Fossil": 0.0078,
+      "Other Fossil": 0.0077,
       "Other Renewables": 0.0017,
       "Solar": 0.1186,
       "Wind": 0.2743
     },
     "2024": {
       "Bioenergy": 0.065,
-      "Coal": 0.0273,
+      "Coal": 0.0272,
       "Gas": 0.1409,
-      "Hydro": 0.264,
-      "Nuclear": 0.0429,
+      "Hydro": 0.2643,
+      "Nuclear": 0.0428,
       "Other Fossil": 0.0089,
       "Other Renewables": 0.0017,
       "Solar": 0.1565,
       "Wind": 0.2927
     },
     "2025": {
-      "Bioenergy": 0.0565,
-      "Coal": 0.019,
-      "Gas": 0.1742,
-      "Hydro": 0.2614,
+      "Bioenergy": 0.0564,
+      "Coal": 0.0186,
+      "Gas": 0.1729,
+      "Hydro": 0.261,
       "Nuclear": 0.0314,
-      "Other Fossil": 0.0071,
+      "Other Fossil": 0.007,
       "Other Renewables": 0.0013,
-      "Solar": 0.1968,
-      "Wind": 0.2522
+      "Solar": 0.192,
+      "Wind": 0.2593
     }
   },
   "PY": {
@@ -12811,20 +12811,20 @@
     },
     "2020": {
       "Bioenergy": 0.01,
-      "Coal": 0.1724,
+      "Coal": 0.1723,
       "Gas": 0.1871,
       "Hydro": 0.2734,
       "Nuclear": 0.2076,
       "Other Fossil": 0.001,
       "Other Renewables": 0.0004,
       "Solar": 0.0248,
-      "Wind": 0.1234
+      "Wind": 0.1233
     },
     "2021": {
       "Bioenergy": 0.0109,
       "Coal": 0.1855,
       "Gas": 0.186,
-      "Hydro": 0.2889,
+      "Hydro": 0.289,
       "Nuclear": 0.1938,
       "Other Fossil": 0.001,
       "Other Renewables": 0.0004,
@@ -12836,7 +12836,7 @@
       "Coal": 0.1903,
       "Gas": 0.1936,
       "Hydro": 0.2512,
-      "Nuclear": 0.2011,
+      "Nuclear": 0.201,
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0002,
       "Solar": 0.0281,
@@ -12847,7 +12847,7 @@
       "Coal": 0.1428,
       "Gas": 0.1684,
       "Hydro": 0.318,
-      "Nuclear": 0.1967,
+      "Nuclear": 0.1966,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
       "Solar": 0.0377,
@@ -12856,24 +12856,24 @@
     "2024": {
       "Bioenergy": 0.0096,
       "Coal": 0.1313,
-      "Gas": 0.1951,
-      "Hydro": 0.2616,
-      "Nuclear": 0.2035,
+      "Gas": 0.195,
+      "Hydro": 0.2617,
+      "Nuclear": 0.2034,
       "Other Fossil": 0.0014,
       "Other Renewables": 0.0006,
       "Solar": 0.0781,
       "Wind": 0.1188
     },
     "2025": {
-      "Bioenergy": 0.0103,
-      "Coal": 0.1317,
-      "Gas": 0.18,
-      "Hydro": 0.232,
-      "Nuclear": 0.2003,
+      "Bioenergy": 0.0104,
+      "Coal": 0.1325,
+      "Gas": 0.1798,
+      "Hydro": 0.231,
+      "Nuclear": 0.2012,
       "Other Fossil": 0.0017,
       "Other Renewables": 0.0007,
-      "Solar": 0.133,
-      "Wind": 0.1103
+      "Solar": 0.1301,
+      "Wind": 0.1125
     }
   },
   "RS": {
@@ -12890,8 +12890,8 @@
     },
     "2020": {
       "Bioenergy": 0.0046,
-      "Coal": 0.6881,
-      "Gas": 0.0058,
+      "Coal": 0.688,
+      "Gas": 0.0057,
       "Hydro": 0.257,
       "Nuclear": 0.0047,
       "Other Fossil": 0.0096,
@@ -12901,7 +12901,7 @@
     },
     "2021": {
       "Bioenergy": 0.0088,
-      "Coal": 0.593,
+      "Coal": 0.5929,
       "Gas": 0.015,
       "Hydro": 0.3097,
       "Nuclear": 0.0122,
@@ -12915,7 +12915,7 @@
       "Coal": 0.6138,
       "Gas": 0.0468,
       "Hydro": 0.2545,
-      "Nuclear": 0.0206,
+      "Nuclear": 0.0205,
       "Other Fossil": 0.0092,
       "Other Renewables": 0.0009,
       "Solar": 0.0055,
@@ -12944,15 +12944,15 @@
       "Wind": 0.0372
     },
     "2025": {
-      "Bioenergy": 0.0097,
-      "Coal": 0.636,
-      "Gas": 0.0544,
-      "Hydro": 0.2456,
-      "Nuclear": 0.0045,
-      "Other Fossil": 0.0064,
+      "Bioenergy": 0.0098,
+      "Coal": 0.6337,
+      "Gas": 0.0546,
+      "Hydro": 0.2446,
+      "Nuclear": 0.005,
+      "Other Fossil": 0.0068,
       "Other Renewables": 0.0002,
-      "Solar": 0.003,
-      "Wind": 0.0402
+      "Solar": 0.0033,
+      "Wind": 0.0419
     }
   },
   "RU": {
@@ -13024,11 +13024,11 @@
     },
     "2025": {
       "Bioenergy": 0.0007,
-      "Coal": 0.1755,
-      "Gas": 0.4388,
-      "Hydro": 0.1744,
-      "Nuclear": 0.1919,
-      "Other Fossil": 0.0127,
+      "Coal": 0.1767,
+      "Gas": 0.4418,
+      "Hydro": 0.1719,
+      "Nuclear": 0.1903,
+      "Other Fossil": 0.0128,
       "Other Renewables": 0,
       "Solar": 0.0023,
       "Wind": 0.0037
@@ -13500,11 +13500,11 @@
       "Bioenergy": 0.0341,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4159,
-      "Nuclear": 0.2764,
+      "Hydro": 0.4165,
+      "Nuclear": 0.2765,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.037,
+      "Solar": 0.0363,
       "Wind": 0.2366
     }
   },
@@ -13577,7 +13577,7 @@
     },
     "2025": {
       "Bioenergy": 0.0001,
-      "Coal": 0.0021,
+      "Coal": 0.0022,
       "Gas": 0.9425,
       "Hydro": 0.0005,
       "Nuclear": 0.0002,
@@ -13703,7 +13703,7 @@
     "2022": {
       "Bioenergy": 0.0089,
       "Coal": 0.224,
-      "Gas": 0.0587,
+      "Gas": 0.0586,
       "Hydro": 0.2387,
       "Nuclear": 0.4118,
       "Other Fossil": 0.011,
@@ -13720,12 +13720,12 @@
       "Other Fossil": 0.009,
       "Other Renewables": 0.0003,
       "Solar": 0.0438,
-      "Wind": 0.0057
+      "Wind": 0.0056
     },
     "2024": {
       "Bioenergy": 0.0081,
       "Coal": 0.2054,
-      "Gas": 0.0344,
+      "Gas": 0.0343,
       "Hydro": 0.3227,
       "Nuclear": 0.3496,
       "Other Fossil": 0.0029,
@@ -13734,21 +13734,21 @@
       "Wind": 0.0022
     },
     "2025": {
-      "Bioenergy": 0.0088,
-      "Coal": 0.1025,
-      "Gas": 0.057,
-      "Hydro": 0.2767,
-      "Nuclear": 0.4386,
-      "Other Fossil": 0.0001,
-      "Other Renewables": 0,
-      "Solar": 0.1161,
-      "Wind": 0.0004
+      "Bioenergy": 0.0098,
+      "Coal": 0.1008,
+      "Gas": 0.0575,
+      "Hydro": 0.2777,
+      "Nuclear": 0.4246,
+      "Other Fossil": 0.0002,
+      "Other Renewables": 0.0001,
+      "Solar": 0.1278,
+      "Wind": 0.0015
     }
   },
   "SK": {
     "2019": {
-      "Bioenergy": 0.0296,
-      "Coal": 0.0654,
+      "Bioenergy": 0.0295,
+      "Coal": 0.0653,
       "Gas": 0.1074,
       "Hydro": 0.1558,
       "Nuclear": 0.536,
@@ -13813,14 +13813,14 @@
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0331,
+      "Bioenergy": 0.032,
       "Coal": 0.0015,
-      "Gas": 0.0905,
-      "Hydro": 0.1086,
-      "Nuclear": 0.6783,
-      "Other Fossil": 0.0446,
-      "Other Renewables": 0.0178,
-      "Solar": 0.0256,
+      "Gas": 0.0933,
+      "Hydro": 0.1069,
+      "Nuclear": 0.6799,
+      "Other Fossil": 0.0443,
+      "Other Renewables": 0.0176,
+      "Solar": 0.0245,
       "Wind": 0
     }
   },
@@ -14367,11 +14367,11 @@
     },
     "2025": {
       "Bioenergy": 0.1521,
-      "Coal": 0.0024,
-      "Gas": 0.227,
-      "Hydro": 0.1785,
+      "Coal": 0.0025,
+      "Gas": 0.2271,
+      "Hydro": 0.1782,
       "Nuclear": 0.0012,
-      "Other Fossil": 0.0335,
+      "Other Fossil": 0.0336,
       "Other Renewables": 0.1973,
       "Solar": 0.1564,
       "Wind": 0.0517
@@ -14840,15 +14840,15 @@
       "Wind": 0.0268
     },
     "2025": {
-      "Bioenergy": 0.0539,
-      "Coal": 0.2253,
-      "Gas": 0.5771,
-      "Hydro": 0.0496,
-      "Nuclear": 0.0072,
-      "Other Fossil": 0.0009,
-      "Other Renewables": 0.0007,
-      "Solar": 0.0591,
-      "Wind": 0.0261
+      "Bioenergy": 0.0528,
+      "Coal": 0.2295,
+      "Gas": 0.5712,
+      "Hydro": 0.0505,
+      "Nuclear": 0.0079,
+      "Other Fossil": 0.0011,
+      "Other Renewables": 0.0008,
+      "Solar": 0.0594,
+      "Wind": 0.0269
     }
   },
   "TJ": {
@@ -14876,9 +14876,9 @@
     },
     "2021": {
       "Bioenergy": 0,
-      "Coal": 0.0695,
-      "Gas": 0.0121,
-      "Hydro": 0.9184,
+      "Coal": 0.0689,
+      "Gas": 0.012,
+      "Hydro": 0.9191,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -14909,9 +14909,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.0564,
-      "Gas": 0.013,
-      "Hydro": 0.9303,
+      "Coal": 0.056,
+      "Gas": 0.0129,
+      "Hydro": 0.9309,
       "Nuclear": 0.0001,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -14919,15 +14919,15 @@
       "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0.0003,
-      "Coal": 0.1126,
-      "Gas": 0.0245,
-      "Hydro": 0.8585,
-      "Nuclear": 0.0009,
-      "Other Fossil": 0.0001,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0017,
-      "Wind": 0.0014
+      "Bioenergy": 0.0001,
+      "Coal": 0.0496,
+      "Gas": 0.0113,
+      "Hydro": 0.9377,
+      "Nuclear": 0.0003,
+      "Other Fossil": 0,
+      "Other Renewables": 0,
+      "Solar": 0.0005,
+      "Wind": 0.0005
     }
   },
   "TL": {
@@ -15158,13 +15158,13 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.9781,
+      "Gas": 0.9839,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0219
+      "Wind": 0.0161
     }
   },
   "TO": {
@@ -15789,14 +15789,14 @@
     },
     "2025": {
       "Bioenergy": 0.01,
-      "Coal": 0.1633,
-      "Gas": 0.4062,
-      "Hydro": 0.0534,
-      "Nuclear": 0.1702,
-      "Other Fossil": 0.0061,
+      "Coal": 0.1624,
+      "Gas": 0.4055,
+      "Hydro": 0.0528,
+      "Nuclear": 0.1714,
+      "Other Fossil": 0.006,
       "Other Renewables": 0.0038,
       "Solar": 0.0901,
-      "Wind": 0.0969
+      "Wind": 0.0979
     }
   },
   "UY": {
@@ -15867,15 +15867,15 @@
       "Wind": 0.3322
     },
     "2025": {
-      "Bioenergy": 0.1379,
+      "Bioenergy": 0.1366,
       "Coal": 0.0014,
-      "Gas": 0.0237,
-      "Hydro": 0.4586,
+      "Gas": 0.0241,
+      "Hydro": 0.4634,
       "Nuclear": 0.0009,
-      "Other Fossil": 0.0094,
+      "Other Fossil": 0.0095,
       "Other Renewables": 0.0003,
-      "Solar": 0.0369,
-      "Wind": 0.3309
+      "Solar": 0.0372,
+      "Wind": 0.3267
     }
   },
   "UZ": {
@@ -15947,7 +15947,7 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0693,
+      "Coal": 0.0694,
       "Gas": 0.8121,
       "Hydro": 0.102,
       "Nuclear": 0.0011,
@@ -16342,14 +16342,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.519,
-      "Gas": 0.0642,
-      "Hydro": 0.295,
+      "Coal": 0.4908,
+      "Gas": 0.0631,
+      "Hydro": 0.3221,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0823,
-      "Wind": 0.0396
+      "Solar": 0.0812,
+      "Wind": 0.0428
     }
   },
   "VU": {
@@ -16545,32 +16545,32 @@
       "Wind": 0.0145
     },
     "2022": {
-      "Bioenergy": 0.0026,
-      "Coal": 0.8591,
-      "Gas": 0.0232,
-      "Hydro": 0.0323,
-      "Nuclear": 0.0176,
+      "Bioenergy": 0.0025,
+      "Coal": 0.8451,
+      "Gas": 0.0228,
+      "Hydro": 0.0455,
+      "Nuclear": 0.0173,
       "Other Fossil": 0.0018,
       "Other Renewables": 0.0007,
-      "Solar": 0.0018,
-      "Wind": 0.061
+      "Solar": 0.0017,
+      "Wind": 0.0626
     },
     "2023": {
       "Bioenergy": 0.0038,
       "Coal": 0.7779,
       "Gas": 0.0326,
-      "Hydro": 0.0751,
+      "Hydro": 0.0766,
       "Nuclear": 0.0264,
       "Other Fossil": 0.0027,
       "Other Renewables": 0.0011,
       "Solar": 0.0065,
-      "Wind": 0.0739
+      "Wind": 0.0725
     },
     "2024": {
       "Bioenergy": 0.0034,
       "Coal": 0.8201,
       "Gas": 0.0308,
-      "Hydro": 0.0472,
+      "Hydro": 0.0473,
       "Nuclear": 0.025,
       "Other Fossil": 0.0025,
       "Other Renewables": 0.001,
@@ -16578,15 +16578,15 @@
       "Wind": 0.0648
     },
     "2025": {
-      "Bioenergy": 0.0066,
-      "Coal": 0.7049,
-      "Gas": 0.056,
-      "Hydro": 0.0811,
-      "Nuclear": 0.0464,
-      "Other Fossil": 0.0047,
+      "Bioenergy": 0.0065,
+      "Coal": 0.7048,
+      "Gas": 0.0557,
+      "Hydro": 0.0815,
+      "Nuclear": 0.0466,
+      "Other Fossil": 0.0046,
       "Other Renewables": 0.0019,
-      "Solar": 0.0219,
-      "Wind": 0.0765
+      "Solar": 0.0213,
+      "Wind": 0.0769
     }
   },
   "YE": {