@digital4better/data 1.3.17 → 1.3.19

package/data/mix/country-yearly.json

@@ -135,26 +135,26 @@
       "Wind": 0.0541
     },
     "2024": {
-      "Bioenergy": 0.0162,
-      "Coal": 0.4337,
-      "Gas": 0.0756,
+      "Bioenergy": 0.0161,
+      "Coal": 0.4336,
+      "Gas": 0.0757,
       "Hydro": 0.2844,
       "Nuclear": 0.0404,
       "Other Fossil": 0.02,
-      "Other Renewables": 0.0041,
+      "Other Renewables": 0.004,
       "Solar": 0.0689,
       "Wind": 0.0568
     },
     "2025": {
-      "Bioenergy": 0.0156,
-      "Coal": 0.4133,
-      "Gas": 0.0723,
-      "Hydro": 0.2809,
-      "Nuclear": 0.0415,
+      "Bioenergy": 0.0158,
+      "Coal": 0.4121,
+      "Gas": 0.0731,
+      "Hydro": 0.2807,
+      "Nuclear": 0.0413,
       "Other Fossil": 0.0202,
-      "Other Renewables": 0.0042,
-      "Solar": 0.0883,
-      "Wind": 0.0638
+      "Other Renewables": 0.004,
+      "Solar": 0.0891,
+      "Wind": 0.0636
     }
   },
   "AG": {
@@ -243,19 +243,19 @@
       "Gas": 0.0821,
       "Hydro": 0.7335,
       "Nuclear": 0.0719,
-      "Other Fossil": 0.0071,
-      "Other Renewables": 0.0021,
+      "Other Fossil": 0.0068,
+      "Other Renewables": 0.0025,
       "Solar": 0.0125,
-      "Wind": 0.0292
+      "Wind": 0.0291
     },
     "2020": {
       "Bioenergy": 0.0093,
       "Coal": 0.0468,
       "Gas": 0.0798,
       "Hydro": 0.7384,
-      "Nuclear": 0.0683,
-      "Other Fossil": 0.0069,
-      "Other Renewables": 0.0022,
+      "Nuclear": 0.0682,
+      "Other Fossil": 0.0066,
+      "Other Renewables": 0.0027,
       "Solar": 0.0148,
       "Wind": 0.0335
     },
@@ -264,55 +264,55 @@
       "Coal": 0.049,
       "Gas": 0.0811,
       "Hydro": 0.7348,
-      "Nuclear": 0.0694,
-      "Other Fossil": 0.0069,
-      "Other Renewables": 0.0022,
+      "Nuclear": 0.0693,
+      "Other Fossil": 0.0066,
+      "Other Renewables": 0.0026,
       "Solar": 0.0156,
       "Wind": 0.0316
     },
     "2022": {
       "Bioenergy": 0.0096,
-      "Coal": 0.0524,
+      "Coal": 0.0523,
       "Gas": 0.0817,
       "Hydro": 0.7299,
       "Nuclear": 0.0619,
-      "Other Fossil": 0.0071,
-      "Other Renewables": 0.0022,
+      "Other Fossil": 0.0068,
+      "Other Renewables": 0.0026,
       "Solar": 0.0191,
       "Wind": 0.036
     },
     "2023": {
       "Bioenergy": 0.0088,
       "Coal": 0.0456,
-      "Gas": 0.0757,
+      "Gas": 0.0756,
       "Hydro": 0.7351,
       "Nuclear": 0.0631,
-      "Other Fossil": 0.0067,
-      "Other Renewables": 0.0022,
+      "Other Fossil": 0.0064,
+      "Other Renewables": 0.0026,
       "Solar": 0.0229,
       "Wind": 0.0398
     },
     "2024": {
       "Bioenergy": 0.0089,
-      "Coal": 0.0416,
-      "Gas": 0.0717,
-      "Hydro": 0.7379,
-      "Nuclear": 0.0639,
-      "Other Fossil": 0.0066,
-      "Other Renewables": 0.0022,
+      "Coal": 0.0413,
+      "Gas": 0.0716,
+      "Hydro": 0.7378,
+      "Nuclear": 0.0638,
+      "Other Fossil": 0.0064,
+      "Other Renewables": 0.0026,
       "Solar": 0.027,
-      "Wind": 0.0403
+      "Wind": 0.0406
     },
     "2025": {
       "Bioenergy": 0.0088,
       "Coal": 0.0395,
-      "Gas": 0.0727,
-      "Hydro": 0.7338,
-      "Nuclear": 0.0626,
+      "Gas": 0.0726,
+      "Hydro": 0.7337,
+      "Nuclear": 0.0625,
       "Other Fossil": 0.0063,
-      "Other Renewables": 0.0022,
-      "Solar": 0.037,
-      "Wind": 0.037
+      "Other Renewables": 0.0026,
+      "Solar": 0.0369,
+      "Wind": 0.0371
     }
   },
   "AM": {
@@ -543,7 +543,7 @@
     "2025": {
       "Bioenergy": 0.0105,
       "Coal": 0.0084,
-      "Gas": 0.5293,
+      "Gas": 0.5292,
       "Hydro": 0.2179,
       "Nuclear": 0.0703,
       "Other Fossil": 0.0106,
@@ -633,13 +633,13 @@
   },
   "AT": {
     "2019": {
-      "Bioenergy": 0.0331,
-      "Coal": 0.0312,
+      "Bioenergy": 0.033,
+      "Coal": 0.0311,
       "Gas": 0.166,
       "Hydro": 0.5902,
-      "Nuclear": 0.0176,
-      "Other Fossil": 0.0169,
-      "Other Renewables": 0.0005,
+      "Nuclear": 0.0175,
+      "Other Fossil": 0.0168,
+      "Other Renewables": 0.0006,
       "Solar": 0.0237,
       "Wind": 0.1209
     },
@@ -649,8 +649,8 @@
       "Gas": 0.1532,
       "Hydro": 0.6271,
       "Nuclear": 0.0143,
-      "Other Fossil": 0.0174,
-      "Other Renewables": 0.0004,
+      "Other Fossil": 0.0173,
+      "Other Renewables": 0.0005,
       "Solar": 0.0289,
       "Wind": 0.1159
     },
@@ -660,8 +660,8 @@
       "Gas": 0.1725,
       "Hydro": 0.5786,
       "Nuclear": 0.0298,
-      "Other Fossil": 0.0183,
-      "Other Renewables": 0.0009,
+      "Other Fossil": 0.0181,
+      "Other Renewables": 0.0011,
       "Solar": 0.0383,
       "Wind": 0.1144
     },
@@ -671,8 +671,8 @@
       "Gas": 0.1818,
       "Hydro": 0.535,
       "Nuclear": 0.0271,
-      "Other Fossil": 0.0184,
-      "Other Renewables": 0.001,
+      "Other Fossil": 0.0183,
+      "Other Renewables": 0.0011,
       "Solar": 0.0539,
       "Wind": 0.119
     },
@@ -682,8 +682,8 @@
       "Gas": 0.1131,
       "Hydro": 0.6131,
       "Nuclear": 0.0122,
-      "Other Fossil": 0.0172,
-      "Other Renewables": 0.0004,
+      "Other Fossil": 0.0171,
+      "Other Renewables": 0.0005,
       "Solar": 0.079,
       "Wind": 0.1324
     },
@@ -696,18 +696,18 @@
       "Other Fossil": 0.0152,
       "Other Renewables": 0.0001,
       "Solar": 0.1044,
-      "Wind": 0.1337
+      "Wind": 0.1338
     },
     "2025": {
-      "Bioenergy": 0.027,
-      "Coal": 0.0081,
-      "Gas": 0.1093,
-      "Hydro": 0.551,
-      "Nuclear": 0.0114,
-      "Other Fossil": 0.0157,
-      "Other Renewables": 0.0004,
-      "Solar": 0.1561,
-      "Wind": 0.121
+      "Bioenergy": 0.0274,
+      "Coal": 0.0082,
+      "Gas": 0.1108,
+      "Hydro": 0.545,
+      "Nuclear": 0.0115,
+      "Other Fossil": 0.0159,
+      "Other Renewables": 0.0005,
+      "Solar": 0.1581,
+      "Wind": 0.1226
     }
   },
   "AU": {
@@ -1016,14 +1016,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.6016,
+      "Coal": 0.597,
       "Gas": 0,
-      "Hydro": 0.343,
+      "Hydro": 0.3402,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0406,
-      "Wind": 0.0147
+      "Solar": 0.0482,
+      "Wind": 0.0146
     }
   },
   "BB": {
@@ -1163,7 +1163,7 @@
     },
     "2024": {
       "Bioenergy": 0.0033,
-      "Coal": 0.3646,
+      "Coal": 0.3645,
       "Gas": 0.4499,
       "Hydro": 0.0281,
       "Nuclear": 0.0082,
@@ -1174,13 +1174,13 @@
     },
     "2025": {
       "Bioenergy": 0.0033,
-      "Coal": 0.3504,
-      "Gas": 0.4454,
+      "Coal": 0.3502,
+      "Gas": 0.4455,
       "Hydro": 0.0252,
       "Nuclear": 0.0087,
       "Other Fossil": 0.1232,
       "Other Renewables": 0.0009,
-      "Solar": 0.0295,
+      "Solar": 0.0297,
       "Wind": 0.0134
     }
   },
@@ -1191,8 +1191,8 @@
       "Gas": 0.2704,
       "Hydro": 0.0053,
       "Nuclear": 0.4692,
-      "Other Fossil": 0.0877,
-      "Other Renewables": 0.0001,
+      "Other Fossil": 0.0876,
+      "Other Renewables": 0.0002,
       "Solar": 0.0398,
       "Wind": 0.0959
     },
@@ -1233,34 +1233,34 @@
       "Bioenergy": 0.0129,
       "Coal": 0.0075,
       "Gas": 0.1994,
-      "Hydro": 0.0118,
+      "Hydro": 0.0117,
       "Nuclear": 0.3934,
       "Other Fossil": 0.0994,
-      "Other Renewables": 0.0004,
+      "Other Renewables": 0.0005,
       "Solar": 0.0923,
       "Wind": 0.1828
     },
     "2024": {
       "Bioenergy": 0.0122,
-      "Coal": 0.0176,
+      "Coal": 0.0175,
       "Gas": 0.1672,
       "Hydro": 0.0261,
       "Nuclear": 0.3924,
-      "Other Fossil": 0.0951,
-      "Other Renewables": 0.0009,
+      "Other Fossil": 0.095,
+      "Other Renewables": 0.0011,
       "Solar": 0.1111,
-      "Wind": 0.1772
+      "Wind": 0.1774
     },
     "2025": {
       "Bioenergy": 0.0129,
       "Coal": 0.0198,
-      "Gas": 0.1957,
+      "Gas": 0.1956,
       "Hydro": 0.0282,
       "Nuclear": 0.3295,
       "Other Fossil": 0.0984,
-      "Other Renewables": 0.0011,
-      "Solar": 0.1696,
-      "Wind": 0.1448
+      "Other Renewables": 0.0013,
+      "Solar": 0.1695,
+      "Wind": 0.1449
     }
   },
   "BF": {
@@ -1394,18 +1394,18 @@
       "Hydro": 0.0783,
       "Nuclear": 0.4046,
       "Other Fossil": 0.0001,
-      "Other Renewables": 0,
+      "Other Renewables": 0.0001,
       "Solar": 0.0776,
       "Wind": 0.0386
     },
     "2024": {
       "Bioenergy": 0.0044,
-      "Coal": 0.2649,
+      "Coal": 0.2648,
       "Gas": 0.0639,
       "Hydro": 0.082,
-      "Nuclear": 0.4136,
-      "Other Fossil": 0.0008,
-      "Other Renewables": 0.0002,
+      "Nuclear": 0.4135,
+      "Other Fossil": 0.0007,
+      "Other Renewables": 0.0003,
       "Solar": 0.1291,
       "Wind": 0.0413
     },
@@ -2230,7 +2230,7 @@
       "Hydro": 0.0114,
       "Nuclear": 0.0098,
       "Other Fossil": 0.1447,
-      "Other Renewables": 0,
+      "Other Renewables": 0.0001,
       "Solar": 0.0043,
       "Wind": 0.006
     },
@@ -2240,7 +2240,7 @@
       "Gas": 0.7077,
       "Hydro": 0.0101,
       "Nuclear": 0.1412,
-      "Other Fossil": 0.1257,
+      "Other Fossil": 0.1256,
       "Other Renewables": 0,
       "Solar": 0.0047,
       "Wind": 0.0042
@@ -2360,8 +2360,8 @@
     "2025": {
       "Bioenergy": 0.1704,
       "Coal": 0.0166,
-      "Gas": 0.1022,
-      "Hydro": 0.5124,
+      "Gas": 0.1021,
+      "Hydro": 0.5125,
       "Nuclear": 0.0085,
       "Other Fossil": 0.1,
       "Other Renewables": 0.0022,
@@ -2437,15 +2437,15 @@
       "Wind": 0.0757
     },
     "2025": {
-      "Bioenergy": 0.0153,
-      "Coal": 0.0342,
-      "Gas": 0.1396,
-      "Hydro": 0.5668,
-      "Nuclear": 0.1397,
-      "Other Fossil": 0.0074,
+      "Bioenergy": 0.0161,
+      "Coal": 0.0361,
+      "Gas": 0.1473,
+      "Hydro": 0.5604,
+      "Nuclear": 0.1384,
+      "Other Fossil": 0.0079,
       "Other Renewables": 0.0006,
-      "Solar": 0.0108,
-      "Wind": 0.0855
+      "Solar": 0.0112,
+      "Wind": 0.082
     }
   },
   "CD": {
@@ -2692,19 +2692,19 @@
       "Gas": 0.0119,
       "Hydro": 0.5363,
       "Nuclear": 0.3545,
-      "Other Fossil": 0.0521,
-      "Other Renewables": 0.0003,
+      "Other Fossil": 0.052,
+      "Other Renewables": 0.0004,
       "Solar": 0.0288,
       "Wind": 0.0068
     },
     "2020": {
       "Bioenergy": 0.0011,
-      "Coal": 0.006,
+      "Coal": 0.0059,
       "Gas": 0.01,
       "Hydro": 0.5571,
       "Nuclear": 0.3275,
       "Other Fossil": 0.0548,
-      "Other Renewables": 0.0002,
+      "Other Renewables": 0.0003,
       "Solar": 0.036,
       "Wind": 0.0073
     },
@@ -2714,19 +2714,19 @@
       "Gas": 0.0273,
       "Hydro": 0.5548,
       "Nuclear": 0.2849,
-      "Other Fossil": 0.0557,
-      "Other Renewables": 0.0007,
+      "Other Fossil": 0.0556,
+      "Other Renewables": 0.0008,
       "Solar": 0.0428,
       "Wind": 0.0138
     },
     "2022": {
       "Bioenergy": 0.0028,
       "Coal": 0.0156,
-      "Gas": 0.0242,
+      "Gas": 0.0241,
       "Hydro": 0.4829,
       "Nuclear": 0.3461,
-      "Other Fossil": 0.0546,
-      "Other Renewables": 0.0006,
+      "Other Fossil": 0.0545,
+      "Other Renewables": 0.0008,
       "Solar": 0.0588,
       "Wind": 0.0144
     },
@@ -2737,7 +2737,7 @@
       "Hydro": 0.5433,
       "Nuclear": 0.3213,
       "Other Fossil": 0.0485,
-      "Other Renewables": 0.0002,
+      "Other Renewables": 0.0003,
       "Solar": 0.0641,
       "Wind": 0.0074
     },
@@ -2746,7 +2746,7 @@
       "Coal": 0.002,
       "Gas": 0.0035,
       "Hydro": 0.5854,
-      "Nuclear": 0.29,
+      "Nuclear": 0.2899,
       "Other Fossil": 0.0453,
       "Other Renewables": 0.0001,
       "Solar": 0.0688,
@@ -2754,13 +2754,13 @@
     },
     "2025": {
       "Bioenergy": 0.0015,
-      "Coal": 0.0075,
+      "Coal": 0.0074,
       "Gas": 0.0135,
-      "Hydro": 0.511,
-      "Nuclear": 0.2774,
-      "Other Fossil": 0.0481,
+      "Hydro": 0.5114,
+      "Nuclear": 0.2771,
+      "Other Fossil": 0.0495,
       "Other Renewables": 0.0004,
-      "Solar": 0.1321,
+      "Solar": 0.1306,
       "Wind": 0.0087
     }
   },
@@ -3138,9 +3138,9 @@
     },
     "2024": {
       "Bioenergy": 0.02,
-      "Coal": 0.5912,
+      "Coal": 0.5911,
       "Gas": 0.0286,
-      "Hydro": 0.1294,
+      "Hydro": 0.1293,
       "Nuclear": 0.0449,
       "Other Fossil": 0.0017,
       "Other Renewables": 0,
@@ -3148,15 +3148,15 @@
       "Wind": 0.1001
     },
     "2025": {
-      "Bioenergy": 0.0188,
-      "Coal": 0.5556,
-      "Gas": 0.0269,
-      "Hydro": 0.1232,
+      "Bioenergy": 0.0195,
+      "Coal": 0.5563,
+      "Gas": 0.0286,
+      "Hydro": 0.1226,
       "Nuclear": 0.0467,
-      "Other Fossil": 0.0016,
+      "Other Fossil": 0.0017,
       "Other Renewables": 0,
-      "Solar": 0.1184,
-      "Wind": 0.1089
+      "Solar": 0.1175,
+      "Wind": 0.1073
     }
   },
   "CO": {
@@ -3548,10 +3548,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.7022,
+      "Other Fossil": 0.7177,
       "Other Renewables": 0,
-      "Solar": 0.2581,
-      "Wind": 0.0397
+      "Solar": 0.2479,
+      "Wind": 0.0345
     }
   },
   "CZ": {
@@ -3640,8 +3640,8 @@
       "Gas": 0.1497,
       "Hydro": 0.0356,
       "Nuclear": 0.1248,
-      "Other Fossil": 0.0462,
-      "Other Renewables": 0,
+      "Other Fossil": 0.0378,
+      "Other Renewables": 0.0084,
       "Solar": 0.0799,
       "Wind": 0.2147
     },
@@ -3651,8 +3651,8 @@
       "Gas": 0.1699,
       "Hydro": 0.0356,
       "Nuclear": 0.1135,
-      "Other Fossil": 0.0464,
-      "Other Renewables": 0,
+      "Other Fossil": 0.0376,
+      "Other Renewables": 0.0089,
       "Solar": 0.0917,
       "Wind": 0.2372
     },
@@ -3662,8 +3662,8 @@
       "Gas": 0.1578,
       "Hydro": 0.0361,
       "Nuclear": 0.1189,
-      "Other Fossil": 0.0465,
-      "Other Renewables": 0,
+      "Other Fossil": 0.038,
+      "Other Renewables": 0.0086,
       "Solar": 0.0908,
       "Wind": 0.2022
     },
@@ -3673,8 +3673,8 @@
       "Gas": 0.1402,
       "Hydro": 0.0322,
       "Nuclear": 0.0603,
-      "Other Fossil": 0.0467,
-      "Other Renewables": 0,
+      "Other Fossil": 0.0383,
+      "Other Renewables": 0.0084,
       "Solar": 0.1118,
       "Wind": 0.2226
     },
@@ -3684,32 +3684,32 @@
       "Gas": 0.1482,
       "Hydro": 0.0463,
       "Nuclear": 0.0218,
-      "Other Fossil": 0.0488,
-      "Other Renewables": 0.0003,
+      "Other Fossil": 0.0399,
+      "Other Renewables": 0.0092,
       "Solar": 0.1299,
       "Wind": 0.2728
     },
     "2024": {
-      "Bioenergy": 0.0868,
-      "Coal": 0.2126,
-      "Gas": 0.1603,
-      "Hydro": 0.0569,
-      "Nuclear": 0.0111,
-      "Other Fossil": 0.0446,
-      "Other Renewables": 0.0004,
-      "Solar": 0.154,
-      "Wind": 0.2733
+      "Bioenergy": 0.0851,
+      "Coal": 0.2037,
+      "Gas": 0.1595,
+      "Hydro": 0.0555,
+      "Nuclear": 0.011,
+      "Other Fossil": 0.0403,
+      "Other Renewables": 0.0093,
+      "Solar": 0.1533,
+      "Wind": 0.2822
     },
     "2025": {
-      "Bioenergy": 0.0846,
-      "Coal": 0.1991,
-      "Gas": 0.1688,
-      "Hydro": 0.0464,
-      "Nuclear": 0.0085,
-      "Other Fossil": 0.0364,
-      "Other Renewables": 0.0003,
-      "Solar": 0.2197,
-      "Wind": 0.2362
+      "Bioenergy": 0.0839,
+      "Coal": 0.1975,
+      "Gas": 0.1674,
+      "Hydro": 0.046,
+      "Nuclear": 0.0084,
+      "Other Fossil": 0.0361,
+      "Other Renewables": 0.008,
+      "Solar": 0.218,
+      "Wind": 0.2346
     }
   },
   "DJ": {
@@ -3798,8 +3798,8 @@
       "Gas": 0.1218,
       "Hydro": 0.0314,
       "Nuclear": 0.0408,
-      "Other Fossil": 0.0492,
-      "Other Renewables": 0.0012,
+      "Other Fossil": 0.049,
+      "Other Renewables": 0.0014,
       "Solar": 0.0355,
       "Wind": 0.4716
     },
@@ -3808,20 +3808,20 @@
       "Coal": 0.14,
       "Gas": 0.1052,
       "Hydro": 0.0396,
-      "Nuclear": 0.0451,
-      "Other Fossil": 0.0481,
-      "Other Renewables": 0.0015,
+      "Nuclear": 0.045,
+      "Other Fossil": 0.0479,
+      "Other Renewables": 0.0018,
       "Solar": 0.0455,
       "Wind": 0.4829
     },
     "2021": {
       "Bioenergy": 0.1338,
       "Coal": 0.175,
-      "Gas": 0.1022,
+      "Gas": 0.1021,
       "Hydro": 0.0234,
       "Nuclear": 0.0285,
-      "Other Fossil": 0.0509,
-      "Other Renewables": 0.0009,
+      "Other Fossil": 0.0508,
+      "Other Renewables": 0.0011,
       "Solar": 0.0447,
       "Wind": 0.4407
     },
@@ -3831,7 +3831,7 @@
       "Gas": 0.0776,
       "Hydro": 0.013,
       "Nuclear": 0.0149,
-      "Other Fossil": 0.0457,
+      "Other Fossil": 0.0456,
       "Other Renewables": 0.0006,
       "Solar": 0.0644,
       "Wind": 0.5195
@@ -3842,32 +3842,32 @@
       "Gas": 0.0767,
       "Hydro": 0.0176,
       "Nuclear": 0.0199,
-      "Other Fossil": 0.0359,
-      "Other Renewables": 0.0007,
+      "Other Fossil": 0.0358,
+      "Other Renewables": 0.0008,
       "Solar": 0.0916,
       "Wind": 0.5468
     },
     "2024": {
       "Bioenergy": 0.1064,
-      "Coal": 0.0986,
-      "Gas": 0.0712,
-      "Hydro": 0.0191,
+      "Coal": 0.0985,
+      "Gas": 0.0711,
+      "Hydro": 0.019,
       "Nuclear": 0.0215,
       "Other Fossil": 0.0339,
-      "Other Renewables": 0.0007,
+      "Other Renewables": 0.0009,
       "Solar": 0.1054,
-      "Wind": 0.5432
+      "Wind": 0.5433
     },
     "2025": {
       "Bioenergy": 0.0871,
       "Coal": 0.0853,
       "Gas": 0.0889,
-      "Hydro": 0.0343,
+      "Hydro": 0.0342,
       "Nuclear": 0.04,
       "Other Fossil": 0.0375,
-      "Other Renewables": 0.0014,
-      "Solar": 0.1584,
-      "Wind": 0.467
+      "Other Renewables": 0.0017,
+      "Solar": 0.1583,
+      "Wind": 0.4671
     }
   },
   "DM": {
@@ -4188,24 +4188,24 @@
   },
   "EE": {
     "2019": {
-      "Bioenergy": 0.0785,
+      "Bioenergy": 0.0784,
       "Coal": 0.0467,
       "Gas": 0.074,
-      "Hydro": 0.0488,
+      "Hydro": 0.0487,
       "Nuclear": 0.0644,
-      "Other Fossil": 0.5629,
-      "Other Renewables": 0.0031,
+      "Other Fossil": 0.5626,
+      "Other Renewables": 0.0035,
       "Solar": 0.0093,
-      "Wind": 0.1123
+      "Wind": 0.1122
     },
     "2020": {
       "Bioenergy": 0.0843,
       "Coal": 0.0664,
-      "Gas": 0.113,
+      "Gas": 0.1129,
       "Hydro": 0.0822,
       "Nuclear": 0.0982,
-      "Other Fossil": 0.361,
-      "Other Renewables": 0.0032,
+      "Other Fossil": 0.3606,
+      "Other Renewables": 0.0038,
       "Solar": 0.0311,
       "Wind": 0.1606
     },
@@ -4215,19 +4215,19 @@
       "Gas": 0.0786,
       "Hydro": 0.0537,
       "Nuclear": 0.0673,
-      "Other Fossil": 0.5137,
-      "Other Renewables": 0.0021,
+      "Other Fossil": 0.5134,
+      "Other Renewables": 0.0025,
       "Solar": 0.049,
       "Wind": 0.1238
     },
     "2022": {
       "Bioenergy": 0.095,
-      "Coal": 0.0219,
+      "Coal": 0.0218,
       "Gas": 0.0356,
       "Hydro": 0.0199,
       "Nuclear": 0.0267,
-      "Other Fossil": 0.6253,
-      "Other Renewables": 0.0009,
+      "Other Fossil": 0.6251,
+      "Other Renewables": 0.0011,
       "Solar": 0.0733,
       "Wind": 0.1014
     },
@@ -4237,32 +4237,32 @@
       "Gas": 0.0993,
       "Hydro": 0.0703,
       "Nuclear": 0.0824,
-      "Other Fossil": 0.3378,
-      "Other Renewables": 0.0029,
+      "Other Fossil": 0.3374,
+      "Other Renewables": 0.0034,
       "Solar": 0.1165,
       "Wind": 0.1554
     },
     "2024": {
-      "Bioenergy": 0.0674,
-      "Coal": 0.05,
-      "Gas": 0.0865,
-      "Hydro": 0.0655,
-      "Nuclear": 0.075,
-      "Other Fossil": 0.3036,
-      "Other Renewables": 0.0025,
-      "Solar": 0.1483,
-      "Wind": 0.2013
+      "Bioenergy": 0.0673,
+      "Coal": 0.0497,
+      "Gas": 0.0864,
+      "Hydro": 0.0654,
+      "Nuclear": 0.0749,
+      "Other Fossil": 0.3034,
+      "Other Renewables": 0.003,
+      "Solar": 0.1482,
+      "Wind": 0.2017
     },
     "2025": {
       "Bioenergy": 0.0668,
       "Coal": 0.0442,
-      "Gas": 0.0814,
-      "Hydro": 0.0571,
-      "Nuclear": 0.0689,
+      "Gas": 0.0813,
+      "Hydro": 0.057,
+      "Nuclear": 0.0688,
       "Other Fossil": 0.2673,
-      "Other Renewables": 0.0024,
-      "Solar": 0.2096,
-      "Wind": 0.2023
+      "Other Renewables": 0.0028,
+      "Solar": 0.2094,
+      "Wind": 0.2025
     }
   },
   "EG": {
@@ -4431,7 +4431,7 @@
       "Hydro": 0.1099,
       "Nuclear": 0.2272,
       "Other Fossil": 0.0206,
-      "Other Renewables": 0.0036,
+      "Other Renewables": 0.0037,
       "Solar": 0.0578,
       "Wind": 0.209
     },
@@ -4441,7 +4441,7 @@
       "Gas": 0.2576,
       "Hydro": 0.1421,
       "Nuclear": 0.2335,
-      "Other Fossil": 0.0192,
+      "Other Fossil": 0.0191,
       "Other Renewables": 0.0038,
       "Solar": 0.0827,
       "Wind": 0.2203
@@ -4587,9 +4587,9 @@
       "Coal": 0.092,
       "Gas": 0.1047,
       "Hydro": 0.1815,
-      "Nuclear": 0.3153,
-      "Other Fossil": 0.0609,
-      "Other Renewables": 0.004,
+      "Nuclear": 0.3152,
+      "Other Fossil": 0.0607,
+      "Other Renewables": 0.0044,
       "Solar": 0.0089,
       "Wind": 0.0864
     },
@@ -4599,19 +4599,19 @@
       "Gas": 0.0957,
       "Hydro": 0.2286,
       "Nuclear": 0.3136,
-      "Other Fossil": 0.0479,
-      "Other Renewables": 0.0038,
+      "Other Fossil": 0.0477,
+      "Other Renewables": 0.0041,
       "Solar": 0.0108,
-      "Wind": 0.1082
+      "Wind": 0.1081
     },
     "2021": {
       "Bioenergy": 0.1416,
-      "Coal": 0.071,
-      "Gas": 0.0925,
-      "Hydro": 0.2132,
+      "Coal": 0.0709,
+      "Gas": 0.0924,
+      "Hydro": 0.2131,
       "Nuclear": 0.3015,
-      "Other Fossil": 0.0552,
-      "Other Renewables": 0.003,
+      "Other Fossil": 0.055,
+      "Other Renewables": 0.0032,
       "Solar": 0.0122,
       "Wind": 0.11
     },
@@ -4621,19 +4621,19 @@
       "Gas": 0.0512,
       "Hydro": 0.1864,
       "Nuclear": 0.3193,
-      "Other Fossil": 0.0569,
-      "Other Renewables": 0.0011,
+      "Other Fossil": 0.0567,
+      "Other Renewables": 0.0013,
       "Solar": 0.0121,
       "Wind": 0.1509
     },
     "2023": {
       "Bioenergy": 0.1306,
-      "Coal": 0.0293,
+      "Coal": 0.0292,
       "Gas": 0.0163,
       "Hydro": 0.1922,
       "Nuclear": 0.4075,
       "Other Fossil": 0.0381,
-      "Other Renewables": 0.0002,
+      "Other Renewables": 0.0003,
       "Solar": 0.0089,
       "Wind": 0.1767
     },
@@ -4642,22 +4642,22 @@
       "Coal": 0.0184,
       "Gas": 0.018,
       "Hydro": 0.178,
-      "Nuclear": 0.3748,
+      "Nuclear": 0.3747,
       "Other Fossil": 0.0434,
       "Other Renewables": 0.0014,
       "Solar": 0.0171,
       "Wind": 0.2352
     },
     "2025": {
-      "Bioenergy": 0.1165,
+      "Bioenergy": 0.1126,
       "Coal": 0.0167,
-      "Gas": 0.0262,
-      "Hydro": 0.1618,
-      "Nuclear": 0.3681,
-      "Other Fossil": 0.0411,
-      "Other Renewables": 0.0029,
-      "Solar": 0.0273,
-      "Wind": 0.2394
+      "Gas": 0.0275,
+      "Hydro": 0.1662,
+      "Nuclear": 0.3666,
+      "Other Fossil": 0.0409,
+      "Other Renewables": 0.003,
+      "Solar": 0.0281,
+      "Wind": 0.2384
     }
   },
   "FJ": {
@@ -4927,7 +4927,7 @@
       "Hydro": 0.1106,
       "Nuclear": 0.7031,
       "Other Fossil": 0.0069,
-      "Other Renewables": 0,
+      "Other Renewables": 0.0001,
       "Solar": 0.026,
       "Wind": 0.0702
     },
@@ -5062,8 +5062,8 @@
       "Gas": 0.4161,
       "Hydro": 0.0247,
       "Nuclear": 0.1996,
-      "Other Fossil": 0.0043,
-      "Other Renewables": 0.0005,
+      "Other Fossil": 0.0042,
+      "Other Renewables": 0.0006,
       "Solar": 0.0427,
       "Wind": 0.2176
     },
@@ -5073,8 +5073,8 @@
       "Gas": 0.3646,
       "Hydro": 0.0279,
       "Nuclear": 0.188,
-      "Other Fossil": 0.0069,
-      "Other Renewables": 0.0005,
+      "Other Fossil": 0.0068,
+      "Other Renewables": 0.0006,
       "Solar": 0.0465,
       "Wind": 0.272
     },
@@ -5085,51 +5085,51 @@
       "Hydro": 0.0271,
       "Nuclear": 0.1762,
       "Other Fossil": 0.0085,
-      "Other Renewables": 0.0006,
+      "Other Renewables": 0.0007,
       "Solar": 0.0443,
       "Wind": 0.2307
     },
     "2022": {
       "Bioenergy": 0.0549,
-      "Coal": 0.0198,
+      "Coal": 0.0197,
       "Gas": 0.4064,
       "Hydro": 0.0157,
       "Nuclear": 0.1663,
-      "Other Fossil": 0.0097,
+      "Other Fossil": 0.0096,
       "Other Renewables": 0.0002,
       "Solar": 0.0458,
       "Wind": 0.2815
     },
     "2023": {
       "Bioenergy": 0.0536,
-      "Coal": 0.0235,
+      "Coal": 0.0234,
       "Gas": 0.3519,
       "Hydro": 0.0279,
       "Nuclear": 0.1641,
-      "Other Fossil": 0.0117,
-      "Other Renewables": 0.0006,
+      "Other Fossil": 0.0116,
+      "Other Renewables": 0.0007,
       "Solar": 0.0524,
       "Wind": 0.3143
     },
     "2024": {
       "Bioenergy": 0.0742,
-      "Coal": 0.0222,
+      "Coal": 0.0221,
       "Gas": 0.3011,
       "Hydro": 0.0364,
       "Nuclear": 0.1692,
       "Other Fossil": 0.0151,
-      "Other Renewables": 0.0009,
+      "Other Renewables": 0.001,
       "Solar": 0.0625,
-      "Wind": 0.3183
+      "Wind": 0.3184
     },
     "2025": {
       "Bioenergy": 0.0764,
       "Coal": 0.0148,
-      "Gas": 0.3184,
+      "Gas": 0.3183,
       "Hydro": 0.0303,
       "Nuclear": 0.1596,
       "Other Fossil": 0.0191,
-      "Other Renewables": 0.0008,
+      "Other Renewables": 0.001,
       "Solar": 0.0946,
       "Wind": 0.2859
     }
@@ -5272,7 +5272,7 @@
     "2024": {
       "Bioenergy": 0.0016,
       "Coal": 0.0406,
-      "Gas": 0.2033,
+      "Gas": 0.2034,
       "Hydro": 0.7311,
       "Nuclear": 0.0039,
       "Other Fossil": 0.0004,
@@ -5281,9 +5281,9 @@
       "Wind": 0.0136
     },
     "2025": {
-      "Bioenergy": 0.0021,
-      "Coal": 0.0533,
-      "Gas": 0.1195,
+      "Bioenergy": 0.0022,
+      "Coal": 0.0531,
+      "Gas": 0.1196,
       "Hydro": 0.7938,
       "Nuclear": 0.0055,
       "Other Fossil": 0.0006,
@@ -5927,12 +5927,12 @@
   "GR": {
     "2019": {
       "Bioenergy": 0.0055,
-      "Coal": 0.245,
+      "Coal": 0.2449,
       "Gas": 0.3951,
-      "Hydro": 0.0917,
+      "Hydro": 0.0916,
       "Nuclear": 0.045,
-      "Other Fossil": 0.0044,
-      "Other Renewables": 0.0013,
+      "Other Fossil": 0.0042,
+      "Other Renewables": 0.0016,
       "Solar": 0.0782,
       "Wind": 0.1337
     },
@@ -5942,8 +5942,8 @@
       "Gas": 0.4453,
       "Hydro": 0.0858,
       "Nuclear": 0.0402,
-      "Other Fossil": 0.0041,
-      "Other Renewables": 0.0013,
+      "Other Fossil": 0.0039,
+      "Other Renewables": 0.0016,
       "Solar": 0.0911,
       "Wind": 0.1767
     },
@@ -5953,8 +5953,8 @@
       "Gas": 0.4655,
       "Hydro": 0.1067,
       "Nuclear": 0.0178,
-      "Other Fossil": 0.0018,
-      "Other Renewables": 0.0006,
+      "Other Fossil": 0.0017,
+      "Other Renewables": 0.0007,
       "Solar": 0.0935,
       "Wind": 0.1893
     },
@@ -5964,8 +5964,8 @@
       "Gas": 0.4241,
       "Hydro": 0.0858,
       "Nuclear": 0.0186,
-      "Other Fossil": 0.0021,
-      "Other Renewables": 0.0007,
+      "Other Fossil": 0.002,
+      "Other Renewables": 0.0008,
       "Solar": 0.1233,
       "Wind": 0.2102
     },
@@ -5975,8 +5975,8 @@
       "Gas": 0.3652,
       "Hydro": 0.0928,
       "Nuclear": 0.0222,
-      "Other Fossil": 0.0024,
-      "Other Renewables": 0.0008,
+      "Other Fossil": 0.0023,
+      "Other Renewables": 0.0009,
       "Solar": 0.1783,
       "Wind": 0.2195
     },
@@ -6379,7 +6379,7 @@
       "Bioenergy": 0.0081,
       "Coal": 0.5641,
       "Gas": 0.3397,
-      "Hydro": 0.0302,
+      "Hydro": 0.0303,
       "Nuclear": 0.0131,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.0013,
@@ -6387,15 +6387,15 @@
       "Wind": 0.0185
     },
     "2025": {
-      "Bioenergy": 0.0079,
-      "Coal": 0.5575,
-      "Gas": 0.3386,
-      "Hydro": 0.0291,
-      "Nuclear": 0.0135,
-      "Other Fossil": 0.0051,
-      "Other Renewables": 0.0014,
-      "Solar": 0.0261,
-      "Wind": 0.0208
+      "Bioenergy": 0.008,
+      "Coal": 0.5571,
+      "Gas": 0.3389,
+      "Hydro": 0.029,
+      "Nuclear": 0.0134,
+      "Other Fossil": 0.0052,
+      "Other Renewables": 0.0013,
+      "Solar": 0.0263,
+      "Wind": 0.0207
     }
   },
   "HN": {
@@ -6480,12 +6480,12 @@
   "HR": {
     "2019": {
       "Bioenergy": 0.0341,
-      "Coal": 0.1433,
+      "Coal": 0.1432,
       "Gas": 0.2138,
       "Hydro": 0.3586,
       "Nuclear": 0.0802,
-      "Other Fossil": 0.0107,
-      "Other Renewables": 0.0284,
+      "Other Fossil": 0.0103,
+      "Other Renewables": 0.0289,
       "Solar": 0.0173,
       "Wind": 0.1136
     },
@@ -6493,10 +6493,10 @@
       "Bioenergy": 0.0377,
       "Coal": 0.1104,
       "Gas": 0.253,
-      "Hydro": 0.3434,
+      "Hydro": 0.3433,
       "Nuclear": 0.0647,
-      "Other Fossil": 0.009,
-      "Other Renewables": 0.031,
+      "Other Fossil": 0.0087,
+      "Other Renewables": 0.0314,
       "Solar": 0.0181,
       "Wind": 0.1328
     },
@@ -6506,19 +6506,19 @@
       "Gas": 0.2098,
       "Hydro": 0.3909,
       "Nuclear": 0.0548,
-      "Other Fossil": 0.0076,
-      "Other Renewables": 0.0285,
+      "Other Fossil": 0.0074,
+      "Other Renewables": 0.0288,
       "Solar": 0.0175,
       "Wind": 0.1379
     },
     "2022": {
       "Bioenergy": 0.0448,
       "Coal": 0.1276,
-      "Gas": 0.2541,
+      "Gas": 0.254,
       "Hydro": 0.297,
-      "Nuclear": 0.0571,
-      "Other Fossil": 0.0077,
-      "Other Renewables": 0.0245,
+      "Nuclear": 0.057,
+      "Other Fossil": 0.0074,
+      "Other Renewables": 0.0249,
       "Solar": 0.0273,
       "Wind": 0.1601
     },
@@ -6526,34 +6526,34 @@
       "Bioenergy": 0.0378,
       "Coal": 0.0878,
       "Gas": 0.224,
-      "Hydro": 0.4061,
+      "Hydro": 0.406,
       "Nuclear": 0.0293,
-      "Other Fossil": 0.0091,
-      "Other Renewables": 0.0154,
+      "Other Fossil": 0.0089,
+      "Other Renewables": 0.0156,
       "Solar": 0.0327,
       "Wind": 0.1578
     },
     "2024": {
       "Bioenergy": 0.0399,
-      "Coal": 0.0738,
+      "Coal": 0.0736,
       "Gas": 0.2145,
-      "Hydro": 0.3471,
+      "Hydro": 0.3469,
       "Nuclear": 0.0541,
-      "Other Fossil": 0.0099,
-      "Other Renewables": 0.0164,
+      "Other Fossil": 0.0098,
+      "Other Renewables": 0.0168,
       "Solar": 0.0708,
-      "Wind": 0.1733
+      "Wind": 0.1736
     },
     "2025": {
       "Bioenergy": 0.0396,
       "Coal": 0.0508,
-      "Gas": 0.1882,
-      "Hydro": 0.3178,
-      "Nuclear": 0.062,
+      "Gas": 0.1881,
+      "Hydro": 0.3177,
+      "Nuclear": 0.0619,
       "Other Fossil": 0.0094,
-      "Other Renewables": 0.0165,
-      "Solar": 0.1158,
-      "Wind": 0.1998
+      "Other Renewables": 0.0169,
+      "Solar": 0.1156,
+      "Wind": 0.1999
     }
   },
   "HT": {
@@ -6638,12 +6638,12 @@
   "HU": {
     "2019": {
       "Bioenergy": 0.0301,
-      "Coal": 0.1402,
+      "Coal": 0.1401,
       "Gas": 0.2463,
       "Hydro": 0.0532,
       "Nuclear": 0.415,
-      "Other Fossil": 0.0261,
-      "Other Renewables": 0.0046,
+      "Other Fossil": 0.0258,
+      "Other Renewables": 0.005,
       "Solar": 0.0417,
       "Wind": 0.0428
     },
@@ -6653,8 +6653,8 @@
       "Gas": 0.2511,
       "Hydro": 0.0536,
       "Nuclear": 0.4032,
-      "Other Fossil": 0.0219,
-      "Other Renewables": 0.0046,
+      "Other Fossil": 0.0216,
+      "Other Renewables": 0.005,
       "Solar": 0.065,
       "Wind": 0.0434
     },
@@ -6662,56 +6662,56 @@
       "Bioenergy": 0.0325,
       "Coal": 0.1087,
       "Gas": 0.2574,
-      "Hydro": 0.0509,
+      "Hydro": 0.0508,
       "Nuclear": 0.3865,
-      "Other Fossil": 0.0227,
-      "Other Renewables": 0.0045,
+      "Other Fossil": 0.0224,
+      "Other Renewables": 0.0048,
       "Solar": 0.0948,
       "Wind": 0.042
     },
     "2022": {
       "Bioenergy": 0.0333,
       "Coal": 0.109,
-      "Gas": 0.2425,
+      "Gas": 0.2424,
       "Hydro": 0.0448,
-      "Nuclear": 0.3818,
-      "Other Fossil": 0.0221,
-      "Other Renewables": 0.0045,
+      "Nuclear": 0.3817,
+      "Other Fossil": 0.0218,
+      "Other Renewables": 0.0049,
       "Solar": 0.1178,
       "Wind": 0.0442
     },
     "2023": {
       "Bioenergy": 0.024,
-      "Coal": 0.098,
+      "Coal": 0.0979,
       "Gas": 0.2078,
       "Hydro": 0.0474,
       "Nuclear": 0.3887,
-      "Other Fossil": 0.0195,
-      "Other Renewables": 0.0029,
+      "Other Fossil": 0.0193,
+      "Other Renewables": 0.0032,
       "Solar": 0.1648,
       "Wind": 0.047
     },
     "2024": {
       "Bioenergy": 0.0264,
-      "Coal": 0.0876,
-      "Gas": 0.1912,
+      "Coal": 0.0873,
+      "Gas": 0.1911,
       "Hydro": 0.0454,
-      "Nuclear": 0.371,
-      "Other Fossil": 0.0179,
-      "Other Renewables": 0.0041,
+      "Nuclear": 0.3709,
+      "Other Fossil": 0.0178,
+      "Other Renewables": 0.0044,
       "Solar": 0.2117,
-      "Wind": 0.0447
+      "Wind": 0.0449
     },
     "2025": {
       "Bioenergy": 0.0358,
-      "Coal": 0.0565,
+      "Coal": 0.0564,
       "Gas": 0.1752,
       "Hydro": 0.0328,
       "Nuclear": 0.3524,
       "Other Fossil": 0.016,
-      "Other Renewables": 0.0037,
+      "Other Renewables": 0.0039,
       "Solar": 0.2943,
-      "Wind": 0.0332
+      "Wind": 0.0333
     }
   },
   "ID": {
@@ -6785,7 +6785,7 @@
       "Bioenergy": 0.0411,
       "Coal": 0.5902,
       "Gas": 0.2102,
-      "Hydro": 0.0719,
+      "Hydro": 0.0718,
       "Nuclear": 0.0003,
       "Other Fossil": 0.0356,
       "Other Renewables": 0.0476,
@@ -6800,8 +6800,8 @@
       "Gas": 0.4792,
       "Hydro": 0.0454,
       "Nuclear": 0.0256,
-      "Other Fossil": 0.0868,
-      "Other Renewables": 0.0007,
+      "Other Fossil": 0.0867,
+      "Other Renewables": 0.0009,
       "Solar": 0.0034,
       "Wind": 0.3138
     },
@@ -6810,9 +6810,9 @@
       "Coal": 0.0381,
       "Gas": 0.4697,
       "Hydro": 0.0466,
-      "Nuclear": 0.0234,
-      "Other Fossil": 0.0608,
-      "Other Renewables": 0.0008,
+      "Nuclear": 0.0233,
+      "Other Fossil": 0.0607,
+      "Other Renewables": 0.0009,
       "Solar": 0.004,
       "Wind": 0.3492
     },
@@ -6822,19 +6822,19 @@
       "Gas": 0.4477,
       "Hydro": 0.0397,
       "Nuclear": 0.0219,
-      "Other Fossil": 0.0758,
-      "Other Renewables": 0.0007,
+      "Other Fossil": 0.0757,
+      "Other Renewables": 0.0008,
       "Solar": 0.0043,
       "Wind": 0.3039
     },
     "2022": {
       "Bioenergy": 0.006,
       "Coal": 0.0868,
-      "Gas": 0.4647,
+      "Gas": 0.4646,
       "Hydro": 0.0324,
       "Nuclear": 0.0163,
-      "Other Fossil": 0.0584,
-      "Other Renewables": 0.0006,
+      "Other Fossil": 0.0583,
+      "Other Renewables": 0.0007,
       "Solar": 0.0043,
       "Wind": 0.3307
     },
@@ -6844,32 +6844,32 @@
       "Gas": 0.4505,
       "Hydro": 0.0484,
       "Nuclear": 0.0245,
-      "Other Fossil": 0.036,
-      "Other Renewables": 0.0009,
+      "Other Fossil": 0.0359,
+      "Other Renewables": 0.001,
       "Solar": 0.0196,
       "Wind": 0.3594
     },
     "2024": {
       "Bioenergy": 0.0079,
-      "Coal": 0.0482,
-      "Gas": 0.4403,
-      "Hydro": 0.05,
+      "Coal": 0.0481,
+      "Gas": 0.4402,
+      "Hydro": 0.0499,
       "Nuclear": 0.0318,
-      "Other Fossil": 0.0388,
-      "Other Renewables": 0.0011,
+      "Other Fossil": 0.0387,
+      "Other Renewables": 0.0013,
       "Solar": 0.0333,
-      "Wind": 0.3486
+      "Wind": 0.3488
     },
     "2025": {
       "Bioenergy": 0.0087,
       "Coal": 0.0425,
-      "Gas": 0.4414,
-      "Hydro": 0.0465,
-      "Nuclear": 0.0377,
+      "Gas": 0.4413,
+      "Hydro": 0.0464,
+      "Nuclear": 0.0376,
       "Other Fossil": 0.0375,
-      "Other Renewables": 0.0014,
-      "Solar": 0.0597,
-      "Wind": 0.3247
+      "Other Renewables": 0.0016,
+      "Solar": 0.0596,
+      "Wind": 0.3248
     }
   },
   "IL": {
@@ -7274,8 +7274,8 @@
       "Gas": 0.4794,
       "Hydro": 0.1571,
       "Nuclear": 0.0278,
-      "Other Fossil": 0.0257,
-      "Other Renewables": 0.0191,
+      "Other Fossil": 0.0256,
+      "Other Renewables": 0.0193,
       "Solar": 0.0787,
       "Wind": 0.0757
     },
@@ -7285,30 +7285,30 @@
       "Gas": 0.4674,
       "Hydro": 0.1702,
       "Nuclear": 0.0241,
-      "Other Fossil": 0.0282,
-      "Other Renewables": 0.0202,
+      "Other Fossil": 0.0281,
+      "Other Renewables": 0.0204,
       "Solar": 0.0881,
       "Wind": 0.0768
     },
     "2021": {
       "Bioenergy": 0.0615,
-      "Coal": 0.0647,
+      "Coal": 0.0646,
       "Gas": 0.4753,
       "Hydro": 0.1583,
       "Nuclear": 0.0307,
-      "Other Fossil": 0.0222,
-      "Other Renewables": 0.0191,
+      "Other Fossil": 0.022,
+      "Other Renewables": 0.0193,
       "Solar": 0.0866,
       "Wind": 0.0817
     },
     "2022": {
       "Bioenergy": 0.0573,
       "Coal": 0.0918,
-      "Gas": 0.4817,
+      "Gas": 0.4816,
       "Hydro": 0.109,
       "Nuclear": 0.0275,
-      "Other Fossil": 0.0321,
-      "Other Renewables": 0.019,
+      "Other Fossil": 0.0319,
+      "Other Renewables": 0.0191,
       "Solar": 0.0988,
       "Wind": 0.0828
     },
@@ -7317,32 +7317,32 @@
       "Coal": 0.0664,
       "Gas": 0.4225,
       "Hydro": 0.1516,
-      "Nuclear": 0.0347,
-      "Other Fossil": 0.0332,
-      "Other Renewables": 0.0194,
+      "Nuclear": 0.0346,
+      "Other Fossil": 0.033,
+      "Other Renewables": 0.0196,
       "Solar": 0.1145,
       "Wind": 0.1017
     },
     "2024": {
       "Bioenergy": 0.0554,
-      "Coal": 0.0347,
+      "Coal": 0.0346,
       "Gas": 0.4079,
       "Hydro": 0.1861,
       "Nuclear": 0.0345,
-      "Other Fossil": 0.0337,
-      "Other Renewables": 0.0189,
+      "Other Fossil": 0.0336,
+      "Other Renewables": 0.0191,
       "Solar": 0.1323,
-      "Wind": 0.0964
+      "Wind": 0.0966
     },
     "2025": {
       "Bioenergy": 0.0501,
       "Coal": 0.032,
-      "Gas": 0.4169,
-      "Hydro": 0.1418,
-      "Nuclear": 0.0329,
+      "Gas": 0.4168,
+      "Hydro": 0.1417,
+      "Nuclear": 0.0328,
       "Other Fossil": 0.0206,
-      "Other Renewables": 0.0196,
-      "Solar": 0.1905,
+      "Other Renewables": 0.0199,
+      "Solar": 0.1904,
       "Wind": 0.0957
     }
   },
@@ -7572,15 +7572,15 @@
       "Wind": 0.0198
     },
     "2025": {
-      "Bioenergy": 0.0625,
-      "Coal": 0.2722,
-      "Gas": 0.2922,
-      "Hydro": 0.0771,
-      "Nuclear": 0.0989,
-      "Other Fossil": 0.0358,
-      "Other Renewables": 0.0109,
-      "Solar": 0.1266,
-      "Wind": 0.0239
+      "Bioenergy": 0.0613,
+      "Coal": 0.2674,
+      "Gas": 0.2871,
+      "Hydro": 0.0762,
+      "Nuclear": 0.0972,
+      "Other Fossil": 0.0364,
+      "Other Renewables": 0.01,
+      "Solar": 0.1415,
+      "Wind": 0.0228
     }
   },
   "KE": {
@@ -7731,14 +7731,14 @@
     },
     "2025": {
       "Bioenergy": 0.0015,
-      "Coal": 0.0965,
-      "Gas": 0.0152,
+      "Coal": 0.0964,
+      "Gas": 0.0153,
       "Hydro": 0.8351,
       "Nuclear": 0.004,
       "Other Fossil": 0.0335,
       "Other Renewables": 0.0004,
-      "Solar": 0.0076,
-      "Wind": 0.0062
+      "Solar": 0.0077,
+      "Wind": 0.0061
     }
   },
   "KH": {
@@ -7809,14 +7809,14 @@
       "Wind": 0.0186
     },
     "2025": {
-      "Bioenergy": 0.0134,
-      "Coal": 0.4562,
-      "Gas": 0.0237,
+      "Bioenergy": 0.0135,
+      "Coal": 0.4559,
+      "Gas": 0.024,
       "Hydro": 0.3797,
-      "Nuclear": 0.0136,
+      "Nuclear": 0.0135,
       "Other Fossil": 0.0552,
-      "Other Renewables": 0.0014,
-      "Solar": 0.0358,
+      "Other Renewables": 0.0013,
+      "Solar": 0.0361,
       "Wind": 0.0209
     }
   },
@@ -8204,15 +8204,15 @@
       "Wind": 0.0057
     },
     "2025": {
-      "Bioenergy": 0.0204,
-      "Coal": 0.2481,
-      "Gas": 0.2808,
-      "Hydro": 0.0069,
-      "Nuclear": 0.341,
-      "Other Fossil": 0.0079,
-      "Other Renewables": 0.016,
-      "Solar": 0.0723,
-      "Wind": 0.0066
+      "Bioenergy": 0.0201,
+      "Coal": 0.2698,
+      "Gas": 0.2797,
+      "Hydro": 0.0058,
+      "Nuclear": 0.3257,
+      "Other Fossil": 0.0073,
+      "Other Renewables": 0.0154,
+      "Solar": 0.07,
+      "Wind": 0.0062
     }
   },
   "KW": {
@@ -8442,14 +8442,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5383,
-      "Gas": 0.2915,
-      "Hydro": 0.0957,
+      "Coal": 0.5386,
+      "Gas": 0.2917,
+      "Hydro": 0.0952,
       "Nuclear": 0,
-      "Other Fossil": 0.0146,
+      "Other Fossil": 0.0148,
       "Other Renewables": 0,
-      "Solar": 0.0191,
-      "Wind": 0.0408
+      "Solar": 0.0194,
+      "Wind": 0.0402
     }
   },
   "LA": {
@@ -8929,113 +8929,113 @@
   "LT": {
     "2019": {
       "Bioenergy": 0.0548,
-      "Coal": 0.1273,
-      "Gas": 0.2293,
+      "Coal": 0.1272,
+      "Gas": 0.2292,
       "Hydro": 0.1558,
-      "Nuclear": 0.1729,
-      "Other Fossil": 0.0419,
-      "Other Renewables": 0.005,
+      "Nuclear": 0.1728,
+      "Other Fossil": 0.0412,
+      "Other Renewables": 0.0061,
       "Solar": 0.0292,
-      "Wind": 0.1838
+      "Wind": 0.1837
     },
     "2020": {
-      "Bioenergy": 0.0533,
+      "Bioenergy": 0.0532,
       "Coal": 0.0994,
       "Gas": 0.293,
-      "Hydro": 0.1414,
+      "Hydro": 0.1413,
       "Nuclear": 0.1446,
-      "Other Fossil": 0.0384,
-      "Other Renewables": 0.0047,
+      "Other Fossil": 0.0377,
+      "Other Renewables": 0.0056,
       "Solar": 0.0301,
-      "Wind": 0.1951
+      "Wind": 0.195
     },
     "2021": {
       "Bioenergy": 0.0535,
-      "Coal": 0.1134,
-      "Gas": 0.2749,
+      "Coal": 0.1133,
+      "Gas": 0.2748,
       "Hydro": 0.1487,
-      "Nuclear": 0.1592,
-      "Other Fossil": 0.0372,
-      "Other Renewables": 0.0049,
+      "Nuclear": 0.1591,
+      "Other Fossil": 0.0364,
+      "Other Renewables": 0.0059,
       "Solar": 0.037,
-      "Wind": 0.1714
+      "Wind": 0.1713
     },
     "2022": {
       "Bioenergy": 0.0518,
       "Coal": 0.1191,
       "Gas": 0.2264,
       "Hydro": 0.1429,
-      "Nuclear": 0.1409,
-      "Other Fossil": 0.0477,
-      "Other Renewables": 0.005,
+      "Nuclear": 0.1408,
+      "Other Fossil": 0.047,
+      "Other Renewables": 0.006,
       "Solar": 0.0647,
       "Wind": 0.2013
     },
     "2023": {
       "Bioenergy": 0.0386,
-      "Coal": 0.0878,
+      "Coal": 0.0877,
       "Gas": 0.1948,
       "Hydro": 0.1348,
-      "Nuclear": 0.1201,
-      "Other Fossil": 0.0579,
-      "Other Renewables": 0.0042,
+      "Nuclear": 0.12,
+      "Other Fossil": 0.0573,
+      "Other Renewables": 0.005,
       "Solar": 0.0901,
-      "Wind": 0.2716
+      "Wind": 0.2715
     },
     "2024": {
-      "Bioenergy": 0.0307,
-      "Coal": 0.0599,
-      "Gas": 0.1657,
-      "Hydro": 0.1097,
+      "Bioenergy": 0.0306,
+      "Coal": 0.0594,
+      "Gas": 0.1656,
+      "Hydro": 0.1096,
       "Nuclear": 0.091,
-      "Other Fossil": 0.0844,
-      "Other Renewables": 0.0031,
+      "Other Fossil": 0.0842,
+      "Other Renewables": 0.0037,
       "Solar": 0.1408,
-      "Wind": 0.3147
+      "Wind": 0.3151
     },
     "2025": {
       "Bioenergy": 0.0198,
       "Coal": 0.0347,
-      "Gas": 0.2016,
-      "Hydro": 0.0666,
-      "Nuclear": 0.0525,
+      "Gas": 0.2015,
+      "Hydro": 0.0665,
+      "Nuclear": 0.0524,
       "Other Fossil": 0.1003,
-      "Other Renewables": 0.0018,
-      "Solar": 0.1949,
-      "Wind": 0.3277
+      "Other Renewables": 0.0021,
+      "Solar": 0.1947,
+      "Wind": 0.3278
     }
   },
   "LU": {
     "2019": {
       "Bioenergy": 0.0571,
-      "Coal": 0.1333,
-      "Gas": 0.2557,
-      "Hydro": 0.1484,
+      "Coal": 0.1332,
+      "Gas": 0.2556,
+      "Hydro": 0.1483,
       "Nuclear": 0.1811,
-      "Other Fossil": 0.0412,
-      "Other Renewables": 0.0053,
+      "Other Fossil": 0.0404,
+      "Other Renewables": 0.0064,
       "Solar": 0.05,
-      "Wind": 0.1279
+      "Wind": 0.1278
     },
     "2020": {
       "Bioenergy": 0.0716,
       "Coal": 0.115,
-      "Gas": 0.2387,
+      "Gas": 0.2386,
       "Hydro": 0.1521,
-      "Nuclear": 0.1667,
-      "Other Fossil": 0.0394,
-      "Other Renewables": 0.0054,
+      "Nuclear": 0.1666,
+      "Other Fossil": 0.0386,
+      "Other Renewables": 0.0065,
       "Solar": 0.0574,
-      "Wind": 0.1537
+      "Wind": 0.1536
     },
     "2021": {
-      "Bioenergy": 0.0796,
-      "Coal": 0.1195,
-      "Gas": 0.2384,
+      "Bioenergy": 0.0795,
+      "Coal": 0.1194,
+      "Gas": 0.2383,
       "Hydro": 0.1479,
-      "Nuclear": 0.1683,
-      "Other Fossil": 0.0382,
-      "Other Renewables": 0.0052,
+      "Nuclear": 0.1682,
+      "Other Fossil": 0.0374,
+      "Other Renewables": 0.0063,
       "Solar": 0.0657,
       "Wind": 0.1373
     },
@@ -9045,65 +9045,65 @@
       "Gas": 0.2273,
       "Hydro": 0.1303,
       "Nuclear": 0.1497,
-      "Other Fossil": 0.0389,
-      "Other Renewables": 0.0053,
+      "Other Fossil": 0.0381,
+      "Other Renewables": 0.0063,
       "Solar": 0.0886,
       "Wind": 0.1485
     },
     "2023": {
       "Bioenergy": 0.0551,
-      "Coal": 0.1094,
-      "Gas": 0.1978,
-      "Hydro": 0.1441,
+      "Coal": 0.1093,
+      "Gas": 0.1977,
+      "Hydro": 0.144,
       "Nuclear": 0.1504,
-      "Other Fossil": 0.0372,
-      "Other Renewables": 0.0053,
+      "Other Fossil": 0.0365,
+      "Other Renewables": 0.0063,
       "Solar": 0.1004,
-      "Wind": 0.2004
+      "Wind": 0.2003
     },
     "2024": {
-      "Bioenergy": 0.0734,
-      "Coal": 0.0968,
-      "Gas": 0.1813,
-      "Hydro": 0.1556,
-      "Nuclear": 0.1476,
-      "Other Fossil": 0.0376,
-      "Other Renewables": 0.005,
+      "Bioenergy": 0.0733,
+      "Coal": 0.0962,
+      "Gas": 0.1811,
+      "Hydro": 0.1554,
+      "Nuclear": 0.1474,
+      "Other Fossil": 0.0372,
+      "Other Renewables": 0.0059,
       "Solar": 0.1172,
-      "Wind": 0.1855
+      "Wind": 0.1862
     },
     "2025": {
       "Bioenergy": 0.0696,
       "Coal": 0.0901,
-      "Gas": 0.1781,
-      "Hydro": 0.1276,
-      "Nuclear": 0.1406,
+      "Gas": 0.1778,
+      "Hydro": 0.1274,
+      "Nuclear": 0.1404,
       "Other Fossil": 0.0391,
-      "Other Renewables": 0.005,
-      "Solar": 0.1822,
-      "Wind": 0.1678
+      "Other Renewables": 0.0058,
+      "Solar": 0.1819,
+      "Wind": 0.1679
     }
   },
   "LV": {
     "2019": {
       "Bioenergy": 0.0834,
       "Coal": 0.0273,
-      "Gas": 0.4216,
+      "Gas": 0.4215,
       "Hydro": 0.304,
       "Nuclear": 0.0372,
-      "Other Fossil": 0.0865,
-      "Other Renewables": 0.0011,
+      "Other Fossil": 0.0864,
+      "Other Renewables": 0.0013,
       "Solar": 0.0055,
       "Wind": 0.0333
     },
     "2020": {
       "Bioenergy": 0.0802,
       "Coal": 0.0347,
-      "Gas": 0.3002,
+      "Gas": 0.3001,
       "Hydro": 0.3948,
       "Nuclear": 0.0499,
-      "Other Fossil": 0.087,
-      "Other Renewables": 0.0016,
+      "Other Fossil": 0.0868,
+      "Other Renewables": 0.002,
       "Solar": 0.0098,
       "Wind": 0.0417
     },
@@ -9113,8 +9113,8 @@
       "Gas": 0.3106,
       "Hydro": 0.3884,
       "Nuclear": 0.0575,
-      "Other Fossil": 0.0715,
-      "Other Renewables": 0.0018,
+      "Other Fossil": 0.0712,
+      "Other Renewables": 0.0021,
       "Solar": 0.0124,
       "Wind": 0.0405
     },
@@ -9123,9 +9123,9 @@
       "Coal": 0.0577,
       "Gas": 0.2507,
       "Hydro": 0.4325,
-      "Nuclear": 0.0676,
-      "Other Fossil": 0.0452,
-      "Other Renewables": 0.0025,
+      "Nuclear": 0.0675,
+      "Other Fossil": 0.0449,
+      "Other Renewables": 0.0029,
       "Solar": 0.0235,
       "Wind": 0.0623
     },
@@ -9135,32 +9135,32 @@
       "Gas": 0.2483,
       "Hydro": 0.4886,
       "Nuclear": 0.0567,
-      "Other Fossil": 0.0243,
-      "Other Renewables": 0.002,
+      "Other Fossil": 0.0241,
+      "Other Renewables": 0.0023,
       "Solar": 0.0414,
-      "Wind": 0.0637
+      "Wind": 0.0636
     },
     "2024": {
       "Bioenergy": 0.0562,
-      "Coal": 0.0384,
-      "Gas": 0.2653,
-      "Hydro": 0.4255,
+      "Coal": 0.0382,
+      "Gas": 0.2652,
+      "Hydro": 0.4253,
       "Nuclear": 0.0583,
-      "Other Fossil": 0.0094,
-      "Other Renewables": 0.002,
+      "Other Fossil": 0.0092,
+      "Other Renewables": 0.0023,
       "Solar": 0.0777,
-      "Wind": 0.0672
+      "Wind": 0.0675
     },
     "2025": {
-      "Bioenergy": 0.0583,
+      "Bioenergy": 0.0582,
       "Coal": 0.0169,
       "Gas": 0.2298,
-      "Hydro": 0.4784,
+      "Hydro": 0.4783,
       "Nuclear": 0.0281,
       "Other Fossil": 0.0114,
-      "Other Renewables": 0.001,
-      "Solar": 0.1327,
-      "Wind": 0.0434
+      "Other Renewables": 0.0012,
+      "Solar": 0.1326,
+      "Wind": 0.0435
     }
   },
   "LY": {
@@ -9327,9 +9327,9 @@
       "Coal": 0.0169,
       "Gas": 0.8667,
       "Hydro": 0.0642,
-      "Nuclear": 0.023,
-      "Other Fossil": 0.0023,
-      "Other Renewables": 0.0007,
+      "Nuclear": 0.0229,
+      "Other Fossil": 0.0022,
+      "Other Renewables": 0.0008,
       "Solar": 0.0032,
       "Wind": 0.0156
     },
@@ -9339,7 +9339,7 @@
       "Gas": 0.9323,
       "Hydro": 0.0524,
       "Nuclear": 0.0058,
-      "Other Fossil": 0.0006,
+      "Other Fossil": 0.0005,
       "Other Renewables": 0.0002,
       "Solar": 0.0006,
       "Wind": 0.0034
@@ -9361,8 +9361,8 @@
       "Gas": 0.8342,
       "Hydro": 0.0717,
       "Nuclear": 0.0307,
-      "Other Fossil": 0.0036,
-      "Other Renewables": 0.0011,
+      "Other Fossil": 0.0035,
+      "Other Renewables": 0.0013,
       "Solar": 0.008,
       "Wind": 0.0182
     },
@@ -9384,7 +9384,7 @@
       "Hydro": 0.0477,
       "Nuclear": 0.0067,
       "Other Fossil": 0.0007,
-      "Other Renewables": 0.0002,
+      "Other Renewables": 0.0003,
       "Solar": 0.0125,
       "Wind": 0.0132
     },
@@ -9395,7 +9395,7 @@
       "Hydro": 0.0452,
       "Nuclear": 0.0041,
       "Other Fossil": 0.0004,
-      "Other Renewables": 0.0001,
+      "Other Renewables": 0.0002,
       "Solar": 0.0231,
       "Wind": 0.0024
     }
@@ -9404,11 +9404,11 @@
     "2019": {
       "Bioenergy": 0.0073,
       "Coal": 0.3521,
-      "Gas": 0.0683,
+      "Gas": 0.0682,
       "Hydro": 0.4065,
       "Nuclear": 0.0599,
-      "Other Fossil": 0.0059,
-      "Other Renewables": 0.0018,
+      "Other Fossil": 0.0056,
+      "Other Renewables": 0.0022,
       "Solar": 0.01,
       "Wind": 0.0882
     },
@@ -9418,10 +9418,10 @@
       "Gas": 0.0578,
       "Hydro": 0.3623,
       "Nuclear": 0.0514,
-      "Other Fossil": 0.0051,
-      "Other Renewables": 0.0016,
+      "Other Fossil": 0.0048,
+      "Other Renewables": 0.002,
       "Solar": 0.0084,
-      "Wind": 0.104
+      "Wind": 0.1039
     },
     "2021": {
       "Bioenergy": 0.0043,
@@ -9429,8 +9429,8 @@
       "Gas": 0.0351,
       "Hydro": 0.4625,
       "Nuclear": 0.0315,
-      "Other Fossil": 0.0031,
-      "Other Renewables": 0.001,
+      "Other Fossil": 0.003,
+      "Other Renewables": 0.0012,
       "Solar": 0.0087,
       "Wind": 0.0929
     },
@@ -9441,7 +9441,7 @@
       "Hydro": 0.4114,
       "Nuclear": 0.0058,
       "Other Fossil": 0.0007,
-      "Other Renewables": 0.0002,
+      "Other Renewables": 0.0003,
       "Solar": 0.0013,
       "Wind": 0.104
     },
@@ -9457,26 +9457,26 @@
       "Wind": 0.0889
     },
     "2024": {
-      "Bioenergy": 0.0039,
-      "Coal": 0.3764,
+      "Bioenergy": 0.0038,
+      "Coal": 0.3763,
       "Gas": 0.0311,
-      "Hydro": 0.4323,
+      "Hydro": 0.4322,
       "Nuclear": 0.0288,
       "Other Fossil": 0.003,
-      "Other Renewables": 0.001,
+      "Other Renewables": 0.0011,
       "Solar": 0.032,
-      "Wind": 0.0916
+      "Wind": 0.0917
     },
     "2025": {
-      "Bioenergy": 0.0139,
+      "Bioenergy": 0.0138,
       "Coal": 0.1957,
-      "Gas": 0.1095,
-      "Hydro": 0.3428,
-      "Nuclear": 0.0997,
+      "Gas": 0.1093,
+      "Hydro": 0.3426,
+      "Nuclear": 0.0996,
       "Other Fossil": 0.0101,
-      "Other Renewables": 0.0036,
-      "Solar": 0.0975,
-      "Wind": 0.1273
+      "Other Renewables": 0.0041,
+      "Solar": 0.0972,
+      "Wind": 0.1275
     }
   },
   "MG": {
@@ -9563,32 +9563,32 @@
       "Bioenergy": 0.0176,
       "Coal": 0.4987,
       "Gas": 0.1869,
-      "Hydro": 0.2007,
+      "Hydro": 0.2006,
       "Nuclear": 0.0476,
-      "Other Fossil": 0.0048,
-      "Other Renewables": 0.0014,
+      "Other Fossil": 0.0046,
+      "Other Renewables": 0.0017,
       "Solar": 0.005,
       "Wind": 0.0373
     },
     "2020": {
       "Bioenergy": 0.0221,
       "Coal": 0.3945,
-      "Gas": 0.2281,
+      "Gas": 0.228,
       "Hydro": 0.2314,
       "Nuclear": 0.0609,
-      "Other Fossil": 0.0061,
-      "Other Renewables": 0.0019,
+      "Other Fossil": 0.0058,
+      "Other Renewables": 0.0023,
       "Solar": 0.0081,
       "Wind": 0.0469
     },
     "2021": {
       "Bioenergy": 0.0209,
       "Coal": 0.3269,
-      "Gas": 0.2819,
+      "Gas": 0.2818,
       "Hydro": 0.2474,
-      "Nuclear": 0.0611,
-      "Other Fossil": 0.0061,
-      "Other Renewables": 0.0019,
+      "Nuclear": 0.061,
+      "Other Fossil": 0.0058,
+      "Other Renewables": 0.0023,
       "Solar": 0.0098,
       "Wind": 0.044
     },
@@ -9598,8 +9598,8 @@
       "Gas": 0.1884,
       "Hydro": 0.2296,
       "Nuclear": 0.0413,
-      "Other Fossil": 0.0397,
-      "Other Renewables": 0.0014,
+      "Other Fossil": 0.0395,
+      "Other Renewables": 0.0017,
       "Solar": 0.0125,
       "Wind": 0.0391
     },
@@ -9616,24 +9616,24 @@
     },
     "2024": {
       "Bioenergy": 0.0191,
-      "Coal": 0.3934,
+      "Coal": 0.3933,
       "Gas": 0.2329,
       "Hydro": 0.2409,
       "Nuclear": 0.0182,
-      "Other Fossil": 0.0019,
-      "Other Renewables": 0.0006,
+      "Other Fossil": 0.0018,
+      "Other Renewables": 0.0007,
       "Solar": 0.0502,
-      "Wind": 0.0428
+      "Wind": 0.0429
     },
     "2025": {
       "Bioenergy": 0.008,
       "Coal": 0.4016,
       "Gas": 0.2653,
-      "Hydro": 0.1717,
-      "Nuclear": 0.0459,
+      "Hydro": 0.1716,
+      "Nuclear": 0.0458,
       "Other Fossil": 0.0046,
-      "Other Renewables": 0.0016,
-      "Solar": 0.0492,
+      "Other Renewables": 0.0019,
+      "Solar": 0.0491,
       "Wind": 0.0521
     }
   },
@@ -9931,10 +9931,10 @@
       "Wind": 0.06
     },
     "2024": {
-      "Bioenergy": 0.0558,
-      "Coal": 0.4675,
+      "Bioenergy": 0.0557,
+      "Coal": 0.4674,
       "Gas": 0.1613,
-      "Hydro": 0.1031,
+      "Hydro": 0.1032,
       "Nuclear": 0.0448,
       "Other Fossil": 0.034,
       "Other Renewables": 0.0045,
@@ -9942,15 +9942,15 @@
       "Wind": 0.063
     },
     "2025": {
-      "Bioenergy": 0.0551,
-      "Coal": 0.4449,
-      "Gas": 0.1575,
-      "Hydro": 0.0992,
-      "Nuclear": 0.0461,
-      "Other Fossil": 0.0342,
-      "Other Renewables": 0.0046,
-      "Solar": 0.0876,
-      "Wind": 0.0708
+      "Bioenergy": 0.0554,
+      "Coal": 0.4436,
+      "Gas": 0.1584,
+      "Hydro": 0.099,
+      "Nuclear": 0.0458,
+      "Other Fossil": 0.0343,
+      "Other Renewables": 0.0045,
+      "Solar": 0.0885,
+      "Wind": 0.0706
     }
   },
   "MQ": {
@@ -10197,19 +10197,19 @@
       "Gas": 0.8539,
       "Hydro": 0.0301,
       "Nuclear": 0.0414,
-      "Other Fossil": 0.0155,
-      "Other Renewables": 0.0012,
+      "Other Fossil": 0.0153,
+      "Other Renewables": 0.0015,
       "Solar": 0.0059,
       "Wind": 0.0165
     },
     "2020": {
       "Bioenergy": 0.0037,
-      "Coal": 0.0196,
+      "Coal": 0.0195,
       "Gas": 0.8798,
       "Hydro": 0.022,
       "Nuclear": 0.027,
-      "Other Fossil": 0.0298,
-      "Other Renewables": 0.0009,
+      "Other Fossil": 0.0297,
+      "Other Renewables": 0.0011,
       "Solar": 0.0044,
       "Wind": 0.0129
     },
@@ -10219,8 +10219,8 @@
       "Gas": 0.8673,
       "Hydro": 0.025,
       "Nuclear": 0.0334,
-      "Other Fossil": 0.0235,
-      "Other Renewables": 0.001,
+      "Other Fossil": 0.0233,
+      "Other Renewables": 0.0012,
       "Solar": 0.0056,
       "Wind": 0.0151
     },
@@ -10230,8 +10230,8 @@
       "Gas": 0.816,
       "Hydro": 0.0267,
       "Nuclear": 0.0338,
-      "Other Fossil": 0.0278,
-      "Other Renewables": 0.0012,
+      "Other Fossil": 0.0276,
+      "Other Renewables": 0.0014,
       "Solar": 0.0418,
       "Wind": 0.019
     },
@@ -10241,32 +10241,32 @@
       "Gas": 0.7653,
       "Hydro": 0.0265,
       "Nuclear": 0.0311,
-      "Other Fossil": 0.0081,
-      "Other Renewables": 0.0011,
+      "Other Fossil": 0.008,
+      "Other Renewables": 0.0013,
       "Solar": 0.1213,
       "Wind": 0.0199
     },
     "2024": {
       "Bioenergy": 0.0063,
-      "Coal": 0.0297,
-      "Gas": 0.7038,
-      "Hydro": 0.0406,
+      "Coal": 0.0295,
+      "Gas": 0.7037,
+      "Hydro": 0.0405,
       "Nuclear": 0.046,
-      "Other Fossil": 0.0071,
-      "Other Renewables": 0.0016,
+      "Other Fossil": 0.007,
+      "Other Renewables": 0.0018,
       "Solar": 0.1369,
-      "Wind": 0.0281
+      "Wind": 0.0283
     },
     "2025": {
-      "Bioenergy": 0.0062,
-      "Coal": 0.0281,
-      "Gas": 0.6724,
-      "Hydro": 0.0372,
-      "Nuclear": 0.0442,
-      "Other Fossil": 0.0119,
-      "Other Renewables": 0.0016,
-      "Solar": 0.1722,
-      "Wind": 0.0263
+      "Bioenergy": 0.0066,
+      "Coal": 0.0299,
+      "Gas": 0.6682,
+      "Hydro": 0.04,
+      "Nuclear": 0.0476,
+      "Other Fossil": 0.0117,
+      "Other Renewables": 0.002,
+      "Solar": 0.1659,
+      "Wind": 0.0281
     }
   },
   "MU": {
@@ -10575,14 +10575,14 @@
     },
     "2025": {
       "Bioenergy": 0.0002,
-      "Coal": 0.0782,
-      "Gas": 0.5953,
-      "Hydro": 0.0755,
-      "Nuclear": 0.0288,
-      "Other Fossil": 0.0901,
+      "Coal": 0.0777,
+      "Gas": 0.6011,
+      "Hydro": 0.0725,
+      "Nuclear": 0.0284,
+      "Other Fossil": 0.0909,
       "Other Renewables": 0.0092,
-      "Solar": 0.057,
-      "Wind": 0.0657
+      "Solar": 0.0567,
+      "Wind": 0.0633
     }
   },
   "MY": {
@@ -10653,9 +10653,9 @@
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0246,
+      "Bioenergy": 0.0247,
       "Coal": 0.4559,
-      "Gas": 0.3122,
+      "Gas": 0.3121,
       "Hydro": 0.183,
       "Nuclear": 0,
       "Other Fossil": 0.0057,
@@ -11130,7 +11130,7 @@
       "Bioenergy": 0.1684,
       "Coal": 0.0034,
       "Gas": 0.0208,
-      "Hydro": 0.0845,
+      "Hydro": 0.0846,
       "Nuclear": 0.0017,
       "Other Fossil": 0.3977,
       "Other Renewables": 0.1561,
@@ -11146,7 +11146,7 @@
       "Hydro": 0.0048,
       "Nuclear": 0.0356,
       "Other Fossil": 0.0268,
-      "Other Renewables": 0.0154,
+      "Other Renewables": 0.0155,
       "Solar": 0.0457,
       "Wind": 0.0959
     },
@@ -11156,7 +11156,7 @@
       "Gas": 0.582,
       "Hydro": 0.0021,
       "Nuclear": 0.0336,
-      "Other Fossil": 0.027,
+      "Other Fossil": 0.0269,
       "Other Renewables": 0.0144,
       "Solar": 0.0694,
       "Wind": 0.1269
@@ -11164,11 +11164,11 @@
     "2021": {
       "Bioenergy": 0.0861,
       "Coal": 0.1162,
-      "Gas": 0.4734,
+      "Gas": 0.4733,
       "Hydro": 0.0051,
       "Nuclear": 0.0342,
       "Other Fossil": 0.0262,
-      "Other Renewables": 0.0158,
+      "Other Renewables": 0.0159,
       "Solar": 0.0994,
       "Wind": 0.1436
     },
@@ -11224,8 +11224,8 @@
       "Gas": 0.03,
       "Hydro": 0.9106,
       "Nuclear": 0.0079,
-      "Other Fossil": 0.0021,
-      "Other Renewables": 0.0002,
+      "Other Fossil": 0.002,
+      "Other Renewables": 0.0003,
       "Solar": 0.0008,
       "Wind": 0.0417
     },
@@ -11364,14 +11364,14 @@
       "Wind": 0.0166
     },
     "2025": {
-      "Bioenergy": 0.0042,
-      "Coal": 0.1084,
-      "Gas": 0.0195,
+      "Bioenergy": 0.0043,
+      "Coal": 0.1081,
+      "Gas": 0.0198,
       "Hydro": 0.8041,
       "Nuclear": 0.0112,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.0011,
-      "Solar": 0.0316,
+      "Solar": 0.0319,
       "Wind": 0.0185
     }
   },
@@ -11602,14 +11602,14 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0374,
-      "Gas": 0.113,
-      "Hydro": 0.5478,
+      "Coal": 0.0388,
+      "Gas": 0.116,
+      "Hydro": 0.5414,
       "Nuclear": 0,
       "Other Fossil": 0,
-      "Other Renewables": 0.2233,
+      "Other Renewables": 0.2239,
       "Solar": 0,
-      "Wind": 0.0782
+      "Wind": 0.0795
     }
   },
   "OM": {
@@ -11838,15 +11838,15 @@
       "Wind": 0.0651
     },
     "2025": {
-      "Bioenergy": 0.0054,
+      "Bioenergy": 0.0056,
       "Coal": 0,
-      "Gas": 0.342,
-      "Hydro": 0.5655,
+      "Gas": 0.3422,
+      "Hydro": 0.5626,
       "Nuclear": 0,
       "Other Fossil": 0.0012,
       "Other Renewables": 0,
-      "Solar": 0.0264,
-      "Wind": 0.0594
+      "Solar": 0.0269,
+      "Wind": 0.0614
     }
   },
   "PF": {
@@ -12173,7 +12173,7 @@
       "Hydro": 0.0209,
       "Nuclear": 0.015,
       "Other Fossil": 0.0153,
-      "Other Renewables": 0.0004,
+      "Other Renewables": 0.0005,
       "Solar": 0.0068,
       "Wind": 0.0995
     },
@@ -12183,8 +12183,8 @@
       "Gas": 0.1022,
       "Hydro": 0.0261,
       "Nuclear": 0.0179,
-      "Other Fossil": 0.0141,
-      "Other Renewables": 0.0006,
+      "Other Fossil": 0.014,
+      "Other Renewables": 0.0007,
       "Solar": 0.0172,
       "Wind": 0.1078
     },
@@ -12195,7 +12195,7 @@
       "Hydro": 0.0148,
       "Nuclear": 0.0043,
       "Other Fossil": 0.0167,
-      "Other Renewables": 0.0001,
+      "Other Renewables": 0.0002,
       "Solar": 0.0291,
       "Wind": 0.0953
     },
@@ -12487,9 +12487,9 @@
       "Coal": 0.1182,
       "Gas": 0.3428,
       "Hydro": 0.1514,
-      "Nuclear": 0.0207,
-      "Other Fossil": 0.009,
-      "Other Renewables": 0.0006,
+      "Nuclear": 0.0206,
+      "Other Fossil": 0.0089,
+      "Other Renewables": 0.0007,
       "Solar": 0.0292,
       "Wind": 0.2723
     },
@@ -12506,12 +12506,12 @@
     },
     "2021": {
       "Bioenergy": 0.0733,
-      "Coal": 0.0331,
+      "Coal": 0.033,
       "Gas": 0.3264,
       "Hydro": 0.2125,
       "Nuclear": 0.0255,
-      "Other Fossil": 0.0074,
-      "Other Renewables": 0.0008,
+      "Other Fossil": 0.0073,
+      "Other Renewables": 0.0009,
       "Solar": 0.0494,
       "Wind": 0.2715
     },
@@ -12521,8 +12521,8 @@
       "Gas": 0.3698,
       "Hydro": 0.1335,
       "Nuclear": 0.0376,
-      "Other Fossil": 0.0082,
-      "Other Renewables": 0.0014,
+      "Other Fossil": 0.008,
+      "Other Renewables": 0.0016,
       "Solar": 0.0749,
       "Wind": 0.2734
     },
@@ -12532,32 +12532,32 @@
       "Gas": 0.2402,
       "Hydro": 0.2266,
       "Nuclear": 0.0409,
-      "Other Fossil": 0.0079,
-      "Other Renewables": 0.0014,
+      "Other Fossil": 0.0078,
+      "Other Renewables": 0.0017,
       "Solar": 0.1186,
       "Wind": 0.2743
     },
     "2024": {
       "Bioenergy": 0.065,
-      "Coal": 0.0275,
-      "Gas": 0.141,
-      "Hydro": 0.2642,
+      "Coal": 0.0273,
+      "Gas": 0.1409,
+      "Hydro": 0.264,
       "Nuclear": 0.0429,
-      "Other Fossil": 0.009,
-      "Other Renewables": 0.0015,
+      "Other Fossil": 0.0089,
+      "Other Renewables": 0.0017,
       "Solar": 0.1565,
-      "Wind": 0.2925
+      "Wind": 0.2927
     },
     "2025": {
-      "Bioenergy": 0.0553,
+      "Bioenergy": 0.0554,
       "Coal": 0.0173,
-      "Gas": 0.1675,
-      "Hydro": 0.2763,
+      "Gas": 0.1678,
+      "Hydro": 0.2767,
       "Nuclear": 0.0286,
       "Other Fossil": 0.0067,
-      "Other Renewables": 0.001,
-      "Solar": 0.1907,
-      "Wind": 0.2566
+      "Other Renewables": 0.0012,
+      "Solar": 0.1892,
+      "Wind": 0.2571
     }
   },
   "PY": {
@@ -12801,22 +12801,22 @@
     "2019": {
       "Bioenergy": 0.008,
       "Coal": 0.2338,
-      "Gas": 0.1641,
+      "Gas": 0.164,
       "Hydro": 0.2619,
       "Nuclear": 0.1943,
-      "Other Fossil": 0.0009,
-      "Other Renewables": 0.0002,
+      "Other Fossil": 0.0008,
+      "Other Renewables": 0.0003,
       "Solar": 0.0234,
       "Wind": 0.1135
     },
     "2020": {
       "Bioenergy": 0.01,
       "Coal": 0.1724,
-      "Gas": 0.1872,
+      "Gas": 0.1871,
       "Hydro": 0.2734,
       "Nuclear": 0.2076,
       "Other Fossil": 0.001,
-      "Other Renewables": 0.0003,
+      "Other Renewables": 0.0004,
       "Solar": 0.0248,
       "Wind": 0.1234
     },
@@ -12827,7 +12827,7 @@
       "Hydro": 0.2889,
       "Nuclear": 0.1938,
       "Other Fossil": 0.001,
-      "Other Renewables": 0.0003,
+      "Other Renewables": 0.0004,
       "Solar": 0.0229,
       "Wind": 0.1106
     },
@@ -12837,7 +12837,7 @@
       "Gas": 0.1936,
       "Hydro": 0.2512,
       "Nuclear": 0.2011,
-      "Other Fossil": 0.0006,
+      "Other Fossil": 0.0005,
       "Other Renewables": 0.0002,
       "Solar": 0.0281,
       "Wind": 0.1244
@@ -12855,14 +12855,14 @@
     },
     "2024": {
       "Bioenergy": 0.0096,
-      "Coal": 0.1314,
+      "Coal": 0.1313,
       "Gas": 0.1951,
-      "Hydro": 0.2617,
+      "Hydro": 0.2616,
       "Nuclear": 0.2035,
       "Other Fossil": 0.0014,
-      "Other Renewables": 0.0005,
+      "Other Renewables": 0.0006,
       "Solar": 0.0781,
-      "Wind": 0.1187
+      "Wind": 0.1188
     },
     "2025": {
       "Bioenergy": 0.0106,
@@ -12871,8 +12871,8 @@
       "Hydro": 0.2349,
       "Nuclear": 0.1982,
       "Other Fossil": 0.0018,
-      "Other Renewables": 0.0006,
-      "Solar": 0.1279,
+      "Other Renewables": 0.0007,
+      "Solar": 0.1278,
       "Wind": 0.1132
     }
   },
@@ -12880,11 +12880,11 @@
     "2019": {
       "Bioenergy": 0.0044,
       "Coal": 0.6592,
-      "Gas": 0.0103,
+      "Gas": 0.0102,
       "Hydro": 0.2728,
       "Nuclear": 0.0086,
       "Other Fossil": 0.014,
-      "Other Renewables": 0.0002,
+      "Other Renewables": 0.0003,
       "Solar": 0.0008,
       "Wind": 0.0296
     },
@@ -12894,8 +12894,8 @@
       "Gas": 0.0058,
       "Hydro": 0.257,
       "Nuclear": 0.0047,
-      "Other Fossil": 0.0097,
-      "Other Renewables": 0.0001,
+      "Other Fossil": 0.0096,
+      "Other Renewables": 0.0002,
       "Solar": 0.0003,
       "Wind": 0.0299
     },
@@ -12905,7 +12905,7 @@
       "Gas": 0.015,
       "Hydro": 0.3097,
       "Nuclear": 0.0122,
-      "Other Fossil": 0.0232,
+      "Other Fossil": 0.0231,
       "Other Renewables": 0.0004,
       "Solar": 0.0018,
       "Wind": 0.036
@@ -12916,8 +12916,8 @@
       "Gas": 0.0468,
       "Hydro": 0.2545,
       "Nuclear": 0.0206,
-      "Other Fossil": 0.0093,
-      "Other Renewables": 0.0007,
+      "Other Fossil": 0.0092,
+      "Other Renewables": 0.0009,
       "Solar": 0.0055,
       "Wind": 0.039
     },
@@ -12934,7 +12934,7 @@
     },
     "2024": {
       "Bioenergy": 0.0085,
-      "Coal": 0.6057,
+      "Coal": 0.6056,
       "Gas": 0.0339,
       "Hydro": 0.2896,
       "Nuclear": 0.0112,
@@ -13500,12 +13500,12 @@
       "Bioenergy": 0.0353,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4123,
-      "Nuclear": 0.2798,
+      "Hydro": 0.4124,
+      "Nuclear": 0.2799,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0355,
-      "Wind": 0.237
+      "Solar": 0.0353,
+      "Wind": 0.2371
     }
   },
   "SG": {
@@ -13577,14 +13577,14 @@
     },
     "2025": {
       "Bioenergy": 0.0001,
-      "Coal": 0.0026,
-      "Gas": 0.9391,
-      "Hydro": 0.0006,
-      "Nuclear": 0.0003,
-      "Other Fossil": 0.0308,
+      "Coal": 0.0022,
+      "Gas": 0.9421,
+      "Hydro": 0.0005,
+      "Nuclear": 0.0002,
+      "Other Fossil": 0.0283,
       "Other Renewables": 0,
-      "Solar": 0.0261,
-      "Wind": 0.0004
+      "Solar": 0.0262,
+      "Wind": 0.0003
     }
   },
   "SH": {
@@ -13674,7 +13674,7 @@
       "Hydro": 0.2826,
       "Nuclear": 0.3683,
       "Other Fossil": 0.0082,
-      "Other Renewables": 0.0003,
+      "Other Renewables": 0.0004,
       "Solar": 0.0208,
       "Wind": 0.0047
     },
@@ -13696,7 +13696,7 @@
       "Hydro": 0.3064,
       "Nuclear": 0.3703,
       "Other Fossil": 0.0089,
-      "Other Renewables": 0.0003,
+      "Other Renewables": 0.0004,
       "Solar": 0.023,
       "Wind": 0.0044
     },
@@ -13706,8 +13706,8 @@
       "Gas": 0.0587,
       "Hydro": 0.2387,
       "Nuclear": 0.4118,
-      "Other Fossil": 0.0111,
-      "Other Renewables": 0.0007,
+      "Other Fossil": 0.011,
+      "Other Renewables": 0.0008,
       "Solar": 0.0331,
       "Wind": 0.0131
     },
@@ -13717,7 +13717,7 @@
       "Gas": 0.0366,
       "Hydro": 0.3318,
       "Nuclear": 0.3661,
-      "Other Fossil": 0.0091,
+      "Other Fossil": 0.009,
       "Other Renewables": 0.0003,
       "Solar": 0.0438,
       "Wind": 0.0057
@@ -13752,8 +13752,8 @@
       "Gas": 0.1074,
       "Hydro": 0.1558,
       "Nuclear": 0.536,
-      "Other Fossil": 0.062,
-      "Other Renewables": 0.0191,
+      "Other Fossil": 0.0619,
+      "Other Renewables": 0.0192,
       "Solar": 0.0195,
       "Wind": 0.0052
     },
@@ -13762,9 +13762,9 @@
       "Coal": 0.0427,
       "Gas": 0.1221,
       "Hydro": 0.161,
-      "Nuclear": 0.5464,
+      "Nuclear": 0.5463,
       "Other Fossil": 0.057,
-      "Other Renewables": 0.0173,
+      "Other Renewables": 0.0174,
       "Solar": 0.0186,
       "Wind": 0.0023
     },
@@ -13774,7 +13774,7 @@
       "Gas": 0.1406,
       "Hydro": 0.1457,
       "Nuclear": 0.533,
-      "Other Fossil": 0.0603,
+      "Other Fossil": 0.0602,
       "Other Renewables": 0.017,
       "Solar": 0.018,
       "Wind": 0.0036
@@ -14829,9 +14829,9 @@
       "Wind": 0.0263
     },
     "2024": {
-      "Bioenergy": 0.061,
+      "Bioenergy": 0.0609,
       "Coal": 0.2218,
-      "Gas": 0.5978,
+      "Gas": 0.5979,
       "Hydro": 0.0457,
       "Nuclear": 0.0076,
       "Other Fossil": 0.0019,
@@ -14841,14 +14841,14 @@
     },
     "2025": {
       "Bioenergy": 0.054,
-      "Coal": 0.2233,
-      "Gas": 0.5793,
-      "Hydro": 0.0498,
-      "Nuclear": 0.0073,
-      "Other Fossil": 0.0008,
+      "Coal": 0.2231,
+      "Gas": 0.5795,
+      "Hydro": 0.0497,
+      "Nuclear": 0.0072,
+      "Other Fossil": 0.0009,
       "Other Renewables": 0.0007,
-      "Solar": 0.0588,
-      "Wind": 0.026
+      "Solar": 0.059,
+      "Wind": 0.0259
     }
   },
   "TJ": {
@@ -14921,7 +14921,7 @@
     "2025": {
       "Bioenergy": 0.0003,
       "Coal": 0.1126,
-      "Gas": 0.0244,
+      "Gas": 0.0245,
       "Hydro": 0.8584,
       "Nuclear": 0.0009,
       "Other Fossil": 0.0001,
@@ -15314,15 +15314,15 @@
       "Wind": 0.1071
     },
     "2025": {
-      "Bioenergy": 0.0236,
-      "Coal": 0.323,
-      "Gas": 0.2114,
-      "Hydro": 0.189,
+      "Bioenergy": 0.0235,
+      "Coal": 0.3246,
+      "Gas": 0.2109,
+      "Hydro": 0.1842,
       "Nuclear": 0.0004,
       "Other Fossil": 0.0031,
       "Other Renewables": 0.0292,
-      "Solar": 0.112,
-      "Wind": 0.1085
+      "Solar": 0.1114,
+      "Wind": 0.1128
     }
   },
   "TT": {
@@ -15789,13 +15789,13 @@
     },
     "2025": {
       "Bioenergy": 0.01,
-      "Coal": 0.1649,
-      "Gas": 0.3973,
-      "Hydro": 0.0546,
-      "Nuclear": 0.1711,
-      "Other Fossil": 0.0075,
+      "Coal": 0.1638,
+      "Gas": 0.3991,
+      "Hydro": 0.0548,
+      "Nuclear": 0.171,
+      "Other Fossil": 0.0066,
       "Other Renewables": 0.0038,
-      "Solar": 0.0891,
+      "Solar": 0.0893,
       "Wind": 0.1016
     }
   },
@@ -16550,8 +16550,8 @@
       "Gas": 0.0232,
       "Hydro": 0.0323,
       "Nuclear": 0.0176,
-      "Other Fossil": 0.0019,
-      "Other Renewables": 0.0006,
+      "Other Fossil": 0.0018,
+      "Other Renewables": 0.0007,
       "Solar": 0.0018,
       "Wind": 0.061
     },
@@ -16561,31 +16561,31 @@
       "Gas": 0.0326,
       "Hydro": 0.0751,
       "Nuclear": 0.0264,
-      "Other Fossil": 0.0028,
-      "Other Renewables": 0.0009,
+      "Other Fossil": 0.0027,
+      "Other Renewables": 0.0011,
       "Solar": 0.0065,
       "Wind": 0.0739
     },
     "2024": {
       "Bioenergy": 0.0034,
-      "Coal": 0.8203,
+      "Coal": 0.8201,
       "Gas": 0.0308,
       "Hydro": 0.0472,
       "Nuclear": 0.025,
-      "Other Fossil": 0.0026,
-      "Other Renewables": 0.0008,
+      "Other Fossil": 0.0025,
+      "Other Renewables": 0.001,
       "Solar": 0.0052,
-      "Wind": 0.0647
+      "Wind": 0.0648
     },
     "2025": {
       "Bioenergy": 0.0067,
       "Coal": 0.7027,
-      "Gas": 0.0571,
+      "Gas": 0.057,
       "Hydro": 0.0815,
       "Nuclear": 0.047,
       "Other Fossil": 0.0047,
-      "Other Renewables": 0.0017,
-      "Solar": 0.0213,
+      "Other Renewables": 0.0019,
+      "Solar": 0.0212,
       "Wind": 0.0773
     }
   },
@@ -16737,14 +16737,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.8038,
+      "Coal": 0.8061,
       "Gas": 0,
-      "Hydro": 0.0086,
+      "Hydro": 0.0076,
       "Nuclear": 0.0386,
-      "Other Fossil": 0.0209,
+      "Other Fossil": 0.0195,
       "Other Renewables": 0.001,
-      "Solar": 0.0791,
-      "Wind": 0.0479
+      "Solar": 0.0793,
+      "Wind": 0.048
     }
   },
   "ZM": {