npm - @digital4better/data - Versions diffs - 1.3.39 → 1.3.41 - Mend

@digital4better/data 1.3.39 → 1.3.41

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

Files changed (86) hide show

package/README.md +12 -3
package/data/ai/models.csv +8 -0
package/data/ai/models.json +274 -0
package/data/cloud/accelerators.csv +1 -0
package/data/cloud/accelerators.json +9 -0
package/data/cloud/aws-regions.csv +32 -32
package/data/cloud/aws-regions.json +68 -68
package/data/cloud/azure-regions.csv +10 -10
package/data/cloud/azure-regions.json +66 -42
package/data/cloud/cpus.csv +16 -0
package/data/cloud/cpus.json +194 -0
package/data/cloud/gcp-regions.csv +39 -39
package/data/cloud/gcp-regions.json +73 -73
package/data/cloud/oracle-regions.csv +46 -0
package/data/cloud/oracle-regions.json +548 -0
package/data/cloud/oracle-vms.csv +141 -0
package/data/cloud/oracle-vms.json +2759 -0
package/data/cloud/ovhcloud-regions.csv +21 -21
package/data/cloud/ovhcloud-regions.json +68 -35
package/data/cloud/scaleway-regions.csv +9 -9
package/data/cloud/scaleway-regions.json +21 -21
package/data/factor/continent-monthly-green.csv +172 -172
package/data/factor/continent-monthly-green.json +1531 -1531
package/data/factor/continent-monthly.csv +173 -173
package/data/factor/continent-monthly.json +1521 -1521
package/data/factor/continent-yearly-green.csv +27 -27
package/data/factor/continent-yearly-green.json +223 -223
package/data/factor/continent-yearly.csv +26 -26
package/data/factor/continent-yearly.json +227 -227
package/data/factor/country-monthly-green.csv +796 -796
package/data/factor/country-monthly-green.json +6458 -6458
package/data/factor/country-monthly.csv +936 -936
package/data/factor/country-monthly.json +6311 -6311
package/data/factor/country-yearly-green.csv +198 -198
package/data/factor/country-yearly-green.json +1470 -1470
package/data/factor/country-yearly.csv +214 -214
package/data/factor/country-yearly.json +1502 -1502
package/data/factor/subdivision-monthly-green.csv +141 -141
package/data/factor/subdivision-monthly-green.json +1263 -1263
package/data/factor/subdivision-monthly.csv +141 -141
package/data/factor/subdivision-monthly.json +1269 -1269
package/data/factor/subdivision-yearly-green.csv +64 -64
package/data/factor/subdivision-yearly-green.json +574 -574
package/data/factor/subdivision-yearly.csv +64 -64
package/data/factor/subdivision-yearly.json +576 -576
package/data/factor/world-monthly-green.csv +87 -87
package/data/factor/world-monthly-green.json +783 -783
package/data/factor/world-monthly.csv +87 -87
package/data/factor/world-monthly.json +782 -782
package/data/factor/world-yearly-green.csv +8 -8
package/data/factor/world-yearly-green.json +72 -72
package/data/factor/world-yearly.csv +8 -8
package/data/factor/world-yearly.json +72 -72
package/data/mix/continent-monthly-green.csv +166 -166
package/data/mix/continent-monthly-green.json +559 -559
package/data/mix/continent-monthly.csv +166 -166
package/data/mix/continent-monthly.json +1078 -1078
package/data/mix/continent-yearly-green.csv +22 -22
package/data/mix/continent-yearly-green.json +72 -72
package/data/mix/continent-yearly.csv +22 -22
package/data/mix/continent-yearly.json +128 -128
package/data/mix/country-monthly-green.csv +567 -567
package/data/mix/country-monthly-green.json +1754 -1754
package/data/mix/country-monthly.csv +567 -567
package/data/mix/country-monthly.json +2585 -2585
package/data/mix/country-yearly-green.csv +122 -122
package/data/mix/country-yearly-green.json +409 -409
package/data/mix/country-yearly.csv +122 -122
package/data/mix/country-yearly.json +720 -720
package/data/mix/subdivision-monthly-green.csv +132 -132
package/data/mix/subdivision-monthly-green.json +411 -411
package/data/mix/subdivision-monthly.csv +132 -132
package/data/mix/subdivision-monthly.json +780 -780
package/data/mix/subdivision-yearly-green.csv +61 -61
package/data/mix/subdivision-yearly-green.json +196 -196
package/data/mix/subdivision-yearly.csv +61 -61
package/data/mix/subdivision-yearly.json +367 -367
package/data/mix/world-monthly-green.csv +87 -87
package/data/mix/world-monthly-green.json +345 -345
package/data/mix/world-monthly.csv +87 -87
package/data/mix/world-monthly.json +771 -771
package/data/mix/world-yearly-green.csv +8 -8
package/data/mix/world-yearly-green.json +31 -31
package/data/mix/world-yearly.csv +8 -8
package/data/mix/world-yearly.json +71 -71
package/package.json +1 -1

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

@@ -158,24 +158,24 @@
     },
     "2025": {
       "Bioenergy": 0.016,
-      "Coal": 0.4125,
+      "Coal": 0.4126,
       "Gas": 0.0732,
       "Hydro": 0.2849,
-      "Nuclear": 0.0407,
-      "Other Fossil": 0.0202,
+      "Nuclear": 0.0406,
+      "Other Fossil": 0.0201,
       "Other Renewables": 0.003,
       "Solar": 0.087,
       "Wind": 0.0626
     },
     "2026": {
-      "Bioenergy": 0.0177,
-      "Coal": 0.4252,
-      "Gas": 0.0818,
-      "Hydro": 0.257,
-      "Nuclear": 0.0399,
-      "Other Fossil": 0.0209,
-      "Other Renewables": 0.0008,
-      "Solar": 0.087,
+      "Bioenergy": 0.0178,
+      "Coal": 0.4253,
+      "Gas": 0.0779,
+      "Hydro": 0.2584,
+      "Nuclear": 0.0386,
+      "Other Fossil": 0.02,
+      "Other Renewables": 0.0034,
+      "Solar": 0.0886,
       "Wind": 0.0699
     }
   },
@@ -348,15 +348,15 @@
       "Wind": 0.0402
     },
     "2026": {
-      "Bioenergy": 0.009,
-      "Coal": 0.0425,
-      "Gas": 0.0819,
-      "Hydro": 0.7325,
-      "Nuclear": 0.0613,
+      "Bioenergy": 0.0091,
+      "Coal": 0.042,
+      "Gas": 0.0788,
+      "Hydro": 0.7321,
+      "Nuclear": 0.0615,
       "Other Fossil": 0.0066,
       "Other Renewables": 0.0023,
-      "Solar": 0.0152,
-      "Wind": 0.0487
+      "Solar": 0.0202,
+      "Wind": 0.0473
     }
   },
   "AM": {
@@ -611,22 +611,22 @@
       "Coal": 0.0203,
       "Gas": 0.4933,
       "Hydro": 0.2256,
-      "Nuclear": 0.0739,
+      "Nuclear": 0.0738,
       "Other Fossil": 0.0085,
       "Other Renewables": 0.0001,
       "Solar": 0.0368,
-      "Wind": 0.1298
+      "Wind": 0.1299
     },
     "2026": {
-      "Bioenergy": 0.0097,
-      "Coal": 0.0303,
-      "Gas": 0.5335,
-      "Hydro": 0.1844,
-      "Nuclear": 0.0685,
-      "Other Fossil": 0.0083,
+      "Bioenergy": 0.0099,
+      "Coal": 0.0397,
+      "Gas": 0.5513,
+      "Hydro": 0.1565,
+      "Nuclear": 0.0682,
+      "Other Fossil": 0.0084,
       "Other Renewables": 0,
-      "Solar": 0.0469,
-      "Wind": 0.1181
+      "Solar": 0.0471,
+      "Wind": 0.1189
     }
   },
   "AS": {
@@ -798,15 +798,15 @@
       "Wind": 0.1306
     },
     "2026": {
-      "Bioenergy": 0.0319,
-      "Coal": 0.0237,
-      "Gas": 0.2551,
-      "Hydro": 0.4139,
-      "Nuclear": 0.0341,
-      "Other Fossil": 0.0164,
+      "Bioenergy": 0.0337,
+      "Coal": 0.0233,
+      "Gas": 0.2277,
+      "Hydro": 0.4059,
+      "Nuclear": 0.0338,
+      "Other Fossil": 0.0174,
       "Other Renewables": 0.0013,
-      "Solar": 0.0834,
-      "Wind": 0.1403
+      "Solar": 0.1035,
+      "Wind": 0.1534
     }
   },
   "AU": {
@@ -819,84 +819,84 @@
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0.0789,
-      "Wind": 0.0848
+      "Wind": 0.0847
     },
     "2020": {
       "Bioenergy": 0.0013,
       "Coal": 0.6339,
-      "Gas": 0.1011,
+      "Gas": 0.101,
       "Hydro": 0.0643,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0997,
-      "Wind": 0.0997
+      "Solar": 0.0998,
+      "Wind": 0.0998
     },
     "2021": {
       "Bioenergy": 0.0012,
-      "Coal": 0.6055,
+      "Coal": 0.6052,
       "Gas": 0.079,
       "Hydro": 0.0705,
       "Nuclear": 0,
       "Other Fossil": 0.0004,
       "Other Renewables": 0,
-      "Solar": 0.1257,
+      "Solar": 0.1261,
       "Wind": 0.1176
     },
     "2022": {
       "Bioenergy": 0.001,
-      "Coal": 0.5584,
+      "Coal": 0.5583,
       "Gas": 0.091,
       "Hydro": 0.0727,
       "Nuclear": 0,
       "Other Fossil": 0.0003,
       "Other Renewables": 0,
       "Solar": 0.1479,
-      "Wind": 0.1286
+      "Wind": 0.1287
     },
     "2023": {
       "Bioenergy": 0.0014,
-      "Coal": 0.5405,
-      "Gas": 0.0757,
-      "Hydro": 0.0662,
+      "Coal": 0.5407,
+      "Gas": 0.075,
+      "Hydro": 0.0664,
       "Nuclear": 0,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.1815,
-      "Wind": 0.1346
+      "Solar": 0.1821,
+      "Wind": 0.1344
     },
     "2024": {
       "Bioenergy": 0.0019,
-      "Coal": 0.5324,
+      "Coal": 0.5323,
       "Gas": 0.0773,
-      "Hydro": 0.0571,
+      "Hydro": 0.057,
       "Nuclear": 0,
       "Other Fossil": 0.0003,
       "Other Renewables": 0,
-      "Solar": 0.1967,
+      "Solar": 0.1969,
       "Wind": 0.1343
     },
     "2025": {
       "Bioenergy": 0.0021,
       "Coal": 0.5014,
-      "Gas": 0.0674,
+      "Gas": 0.0673,
       "Hydro": 0.0533,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.2173,
+      "Solar": 0.2174,
       "Wind": 0.1585
     },
     "2026": {
-      "Bioenergy": 0.0035,
-      "Coal": 0.4676,
-      "Gas": 0.0509,
-      "Hydro": 0.0491,
+      "Bioenergy": 0.0033,
+      "Coal": 0.4803,
+      "Gas": 0.0513,
+      "Hydro": 0.0498,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.2707,
-      "Wind": 0.1583
+      "Solar": 0.2629,
+      "Wind": 0.1525
     }
   },
   "AW": {
@@ -1159,14 +1159,14 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Coal": 0.4285,
+      "Coal": 0.4625,
       "Gas": 0,
-      "Hydro": 0.529,
+      "Hydro": 0.5034,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0255,
-      "Wind": 0.017
+      "Solar": 0.0198,
+      "Wind": 0.0143
     }
   },
   "BB": {
@@ -1328,25 +1328,25 @@
     },
     "2025": {
       "Bioenergy": 0.0032,
-      "Coal": 0.3657,
+      "Coal": 0.3658,
       "Gas": 0.442,
-      "Hydro": 0.0277,
+      "Hydro": 0.0276,
       "Nuclear": 0.0082,
       "Other Fossil": 0.1104,
       "Other Renewables": 0.0006,
       "Solar": 0.0292,
-      "Wind": 0.0131
+      "Wind": 0.013
     },
     "2026": {
-      "Bioenergy": 0.0039,
-      "Coal": 0.4268,
-      "Gas": 0.4229,
-      "Hydro": 0.0201,
-      "Nuclear": 0.0088,
-      "Other Fossil": 0.0693,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0311,
-      "Wind": 0.0169
+      "Bioenergy": 0.0042,
+      "Coal": 0.4186,
+      "Gas": 0.4444,
+      "Hydro": 0.0214,
+      "Nuclear": 0.0091,
+      "Other Fossil": 0.049,
+      "Other Renewables": 0.0008,
+      "Solar": 0.0348,
+      "Wind": 0.0179
     }
   },
   "BE": {
@@ -1428,15 +1428,15 @@
       "Wind": 0.1776
     },
     "2026": {
-      "Bioenergy": 0.0138,
-      "Coal": 0.0296,
-      "Gas": 0.2427,
-      "Hydro": 0.0363,
-      "Nuclear": 0.2349,
-      "Other Fossil": 0.1384,
+      "Bioenergy": 0.0139,
+      "Coal": 0.0293,
+      "Gas": 0.2213,
+      "Hydro": 0.0367,
+      "Nuclear": 0.2401,
+      "Other Fossil": 0.1372,
       "Other Renewables": 0.0016,
-      "Solar": 0.0556,
-      "Wind": 0.2469
+      "Solar": 0.0895,
+      "Wind": 0.2304
     }
   },
   "BF": {
@@ -1608,15 +1608,15 @@
       "Wind": 0.0369
     },
     "2026": {
-      "Bioenergy": 0.0048,
-      "Coal": 0.2682,
-      "Gas": 0.0804,
-      "Hydro": 0.1447,
-      "Nuclear": 0.3665,
-      "Other Fossil": 0.0015,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0815,
-      "Wind": 0.0519
+      "Bioenergy": 0.0042,
+      "Coal": 0.2642,
+      "Gas": 0.0766,
+      "Hydro": 0.1349,
+      "Nuclear": 0.3699,
+      "Other Fossil": 0.001,
+      "Other Renewables": 0.0004,
+      "Solar": 0.103,
+      "Wind": 0.0459
     }
   },
   "BH": {
@@ -2150,13 +2150,13 @@
     "2026": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.619,
-      "Hydro": 0.3429,
+      "Gas": 0.67,
+      "Hydro": 0.2896,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0286,
-      "Wind": 0.0095
+      "Solar": 0.0303,
+      "Wind": 0.0101
     }
   },
   "BR": {
@@ -2238,15 +2238,15 @@
       "Wind": 0.1527
     },
     "2026": {
-      "Bioenergy": 0.0579,
-      "Coal": 0.0171,
-      "Gas": 0.0723,
-      "Hydro": 0.5998,
-      "Nuclear": 0.0075,
-      "Other Fossil": 0.0073,
+      "Bioenergy": 0.0557,
+      "Coal": 0.0149,
+      "Gas": 0.0757,
+      "Hydro": 0.5997,
+      "Nuclear": 0.0104,
+      "Other Fossil": 0.0068,
       "Other Renewables": 0,
-      "Solar": 0.1344,
-      "Wind": 0.1039
+      "Solar": 0.1327,
+      "Wind": 0.1042
     }
   },
   "BS": {
@@ -2688,15 +2688,15 @@
       "Wind": 0.0425
     },
     "2026": {
-      "Bioenergy": 0.18,
-      "Coal": 0.0154,
-      "Gas": 0.0987,
-      "Hydro": 0.5096,
-      "Nuclear": 0.0072,
-      "Other Fossil": 0.0954,
-      "Other Renewables": 0.0021,
-      "Solar": 0.052,
-      "Wind": 0.0396
+      "Bioenergy": 0.1803,
+      "Coal": 0.0163,
+      "Gas": 0.095,
+      "Hydro": 0.5159,
+      "Nuclear": 0.0066,
+      "Other Fossil": 0.0982,
+      "Other Renewables": 0.0022,
+      "Solar": 0.0511,
+      "Wind": 0.0344
     }
   },
   "CA": {
@@ -2778,15 +2778,15 @@
       "Wind": 0.081
     },
     "2026": {
-      "Bioenergy": 0.019,
-      "Coal": 0.0439,
-      "Gas": 0.176,
-      "Hydro": 0.5443,
-      "Nuclear": 0.1135,
-      "Other Fossil": 0.0092,
-      "Other Renewables": 0.0006,
+      "Bioenergy": 0.0181,
+      "Coal": 0.0403,
+      "Gas": 0.1649,
+      "Hydro": 0.5642,
+      "Nuclear": 0.113,
+      "Other Fossil": 0.0087,
+      "Other Renewables": 0.0009,
       "Solar": 0.0029,
-      "Wind": 0.0907
+      "Wind": 0.0869
     }
   },
   "CD": {
@@ -3138,15 +3138,15 @@
       "Wind": 0.0145
     },
     "2026": {
-      "Bioenergy": 0.0083,
-      "Coal": 0.039,
-      "Gas": 0.0757,
-      "Hydro": 0.4378,
-      "Nuclear": 0.277,
-      "Other Fossil": 0.0497,
-      "Other Renewables": 0.0021,
-      "Solar": 0.0637,
-      "Wind": 0.0468
+      "Bioenergy": 0.0075,
+      "Coal": 0.0347,
+      "Gas": 0.0662,
+      "Hydro": 0.4348,
+      "Nuclear": 0.2719,
+      "Other Fossil": 0.0546,
+      "Other Renewables": 0.0019,
+      "Solar": 0.0868,
+      "Wind": 0.0418
     }
   },
   "CI": {
@@ -3408,15 +3408,15 @@
       "Wind": 0.1426
     },
     "2026": {
-      "Bioenergy": 0.0195,
-      "Coal": 0.1343,
-      "Gas": 0.16,
-      "Hydro": 0.2262,
+      "Bioenergy": 0.0207,
+      "Coal": 0.1525,
+      "Gas": 0.1677,
+      "Hydro": 0.2082,
       "Nuclear": 0,
-      "Other Fossil": 0.0153,
+      "Other Fossil": 0.0143,
       "Other Renewables": 0.0014,
-      "Solar": 0.3067,
-      "Wind": 0.1367
+      "Solar": 0.3017,
+      "Wind": 0.1336
     }
   },
   "CM": {
@@ -3569,7 +3569,7 @@
       "Bioenergy": 0.02,
       "Coal": 0.591,
       "Gas": 0.0286,
-      "Hydro": 0.1292,
+      "Hydro": 0.1293,
       "Nuclear": 0.0451,
       "Other Fossil": 0.0017,
       "Other Renewables": 0,
@@ -3580,23 +3580,23 @@
       "Bioenergy": 0.0195,
       "Coal": 0.5555,
       "Gas": 0.0285,
-      "Hydro": 0.1273,
-      "Nuclear": 0.0465,
+      "Hydro": 0.1272,
+      "Nuclear": 0.0464,
       "Other Fossil": 0.0016,
       "Other Renewables": 0,
       "Solar": 0.1125,
       "Wind": 0.1087
     },
     "2026": {
-      "Bioenergy": 0.0208,
-      "Coal": 0.5715,
-      "Gas": 0.0312,
-      "Hydro": 0.0927,
-      "Nuclear": 0.0447,
+      "Bioenergy": 0.0207,
+      "Coal": 0.5674,
+      "Gas": 0.0309,
+      "Hydro": 0.0949,
+      "Nuclear": 0.0443,
       "Other Fossil": 0.0018,
       "Other Renewables": 0,
-      "Solar": 0.1125,
-      "Wind": 0.125
+      "Solar": 0.1188,
+      "Wind": 0.1213
     }
   },
   "CO": {
@@ -3768,15 +3768,15 @@
       "Wind": 0.1164
     },
     "2026": {
-      "Bioenergy": 0.0095,
-      "Coal": 0.0002,
-      "Gas": 0.0015,
-      "Hydro": 0.6836,
-      "Nuclear": 0.0001,
-      "Other Fossil": 0.0067,
-      "Other Renewables": 0.1157,
-      "Solar": 0.0006,
-      "Wind": 0.1819
+      "Bioenergy": 0.0099,
+      "Coal": 0.001,
+      "Gas": 0.0055,
+      "Hydro": 0.6468,
+      "Nuclear": 0.0004,
+      "Other Fossil": 0.0381,
+      "Other Renewables": 0.1153,
+      "Solar": 0.0023,
+      "Wind": 0.1807
     }
   },
   "CU": {
@@ -4043,10 +4043,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.7963,
+      "Other Fossil": 0.8197,
       "Other Renewables": 0,
-      "Solar": 0.1481,
-      "Wind": 0.0556
+      "Solar": 0.1311,
+      "Wind": 0.0492
     }
   },
   "CZ": {
@@ -4129,14 +4129,14 @@
     },
     "2026": {
       "Bioenergy": 0.0352,
-      "Coal": 0.4293,
-      "Gas": 0.1054,
-      "Hydro": 0.0174,
-      "Nuclear": 0.3477,
-      "Other Fossil": 0.0046,
-      "Other Renewables": 0.0286,
-      "Solar": 0.022,
-      "Wind": 0.0097
+      "Coal": 0.4246,
+      "Gas": 0.0922,
+      "Hydro": 0.0191,
+      "Nuclear": 0.3481,
+      "Other Fossil": 0.0055,
+      "Other Renewables": 0.0292,
+      "Solar": 0.0366,
+      "Wind": 0.0096
     }
   },
   "DE": {
@@ -4218,15 +4218,15 @@
       "Wind": 0.2717
     },
     "2026": {
-      "Bioenergy": 0.0766,
-      "Coal": 0.2246,
-      "Gas": 0.2248,
-      "Hydro": 0.0242,
+      "Bioenergy": 0.0787,
+      "Coal": 0.2257,
+      "Gas": 0.1952,
+      "Hydro": 0.0251,
       "Nuclear": 0,
-      "Other Fossil": 0.0364,
+      "Other Fossil": 0.0367,
       "Other Renewables": 0.0064,
-      "Solar": 0.0668,
-      "Wind": 0.3402
+      "Solar": 0.1174,
+      "Wind": 0.3148
     }
   },
   "DJ": {
@@ -4398,15 +4398,15 @@
       "Wind": 0.5028
     },
     "2026": {
-      "Bioenergy": 0.1411,
-      "Coal": 0.1145,
-      "Gas": 0.0961,
-      "Hydro": 0.0209,
-      "Nuclear": 0.0245,
-      "Other Fossil": 0.0345,
+      "Bioenergy": 0.1472,
+      "Coal": 0.0719,
+      "Gas": 0.0676,
+      "Hydro": 0.02,
+      "Nuclear": 0.0236,
+      "Other Fossil": 0.0493,
       "Other Renewables": 0.0009,
-      "Solar": 0.0301,
-      "Wind": 0.5374
+      "Solar": 0.0553,
+      "Wind": 0.5642
     }
   },
   "DM": {
@@ -4578,15 +4578,15 @@
       "Wind": 0.0485
     },
     "2026": {
-      "Bioenergy": 0.0105,
-      "Coal": 0.2984,
-      "Gas": 0.4398,
-      "Hydro": 0.0576,
+      "Bioenergy": 0.0111,
+      "Coal": 0.3056,
+      "Gas": 0.35,
+      "Hydro": 0.0667,
       "Nuclear": 0,
-      "Other Fossil": 0.0628,
+      "Other Fossil": 0.1222,
       "Other Renewables": 0,
-      "Solar": 0.089,
-      "Wind": 0.0419
+      "Solar": 0.0889,
+      "Wind": 0.0556
     }
   },
   "DZ": {
@@ -4758,15 +4758,15 @@
       "Wind": 0.0062
     },
     "2026": {
-      "Bioenergy": 0.0167,
-      "Coal": 0.0021,
-      "Gas": 0.0401,
-      "Hydro": 0.6103,
-      "Nuclear": 0.001,
-      "Other Fossil": 0.3158,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0055,
-      "Wind": 0.0083
+      "Bioenergy": 0.0043,
+      "Coal": 0.0014,
+      "Gas": 0.0356,
+      "Hydro": 0.6186,
+      "Nuclear": 0.0006,
+      "Other Fossil": 0.33,
+      "Other Renewables": 0.0002,
+      "Solar": 0.0035,
+      "Wind": 0.0061
     }
   },
   "EE": {
@@ -4840,7 +4840,7 @@
       "Bioenergy": 0.0657,
       "Coal": 0.0517,
       "Gas": 0.0971,
-      "Hydro": 0.0647,
+      "Hydro": 0.0648,
       "Nuclear": 0.0815,
       "Other Fossil": 0.26,
       "Other Renewables": 0.0032,
@@ -4848,15 +4848,15 @@
       "Wind": 0.2136
     },
     "2026": {
-      "Bioenergy": 0.0737,
-      "Coal": 0.0587,
-      "Gas": 0.1139,
-      "Hydro": 0.0708,
-      "Nuclear": 0.0846,
-      "Other Fossil": 0.3615,
-      "Other Renewables": 0.0031,
-      "Solar": 0.0361,
-      "Wind": 0.1974
+      "Bioenergy": 0.0731,
+      "Coal": 0.0585,
+      "Gas": 0.1114,
+      "Hydro": 0.0707,
+      "Nuclear": 0.0854,
+      "Other Fossil": 0.3116,
+      "Other Renewables": 0.0032,
+      "Solar": 0.0789,
+      "Wind": 0.2072
     }
   },
   "EG": {
@@ -4930,23 +4930,23 @@
       "Bioenergy": 0.0005,
       "Coal": 0,
       "Gas": 0.7891,
-      "Hydro": 0.0678,
+      "Hydro": 0.0674,
       "Nuclear": 0,
       "Other Fossil": 0.0729,
       "Other Renewables": 0,
-      "Solar": 0.03,
-      "Wind": 0.0397
+      "Solar": 0.0299,
+      "Wind": 0.0402
     },
     "2026": {
       "Bioenergy": 0.0005,
       "Coal": 0,
-      "Gas": 0.8053,
-      "Hydro": 0.0733,
+      "Gas": 0.8054,
+      "Hydro": 0.0683,
       "Nuclear": 0,
-      "Other Fossil": 0.0743,
+      "Other Fossil": 0.0742,
       "Other Renewables": 0,
-      "Solar": 0.0225,
-      "Wind": 0.0241
+      "Solar": 0.0215,
+      "Wind": 0.0301
     }
   },
   "ER": {
@@ -5118,15 +5118,15 @@
       "Wind": 0.2169
     },
     "2026": {
-      "Bioenergy": 0.0116,
-      "Coal": 0.0003,
-      "Gas": 0.1647,
-      "Hydro": 0.1773,
-      "Nuclear": 0.2107,
-      "Other Fossil": 0.0058,
-      "Other Renewables": 0.002,
-      "Solar": 0.1164,
-      "Wind": 0.311
+      "Bioenergy": 0.0129,
+      "Coal": 0.0005,
+      "Gas": 0.1686,
+      "Hydro": 0.169,
+      "Nuclear": 0.2051,
+      "Other Fossil": 0.0059,
+      "Other Renewables": 0.0022,
+      "Solar": 0.1462,
+      "Wind": 0.2898
     }
   },
   "ET": {
@@ -5298,15 +5298,15 @@
       "Wind": 0.2579
     },
     "2026": {
-      "Bioenergy": 0.1323,
-      "Coal": 0.0297,
-      "Gas": 0.0882,
-      "Hydro": 0.1538,
-      "Nuclear": 0.347,
-      "Other Fossil": 0.0696,
-      "Other Renewables": 0.0053,
-      "Solar": 0.007,
-      "Wind": 0.1671
+      "Bioenergy": 0.1296,
+      "Coal": 0.02,
+      "Gas": 0.075,
+      "Hydro": 0.1486,
+      "Nuclear": 0.3392,
+      "Other Fossil": 0.0577,
+      "Other Renewables": 0.0042,
+      "Solar": 0.0072,
+      "Wind": 0.2185
     }
   },
   "FJ": {
@@ -5658,15 +5658,15 @@
       "Wind": 0.0923
     },
     "2026": {
-      "Bioenergy": 0.0054,
+      "Bioenergy": 0.0057,
       "Coal": 0.0026,
-      "Gas": 0.0445,
-      "Hydro": 0.1069,
-      "Nuclear": 0.6851,
-      "Other Fossil": 0.0061,
+      "Gas": 0.044,
+      "Hydro": 0.1076,
+      "Nuclear": 0.6855,
+      "Other Fossil": 0.0066,
       "Other Renewables": 0,
-      "Solar": 0.0269,
-      "Wind": 0.1224
+      "Solar": 0.0366,
+      "Wind": 0.1114
     }
   },
   "GA": {
@@ -5816,37 +5816,37 @@
       "Wind": 0.3143
     },
     "2024": {
-      "Bioenergy": 0.0742,
+      "Bioenergy": 0.0741,
       "Coal": 0.022,
-      "Gas": 0.301,
+      "Gas": 0.3006,
       "Hydro": 0.0365,
-      "Nuclear": 0.1692,
-      "Other Fossil": 0.0151,
+      "Nuclear": 0.1689,
+      "Other Fossil": 0.015,
       "Other Renewables": 0.001,
-      "Solar": 0.0625,
-      "Wind": 0.3184
+      "Solar": 0.0624,
+      "Wind": 0.3195
     },
     "2025": {
       "Bioenergy": 0.0767,
       "Coal": 0.0135,
-      "Gas": 0.3106,
+      "Gas": 0.3107,
       "Hydro": 0.0302,
       "Nuclear": 0.1478,
       "Other Fossil": 0.0194,
       "Other Renewables": 0.0009,
       "Solar": 0.0787,
-      "Wind": 0.3223
+      "Wind": 0.3222
     },
     "2026": {
-      "Bioenergy": 0.0736,
-      "Coal": 0.0081,
-      "Gas": 0.3395,
-      "Hydro": 0.0213,
-      "Nuclear": 0.1222,
-      "Other Fossil": 0.0178,
-      "Other Renewables": 0.0004,
-      "Solar": 0.0241,
-      "Wind": 0.393
+      "Bioenergy": 0.0712,
+      "Coal": 0.0106,
+      "Gas": 0.3157,
+      "Hydro": 0.0263,
+      "Nuclear": 0.1264,
+      "Other Fossil": 0.0191,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0402,
+      "Wind": 0.39
     }
   },
   "GD": {
@@ -6007,10 +6007,10 @@
       "Wind": 0.0136
     },
     "2025": {
-      "Bioenergy": 0.0022,
+      "Bioenergy": 0.0023,
       "Coal": 0.0549,
       "Gas": 0.1951,
-      "Hydro": 0.7161,
+      "Hydro": 0.716,
       "Nuclear": 0.0056,
       "Other Fossil": 0.0006,
       "Other Renewables": 0.0004,
@@ -6018,15 +6018,15 @@
       "Wind": 0.016
     },
     "2026": {
-      "Bioenergy": 0.009,
-      "Coal": 0.2084,
-      "Gas": 0.2896,
-      "Hydro": 0.3887,
-      "Nuclear": 0.0201,
-      "Other Fossil": 0.0026,
-      "Other Renewables": 0.0004,
-      "Solar": 0.0392,
-      "Wind": 0.042
+      "Bioenergy": 0.0064,
+      "Coal": 0.1486,
+      "Gas": 0.279,
+      "Hydro": 0.488,
+      "Nuclear": 0.014,
+      "Other Fossil": 0.0016,
+      "Other Renewables": 0.0012,
+      "Solar": 0.0284,
+      "Wind": 0.0327
     }
   },
   "GF": {
@@ -6829,14 +6829,14 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Coal": 0.0582,
-      "Gas": 0.3766,
-      "Hydro": 0.1676,
+      "Coal": 0.0591,
+      "Gas": 0.3924,
+      "Hydro": 0.1435,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.1377,
-      "Wind": 0.26
+      "Solar": 0.1515,
+      "Wind": 0.2535
     }
   },
   "GT": {
@@ -7268,7 +7268,7 @@
     },
     "2025": {
       "Bioenergy": 0.0081,
-      "Coal": 0.5572,
+      "Coal": 0.5573,
       "Gas": 0.3389,
       "Hydro": 0.0304,
       "Nuclear": 0.0132,
@@ -7278,14 +7278,14 @@
       "Wind": 0.0204
     },
     "2026": {
-      "Bioenergy": 0.0086,
+      "Bioenergy": 0.0087,
       "Coal": 0.5614,
-      "Gas": 0.3417,
-      "Hydro": 0.0213,
-      "Nuclear": 0.013,
-      "Other Fossil": 0.0054,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0256,
+      "Gas": 0.3405,
+      "Hydro": 0.0218,
+      "Nuclear": 0.0126,
+      "Other Fossil": 0.0051,
+      "Other Renewables": 0.0011,
+      "Solar": 0.0262,
       "Wind": 0.0228
     }
   },
@@ -7368,15 +7368,15 @@
       "Wind": 0.0774
     },
     "2026": {
-      "Bioenergy": 0.0896,
-      "Coal": 0.0054,
-      "Gas": 0.0054,
-      "Hydro": 0.2329,
+      "Bioenergy": 0.0897,
+      "Coal": 0.0055,
+      "Gas": 0.0052,
+      "Hydro": 0.2333,
       "Nuclear": 0.0004,
-      "Other Fossil": 0.4565,
+      "Other Fossil": 0.4566,
       "Other Renewables": 0.0276,
       "Solar": 0.1049,
-      "Wind": 0.0773
+      "Wind": 0.077
     }
   },
   "HR": {
@@ -7458,15 +7458,15 @@
       "Wind": 0.2034
     },
     "2026": {
-      "Bioenergy": 0.035,
-      "Coal": 0.0758,
-      "Gas": 0.2236,
-      "Hydro": 0.4555,
-      "Nuclear": 0.0088,
-      "Other Fossil": 0.0073,
-      "Other Renewables": 0.0151,
-      "Solar": 0.0223,
-      "Wind": 0.1566
+      "Bioenergy": 0.0376,
+      "Coal": 0.0664,
+      "Gas": 0.2174,
+      "Hydro": 0.4098,
+      "Nuclear": 0.0273,
+      "Other Fossil": 0.007,
+      "Other Renewables": 0.0178,
+      "Solar": 0.0352,
+      "Wind": 0.1816
     }
   },
   "HT": {
@@ -7638,15 +7638,15 @@
       "Wind": 0.0365
     },
     "2026": {
-      "Bioenergy": 0.035,
-      "Coal": 0.0698,
-      "Gas": 0.3176,
-      "Hydro": 0.0544,
-      "Nuclear": 0.3349,
-      "Other Fossil": 0.0164,
-      "Other Renewables": 0.0045,
-      "Solar": 0.1092,
-      "Wind": 0.058
+      "Bioenergy": 0.0355,
+      "Coal": 0.0681,
+      "Gas": 0.2792,
+      "Hydro": 0.05,
+      "Nuclear": 0.355,
+      "Other Fossil": 0.0184,
+      "Other Renewables": 0.0044,
+      "Solar": 0.1352,
+      "Wind": 0.0543
     }
   },
   "ID": {
@@ -7734,7 +7734,7 @@
       "Hydro": 0.0717,
       "Nuclear": 0.0003,
       "Other Fossil": 0.0356,
-      "Other Renewables": 0.0475,
+      "Other Renewables": 0.0476,
       "Solar": 0.001,
       "Wind": 0.0021
     }
@@ -7818,105 +7818,105 @@
       "Wind": 0.342
     },
     "2026": {
-      "Bioenergy": 0.0186,
-      "Coal": 0.0302,
-      "Gas": 0.4167,
-      "Hydro": 0.061,
-      "Nuclear": 0.0379,
+      "Bioenergy": 0.0187,
+      "Coal": 0.0299,
+      "Gas": 0.4148,
+      "Hydro": 0.0609,
+      "Nuclear": 0.038,
       "Other Fossil": 0.0221,
       "Other Renewables": 0.0014,
-      "Solar": 0.0189,
-      "Wind": 0.3932
+      "Solar": 0.0219,
+      "Wind": 0.3923
     }
   },
   "IL": {
     "2019": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0176,
-      "Gas": 0.7023,
-      "Hydro": 0.0315,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.2338,
+      "Bioenergy": 0.0015,
+      "Coal": 0.3012,
+      "Gas": 0.634,
+      "Hydro": 0,
+      "Nuclear": 0,
+      "Other Fossil": 0.0165,
       "Other Renewables": 0,
-      "Solar": 0.0082,
-      "Wind": 0.0014
+      "Solar": 0.0441,
+      "Wind": 0.0026
     },
     "2020": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0176,
-      "Gas": 0.7023,
-      "Hydro": 0.0315,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.2338,
+      "Bioenergy": 0.0015,
+      "Coal": 0.3012,
+      "Gas": 0.634,
+      "Hydro": 0,
+      "Nuclear": 0,
+      "Other Fossil": 0.0165,
       "Other Renewables": 0,
-      "Solar": 0.0082,
-      "Wind": 0.0014
+      "Solar": 0.0441,
+      "Wind": 0.0026
     },
     "2021": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0176,
-      "Gas": 0.7023,
-      "Hydro": 0.0315,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.2338,
+      "Bioenergy": 0.0015,
+      "Coal": 0.3012,
+      "Gas": 0.634,
+      "Hydro": 0,
+      "Nuclear": 0,
+      "Other Fossil": 0.0165,
       "Other Renewables": 0,
-      "Solar": 0.0082,
-      "Wind": 0.0014
+      "Solar": 0.0441,
+      "Wind": 0.0026
     },
     "2022": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0176,
-      "Gas": 0.7023,
-      "Hydro": 0.0315,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.2338,
+      "Bioenergy": 0.0015,
+      "Coal": 0.3012,
+      "Gas": 0.634,
+      "Hydro": 0,
+      "Nuclear": 0,
+      "Other Fossil": 0.0165,
       "Other Renewables": 0,
-      "Solar": 0.0082,
-      "Wind": 0.0014
+      "Solar": 0.0441,
+      "Wind": 0.0026
     },
     "2023": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0176,
-      "Gas": 0.7023,
-      "Hydro": 0.0315,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.2338,
+      "Bioenergy": 0.0015,
+      "Coal": 0.3012,
+      "Gas": 0.634,
+      "Hydro": 0,
+      "Nuclear": 0,
+      "Other Fossil": 0.0165,
       "Other Renewables": 0,
-      "Solar": 0.0082,
-      "Wind": 0.0014
+      "Solar": 0.0441,
+      "Wind": 0.0026
     },
     "2024": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0176,
-      "Gas": 0.7023,
-      "Hydro": 0.0315,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.2338,
+      "Bioenergy": 0.0015,
+      "Coal": 0.3012,
+      "Gas": 0.634,
+      "Hydro": 0,
+      "Nuclear": 0,
+      "Other Fossil": 0.0165,
       "Other Renewables": 0,
-      "Solar": 0.0082,
-      "Wind": 0.0014
+      "Solar": 0.0441,
+      "Wind": 0.0026
     },
     "2025": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0176,
-      "Gas": 0.7023,
-      "Hydro": 0.0315,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.2338,
+      "Bioenergy": 0.0015,
+      "Coal": 0.3012,
+      "Gas": 0.634,
+      "Hydro": 0,
+      "Nuclear": 0,
+      "Other Fossil": 0.0165,
       "Other Renewables": 0,
-      "Solar": 0.0082,
-      "Wind": 0.0014
+      "Solar": 0.0441,
+      "Wind": 0.0026
     },
     "2026": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0176,
-      "Gas": 0.7023,
-      "Hydro": 0.0315,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.2338,
+      "Bioenergy": 0.0015,
+      "Coal": 0.3012,
+      "Gas": 0.634,
+      "Hydro": 0,
+      "Nuclear": 0,
+      "Other Fossil": 0.0165,
       "Other Renewables": 0,
-      "Solar": 0.0082,
-      "Wind": 0.0014
+      "Solar": 0.0441,
+      "Wind": 0.0026
     }
   },
   "IN": {
@@ -7998,15 +7998,15 @@
       "Wind": 0.0557
     },
     "2026": {
-      "Bioenergy": 0.0149,
-      "Coal": 0.7166,
+      "Bioenergy": 0.0133,
+      "Coal": 0.71,
       "Gas": 0.0113,
-      "Hydro": 0.0531,
-      "Nuclear": 0.0315,
+      "Hydro": 0.0543,
+      "Nuclear": 0.0323,
       "Other Fossil": 0.0003,
-      "Other Renewables": 0.0016,
-      "Solar": 0.1271,
-      "Wind": 0.0435
+      "Other Renewables": 0.0017,
+      "Solar": 0.1369,
+      "Wind": 0.0399
     }
   },
   "IQ": {
@@ -8358,15 +8358,15 @@
       "Wind": 0.0918
     },
     "2026": {
-      "Bioenergy": 0.0513,
-      "Coal": 0.0281,
-      "Gas": 0.516,
-      "Hydro": 0.1075,
-      "Nuclear": 0.0292,
-      "Other Fossil": 0.0143,
-      "Other Renewables": 0.0182,
-      "Solar": 0.0981,
-      "Wind": 0.1374
+      "Bioenergy": 0.053,
+      "Coal": 0.0298,
+      "Gas": 0.4961,
+      "Hydro": 0.1113,
+      "Nuclear": 0.0321,
+      "Other Fossil": 0.0136,
+      "Other Renewables": 0.0186,
+      "Solar": 0.1196,
+      "Wind": 0.1258
     }
   },
   "JM": {
@@ -8617,26 +8617,26 @@
       "Wind": 0.0122
     },
     "2025": {
-      "Bioenergy": 0.0696,
-      "Coal": 0.2909,
-      "Gas": 0.3024,
+      "Bioenergy": 0.0701,
+      "Coal": 0.2913,
+      "Gas": 0.3021,
       "Hydro": 0.0726,
       "Nuclear": 0.1015,
-      "Other Fossil": 0.0358,
-      "Other Renewables": 0.0107,
+      "Other Fossil": 0.0351,
+      "Other Renewables": 0.0108,
       "Solar": 0.1031,
       "Wind": 0.0134
     },
     "2026": {
-      "Bioenergy": 0.0658,
-      "Coal": 0.2998,
-      "Gas": 0.3353,
-      "Hydro": 0.0486,
-      "Nuclear": 0.1033,
-      "Other Fossil": 0.0431,
-      "Other Renewables": 0.0101,
-      "Solar": 0.0731,
-      "Wind": 0.0208
+      "Bioenergy": 0.0754,
+      "Coal": 0.3169,
+      "Gas": 0.3173,
+      "Hydro": 0.0487,
+      "Nuclear": 0.0942,
+      "Other Fossil": 0.0338,
+      "Other Renewables": 0.012,
+      "Solar": 0.0825,
+      "Wind": 0.0193
     }
   },
   "KE": {
@@ -8810,12 +8810,12 @@
     "2026": {
       "Bioenergy": 0.0017,
       "Coal": 0.0977,
-      "Gas": 0.0161,
-      "Hydro": 0.8328,
-      "Nuclear": 0.0038,
+      "Gas": 0.0158,
+      "Hydro": 0.8329,
+      "Nuclear": 0.0037,
       "Other Fossil": 0.0335,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0075,
+      "Other Renewables": 0.0003,
+      "Solar": 0.0076,
       "Wind": 0.0067
     }
   },
@@ -8890,7 +8890,7 @@
       "Bioenergy": 0.0131,
       "Coal": 0.4533,
       "Gas": 0.0248,
-      "Hydro": 0.3752,
+      "Hydro": 0.3751,
       "Nuclear": 0.0138,
       "Other Fossil": 0.0637,
       "Other Renewables": 0.001,
@@ -8899,13 +8899,13 @@
     },
     "2026": {
       "Bioenergy": 0.0137,
-      "Coal": 0.4576,
-      "Gas": 0.0277,
-      "Hydro": 0.3657,
-      "Nuclear": 0.0135,
-      "Other Fossil": 0.064,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0339,
+      "Coal": 0.4577,
+      "Gas": 0.0264,
+      "Hydro": 0.3662,
+      "Nuclear": 0.0131,
+      "Other Fossil": 0.0637,
+      "Other Renewables": 0.0011,
+      "Solar": 0.0345,
       "Wind": 0.0237
     }
   },
@@ -9348,15 +9348,15 @@
       "Wind": 0.0062
     },
     "2026": {
-      "Bioenergy": 0.0197,
-      "Coal": 0.3065,
-      "Gas": 0.3297,
-      "Hydro": 0.004,
-      "Nuclear": 0.267,
-      "Other Fossil": 0.0082,
-      "Other Renewables": 0.0026,
-      "Solar": 0.0516,
-      "Wind": 0.0108
+      "Bioenergy": 0.0205,
+      "Coal": 0.3014,
+      "Gas": 0.3277,
+      "Hydro": 0.0041,
+      "Nuclear": 0.2653,
+      "Other Fossil": 0.0087,
+      "Other Renewables": 0.0024,
+      "Solar": 0.0605,
+      "Wind": 0.0094
     }
   },
   "KW": {
@@ -10230,7 +10230,7 @@
       "Coal": 0.0594,
       "Gas": 0.1656,
       "Hydro": 0.1101,
-      "Nuclear": 0.0909,
+      "Nuclear": 0.0908,
       "Other Fossil": 0.0841,
       "Other Renewables": 0.0036,
       "Solar": 0.1407,
@@ -10245,18 +10245,18 @@
       "Other Fossil": 0.1003,
       "Other Renewables": 0.0024,
       "Solar": 0.1578,
-      "Wind": 0.3536
+      "Wind": 0.3535
     },
     "2026": {
-      "Bioenergy": 0.021,
-      "Coal": 0.0528,
-      "Gas": 0.2341,
-      "Hydro": 0.0788,
-      "Nuclear": 0.0762,
-      "Other Fossil": 0.0864,
-      "Other Renewables": 0.0028,
-      "Solar": 0.0449,
-      "Wind": 0.4028
+      "Bioenergy": 0.0207,
+      "Coal": 0.0474,
+      "Gas": 0.1962,
+      "Hydro": 0.0781,
+      "Nuclear": 0.0689,
+      "Other Fossil": 0.0943,
+      "Other Renewables": 0.0026,
+      "Solar": 0.0775,
+      "Wind": 0.4143
     }
   },
   "LU": {
@@ -10320,17 +10320,17 @@
       "Coal": 0.096,
       "Gas": 0.1811,
       "Hydro": 0.1562,
-      "Nuclear": 0.1473,
+      "Nuclear": 0.1472,
       "Other Fossil": 0.0371,
       "Other Renewables": 0.0058,
       "Solar": 0.117,
-      "Wind": 0.186
+      "Wind": 0.1861
     },
     "2025": {
       "Bioenergy": 0.0696,
       "Coal": 0.0919,
       "Gas": 0.1832,
-      "Hydro": 0.13,
+      "Hydro": 0.1301,
       "Nuclear": 0.1448,
       "Other Fossil": 0.0371,
       "Other Renewables": 0.0057,
@@ -10338,15 +10338,15 @@
       "Wind": 0.1873
     },
     "2026": {
-      "Bioenergy": 0.059,
-      "Coal": 0.101,
-      "Gas": 0.2182,
-      "Hydro": 0.1447,
-      "Nuclear": 0.1456,
-      "Other Fossil": 0.0382,
-      "Other Renewables": 0.0054,
-      "Solar": 0.0445,
-      "Wind": 0.2434
+      "Bioenergy": 0.0523,
+      "Coal": 0.1004,
+      "Gas": 0.2052,
+      "Hydro": 0.145,
+      "Nuclear": 0.1468,
+      "Other Fossil": 0.0386,
+      "Other Renewables": 0.0055,
+      "Solar": 0.0786,
+      "Wind": 0.2277
     }
   },
   "LV": {
@@ -10409,7 +10409,7 @@
       "Bioenergy": 0.0562,
       "Coal": 0.0381,
       "Gas": 0.2653,
-      "Hydro": 0.4257,
+      "Hydro": 0.4256,
       "Nuclear": 0.0582,
       "Other Fossil": 0.0092,
       "Other Renewables": 0.0023,
@@ -10428,15 +10428,15 @@
       "Wind": 0.0526
     },
     "2026": {
-      "Bioenergy": 0.0279,
-      "Coal": 0.0012,
-      "Gas": 0.7074,
-      "Hydro": 0.1859,
-      "Nuclear": 0.0018,
-      "Other Fossil": 0.014,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0327,
-      "Wind": 0.0291
+      "Bioenergy": 0.0417,
+      "Coal": 0.0006,
+      "Gas": 0.5239,
+      "Hydro": 0.3463,
+      "Nuclear": 0.0009,
+      "Other Fossil": 0.0175,
+      "Other Renewables": 0,
+      "Solar": 0.0447,
+      "Wind": 0.0243
     }
   },
   "LY": {
@@ -10700,13 +10700,13 @@
     "2026": {
       "Bioenergy": 0.0006,
       "Coal": 0.0028,
-      "Gas": 0.9221,
+      "Gas": 0.9219,
       "Hydro": 0.0451,
       "Nuclear": 0.004,
       "Other Fossil": 0.0004,
       "Other Renewables": 0.0002,
-      "Solar": 0.0217,
-      "Wind": 0.0032
+      "Solar": 0.022,
+      "Wind": 0.0031
     }
   },
   "ME": {
@@ -10767,14 +10767,14 @@
     },
     "2024": {
       "Bioenergy": 0.0038,
-      "Coal": 0.3763,
-      "Gas": 0.031,
-      "Hydro": 0.4323,
-      "Nuclear": 0.0288,
+      "Coal": 0.3755,
+      "Gas": 0.0309,
+      "Hydro": 0.4314,
+      "Nuclear": 0.0287,
       "Other Fossil": 0.0029,
       "Other Renewables": 0.0011,
-      "Solar": 0.0319,
-      "Wind": 0.0917
+      "Solar": 0.0341,
+      "Wind": 0.0915
     },
     "2025": {
       "Bioenergy": 0.0135,
@@ -10789,14 +10789,14 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Coal": 0.2548,
+      "Coal": 0.2919,
       "Gas": 0,
-      "Hydro": 0.6525,
+      "Hydro": 0.6367,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0212,
-      "Wind": 0.0715
+      "Solar": 0,
+      "Wind": 0.0714
     }
   },
   "MG": {
@@ -10968,15 +10968,15 @@
       "Wind": 0.05
     },
     "2026": {
-      "Bioenergy": 0.0059,
-      "Coal": 0.3841,
-      "Gas": 0.249,
-      "Hydro": 0.1487,
-      "Nuclear": 0.0401,
+      "Bioenergy": 0.006,
+      "Coal": 0.3837,
+      "Gas": 0.2469,
+      "Hydro": 0.1485,
+      "Nuclear": 0.0402,
       "Other Fossil": 0.0043,
       "Other Renewables": 0.0015,
-      "Solar": 0.1117,
-      "Wind": 0.0548
+      "Solar": 0.1149,
+      "Wind": 0.0539
     }
   },
   "ML": {
@@ -11306,7 +11306,7 @@
       "Wind": 0.0597
     },
     "2024": {
-      "Bioenergy": 0.0557,
+      "Bioenergy": 0.0558,
       "Coal": 0.4678,
       "Gas": 0.1617,
       "Hydro": 0.1034,
@@ -11320,22 +11320,22 @@
       "Bioenergy": 0.0556,
       "Coal": 0.444,
       "Gas": 0.1585,
-      "Hydro": 0.1037,
+      "Hydro": 0.1036,
       "Nuclear": 0.0451,
-      "Other Fossil": 0.0342,
+      "Other Fossil": 0.0341,
       "Other Renewables": 0.0033,
       "Solar": 0.0861,
       "Wind": 0.0695
     },
     "2026": {
-      "Bioenergy": 0.0575,
-      "Coal": 0.458,
-      "Gas": 0.1681,
-      "Hydro": 0.0726,
-      "Nuclear": 0.0442,
-      "Other Fossil": 0.0349,
-      "Other Renewables": 0.0009,
-      "Solar": 0.0861,
+      "Bioenergy": 0.0576,
+      "Coal": 0.4582,
+      "Gas": 0.1638,
+      "Hydro": 0.0742,
+      "Nuclear": 0.0428,
+      "Other Fossil": 0.034,
+      "Other Renewables": 0.0037,
+      "Solar": 0.0879,
       "Wind": 0.0776
     }
   },
@@ -11669,7 +11669,7 @@
       "Bioenergy": 0.0063,
       "Coal": 0.0295,
       "Gas": 0.703,
-      "Hydro": 0.0409,
+      "Hydro": 0.0408,
       "Nuclear": 0.046,
       "Other Fossil": 0.0069,
       "Other Renewables": 0.0018,
@@ -11688,15 +11688,15 @@
       "Wind": 0.03
     },
     "2026": {
-      "Bioenergy": 0.0065,
-      "Coal": 0.0306,
-      "Gas": 0.7163,
-      "Hydro": 0.0373,
-      "Nuclear": 0.0443,
+      "Bioenergy": 0.0066,
+      "Coal": 0.0303,
+      "Gas": 0.7141,
+      "Hydro": 0.0371,
+      "Nuclear": 0.0444,
       "Other Fossil": 0.0619,
-      "Other Renewables": 0.0016,
-      "Solar": 0.0663,
-      "Wind": 0.0351
+      "Other Renewables": 0.0017,
+      "Solar": 0.0699,
+      "Wind": 0.0341
     }
   },
   "MU": {
@@ -12048,15 +12048,15 @@
       "Wind": 0.0612
     },
     "2026": {
-      "Bioenergy": 0,
-      "Coal": 0.0691,
-      "Gas": 0.6134,
-      "Hydro": 0.0656,
-      "Nuclear": 0.0338,
-      "Other Fossil": 0.0894,
-      "Other Renewables": 0.0107,
-      "Solar": 0.0453,
-      "Wind": 0.0726
+      "Bioenergy": 0.0004,
+      "Coal": 0.0665,
+      "Gas": 0.6053,
+      "Hydro": 0.0688,
+      "Nuclear": 0.042,
+      "Other Fossil": 0.087,
+      "Other Renewables": 0.011,
+      "Solar": 0.045,
+      "Wind": 0.0741
     }
   },
   "MY": {
@@ -12679,38 +12679,38 @@
     },
     "2026": {
       "Bioenergy": 0.1704,
-      "Coal": 0.0031,
-      "Gas": 0.0201,
-      "Hydro": 0.084,
-      "Nuclear": 0.0015,
-      "Other Fossil": 0.3968,
+      "Coal": 0.0033,
+      "Gas": 0.0193,
+      "Hydro": 0.0853,
+      "Nuclear": 0.0013,
+      "Other Fossil": 0.3973,
       "Other Renewables": 0.1561,
-      "Solar": 0.0144,
-      "Wind": 0.1538
+      "Solar": 0.0142,
+      "Wind": 0.1527
     }
   },
   "NL": {
     "2019": {
       "Bioenergy": 0.0422,
       "Coal": 0.1603,
-      "Gas": 0.5738,
+      "Gas": 0.5739,
       "Hydro": 0.0048,
       "Nuclear": 0.0356,
-      "Other Fossil": 0.0267,
+      "Other Fossil": 0.0265,
       "Other Renewables": 0.0149,
       "Solar": 0.0458,
-      "Wind": 0.0959
+      "Wind": 0.096
     },
     "2020": {
       "Bioenergy": 0.0647,
       "Coal": 0.0801,
-      "Gas": 0.5825,
+      "Gas": 0.5826,
       "Hydro": 0.0021,
-      "Nuclear": 0.0336,
-      "Other Fossil": 0.027,
+      "Nuclear": 0.0337,
+      "Other Fossil": 0.0269,
       "Other Renewables": 0.0135,
       "Solar": 0.0695,
-      "Wind": 0.127
+      "Wind": 0.1271
     },
     "2021": {
       "Bioenergy": 0.086,
@@ -12768,15 +12768,15 @@
       "Wind": 0.2444
     },
     "2026": {
-      "Bioenergy": 0.0509,
-      "Coal": 0.0965,
-      "Gas": 0.4173,
+      "Bioenergy": 0.0541,
+      "Coal": 0.0904,
+      "Gas": 0.3831,
       "Hydro": 0.0008,
-      "Nuclear": 0.0276,
-      "Other Fossil": 0.0184,
-      "Other Renewables": 0.0124,
-      "Solar": 0.0725,
-      "Wind": 0.3034
+      "Nuclear": 0.0295,
+      "Other Fossil": 0.0197,
+      "Other Renewables": 0.0132,
+      "Solar": 0.1235,
+      "Wind": 0.2856
     }
   },
   "NO": {
@@ -12859,14 +12859,14 @@
     },
     "2026": {
       "Bioenergy": 0.001,
-      "Coal": 0.0048,
-      "Gas": 0.016,
-      "Hydro": 0.872,
-      "Nuclear": 0.007,
-      "Other Fossil": 0.0023,
+      "Coal": 0.0043,
+      "Gas": 0.015,
+      "Hydro": 0.8623,
+      "Nuclear": 0.0064,
+      "Other Fossil": 0.0025,
       "Other Renewables": 0.0025,
-      "Solar": 0.0016,
-      "Wind": 0.0926
+      "Solar": 0.0022,
+      "Wind": 0.1038
     }
   },
   "NP": {
@@ -12949,13 +12949,13 @@
     },
     "2026": {
       "Bioenergy": 0.0048,
-      "Coal": 0.1116,
-      "Gas": 0.0221,
-      "Hydro": 0.7977,
-      "Nuclear": 0.0108,
-      "Other Fossil": 0.0014,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0313,
+      "Coal": 0.1117,
+      "Gas": 0.0211,
+      "Hydro": 0.798,
+      "Nuclear": 0.0104,
+      "Other Fossil": 0.0012,
+      "Other Renewables": 0.0009,
+      "Solar": 0.0317,
       "Wind": 0.0202
     }
   },
@@ -13218,15 +13218,15 @@
       "Wind": 0.091
     },
     "2026": {
-      "Bioenergy": 0.0034,
-      "Coal": 0.016,
-      "Gas": 0.0183,
-      "Hydro": 0.6176,
+      "Bioenergy": 0.0032,
+      "Coal": 0.0206,
+      "Gas": 0.0304,
+      "Hydro": 0.6113,
       "Nuclear": 0,
       "Other Fossil": 0,
-      "Other Renewables": 0.2477,
+      "Other Renewables": 0.2421,
       "Solar": 0,
-      "Wind": 0.097
+      "Wind": 0.0923
     }
   },
   "OM": {
@@ -13488,15 +13488,15 @@
       "Wind": 0.0642
     },
     "2026": {
-      "Bioenergy": 0.0104,
+      "Bioenergy": 0.0108,
       "Coal": 0,
-      "Gas": 0.2837,
-      "Hydro": 0.622,
+      "Gas": 0.2598,
+      "Hydro": 0.6062,
       "Nuclear": 0,
-      "Other Fossil": 0,
+      "Other Fossil": 0.0285,
       "Other Renewables": 0,
-      "Solar": 0.039,
-      "Wind": 0.0449
+      "Solar": 0.0436,
+      "Wind": 0.0512
     }
   },
   "PF": {
@@ -13759,14 +13759,14 @@
     },
     "2026": {
       "Bioenergy": 0.0118,
-      "Coal": 0.5443,
-      "Gas": 0.1799,
-      "Hydro": 0.1115,
+      "Coal": 0.5521,
+      "Gas": 0.1763,
+      "Hydro": 0.106,
       "Nuclear": 0,
-      "Other Fossil": 0.0076,
-      "Other Renewables": 0.0844,
-      "Solar": 0.043,
-      "Wind": 0.0175
+      "Other Fossil": 0.0085,
+      "Other Renewables": 0.0802,
+      "Solar": 0.0482,
+      "Wind": 0.0169
     }
   },
   "PK": {
@@ -13938,15 +13938,15 @@
       "Wind": 0.1416
     },
     "2026": {
-      "Bioenergy": 0.0175,
-      "Coal": 0.565,
-      "Gas": 0.1675,
-      "Hydro": 0.0107,
-      "Nuclear": 0.0036,
-      "Other Fossil": 0.0512,
-      "Other Renewables": 0.0035,
-      "Solar": 0.0505,
-      "Wind": 0.1305
+      "Bioenergy": 0.0157,
+      "Coal": 0.5638,
+      "Gas": 0.1529,
+      "Hydro": 0.01,
+      "Nuclear": 0.0018,
+      "Other Fossil": 0.0503,
+      "Other Renewables": 0.0034,
+      "Solar": 0.0768,
+      "Wind": 0.1254
     }
   },
   "PM": {
@@ -14119,14 +14119,14 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Coal": 0.203,
-      "Gas": 0.3684,
+      "Coal": 0.24,
+      "Gas": 0.456,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.406,
+      "Other Fossil": 0.28,
       "Other Renewables": 0,
-      "Solar": 0.015,
-      "Wind": 0.0075
+      "Solar": 0.016,
+      "Wind": 0.008
     }
   },
   "PS": {
@@ -14298,15 +14298,15 @@
       "Wind": 0.2673
     },
     "2026": {
-      "Bioenergy": 0.043,
-      "Coal": 0.0169,
-      "Gas": 0.2112,
-      "Hydro": 0.2815,
-      "Nuclear": 0.0245,
-      "Other Fossil": 0.0065,
-      "Other Renewables": 0.0009,
-      "Solar": 0.0848,
-      "Wind": 0.3308
+      "Bioenergy": 0.0486,
+      "Coal": 0.0072,
+      "Gas": 0.1963,
+      "Hydro": 0.3217,
+      "Nuclear": 0.0106,
+      "Other Fossil": 0.0054,
+      "Other Renewables": 0.0004,
+      "Solar": 0.0783,
+      "Wind": 0.3313
     }
   },
   "PY": {
@@ -14658,15 +14658,15 @@
       "Wind": 0.1177
     },
     "2026": {
-      "Bioenergy": 0.0097,
-      "Coal": 0.1036,
-      "Gas": 0.2479,
-      "Hydro": 0.2746,
-      "Nuclear": 0.1888,
-      "Other Fossil": 0.001,
+      "Bioenergy": 0.0095,
+      "Coal": 0.1032,
+      "Gas": 0.2454,
+      "Hydro": 0.2697,
+      "Nuclear": 0.1934,
+      "Other Fossil": 0.0008,
       "Other Renewables": 0.0003,
-      "Solar": 0.0292,
-      "Wind": 0.1447
+      "Solar": 0.0424,
+      "Wind": 0.1352
     }
   },
   "RS": {
@@ -14748,15 +14748,15 @@
       "Wind": 0.0438
     },
     "2026": {
-      "Bioenergy": 0.0003,
-      "Coal": 0.5564,
-      "Gas": 0.0479,
-      "Hydro": 0.328,
+      "Bioenergy": 0.0064,
+      "Coal": 0.573,
+      "Gas": 0.0382,
+      "Hydro": 0.314,
       "Nuclear": 0.0021,
-      "Other Fossil": 0.0002,
+      "Other Fossil": 0.0043,
       "Other Renewables": 0.0001,
       "Solar": 0.0003,
-      "Wind": 0.0647
+      "Wind": 0.0616
     }
   },
   "RU": {
@@ -14838,15 +14838,15 @@
       "Wind": 0.0037
     },
     "2026": {
-      "Bioenergy": 0.0007,
-      "Coal": 0.1885,
-      "Gas": 0.4757,
-      "Hydro": 0.1388,
-      "Nuclear": 0.1788,
-      "Other Fossil": 0.0137,
+      "Bioenergy": 0.0008,
+      "Coal": 0.1909,
+      "Gas": 0.4816,
+      "Hydro": 0.136,
+      "Nuclear": 0.1724,
+      "Other Fossil": 0.014,
       "Other Renewables": 0,
-      "Solar": 0.0003,
-      "Wind": 0.0036
+      "Solar": 0.0006,
+      "Wind": 0.0039
     }
   },
   "RW": {
@@ -15378,15 +15378,15 @@
       "Wind": 0.2396
     },
     "2026": {
-      "Bioenergy": 0.0599,
+      "Bioenergy": 0.0573,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4523,
-      "Nuclear": 0.2913,
+      "Hydro": 0.4319,
+      "Nuclear": 0.2743,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0027,
-      "Wind": 0.1938
+      "Solar": 0.0049,
+      "Wind": 0.2317
     }
   },
   "SG": {
@@ -15648,15 +15648,15 @@
       "Wind": 0.0057
     },
     "2026": {
-      "Bioenergy": 0.0178,
-      "Coal": 0.1966,
-      "Gas": 0.1159,
-      "Hydro": 0.2129,
-      "Nuclear": 0.4045,
+      "Bioenergy": 0.0173,
+      "Coal": 0.1989,
+      "Gas": 0.1128,
+      "Hydro": 0.1914,
+      "Nuclear": 0.4058,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.0004,
-      "Solar": 0.042,
-      "Wind": 0.0088
+      "Solar": 0.0636,
+      "Wind": 0.0087
     }
   },
   "SK": {
@@ -15738,14 +15738,14 @@
       "Wind": 0
     },
     "2026": {
-      "Bioenergy": 0.0263,
-      "Coal": 0.0037,
-      "Gas": 0.1346,
-      "Hydro": 0.116,
-      "Nuclear": 0.6466,
-      "Other Fossil": 0.0539,
-      "Other Renewables": 0.0126,
-      "Solar": 0.0062,
+      "Bioenergy": 0.0276,
+      "Coal": 0.0038,
+      "Gas": 0.1226,
+      "Hydro": 0.1112,
+      "Nuclear": 0.662,
+      "Other Fossil": 0.0491,
+      "Other Renewables": 0.0138,
+      "Solar": 0.0099,
       "Wind": 0
     }
   },
@@ -16369,14 +16369,14 @@
     },
     "2026": {
       "Bioenergy": 0.0005,
-      "Coal": 0.0005,
-      "Gas": 0.2748,
-      "Hydro": 0.3063,
+      "Coal": 0.0006,
+      "Gas": 0.2747,
+      "Hydro": 0.3065,
       "Nuclear": 0.0002,
       "Other Fossil": 0.0864,
       "Other Renewables": 0.1715,
       "Solar": 0.1442,
-      "Wind": 0.0156
+      "Wind": 0.0155
     }
   },
   "SY": {
@@ -16886,37 +16886,37 @@
       "Wind": 0.0263
     },
     "2024": {
-      "Bioenergy": 0.0609,
-      "Coal": 0.2219,
-      "Gas": 0.5979,
-      "Hydro": 0.0458,
-      "Nuclear": 0.0076,
-      "Other Fossil": 0.002,
-      "Other Renewables": 0.0006,
-      "Solar": 0.0366,
-      "Wind": 0.0267
+      "Bioenergy": 0.0644,
+      "Coal": 0.2192,
+      "Gas": 0.6015,
+      "Hydro": 0.0455,
+      "Nuclear": 0.0073,
+      "Other Fossil": 0.0019,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0344,
+      "Wind": 0.0252
     },
     "2025": {
-      "Bioenergy": 0.0485,
-      "Coal": 0.2345,
-      "Gas": 0.5612,
-      "Hydro": 0.0552,
-      "Nuclear": 0.0086,
+      "Bioenergy": 0.0481,
+      "Coal": 0.2334,
+      "Gas": 0.5632,
+      "Hydro": 0.0551,
+      "Nuclear": 0.0085,
       "Other Fossil": 0.0015,
       "Other Renewables": 0.0006,
-      "Solar": 0.0605,
-      "Wind": 0.0293
+      "Solar": 0.0611,
+      "Wind": 0.0286
     },
     "2026": {
-      "Bioenergy": 0.0514,
-      "Coal": 0.2059,
-      "Gas": 0.5713,
-      "Hydro": 0.0557,
-      "Nuclear": 0.0086,
-      "Other Fossil": 0.0055,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0611,
-      "Wind": 0.0403
+      "Bioenergy": 0.0493,
+      "Coal": 0.1422,
+      "Gas": 0.639,
+      "Hydro": 0.0626,
+      "Nuclear": 0.0061,
+      "Other Fossil": 0.0016,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0709,
+      "Wind": 0.0278
     }
   },
   "TJ": {
@@ -17000,9 +17000,9 @@
     "2026": {
       "Bioenergy": 0.0003,
       "Coal": 0.1363,
-      "Gas": 0.0284,
+      "Gas": 0.0283,
       "Hydro": 0.8325,
-      "Nuclear": 0.0006,
+      "Nuclear": 0.0005,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
       "Solar": 0.0011,
@@ -17259,24 +17259,24 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.988,
+      "Gas": 0.9857,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.012
+      "Wind": 0.0143
     },
     "2026": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.9946,
+      "Gas": 0.9867,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0054
+      "Wind": 0.0133
     }
   },
   "TO": {
@@ -17448,15 +17448,15 @@
       "Wind": 0.1114
     },
     "2026": {
-      "Bioenergy": 0.0228,
-      "Coal": 0.3344,
-      "Gas": 0.153,
-      "Hydro": 0.2377,
-      "Nuclear": 0,
-      "Other Fossil": 0.004,
-      "Other Renewables": 0.0318,
-      "Solar": 0.063,
-      "Wind": 0.1533
+      "Bioenergy": 0.023,
+      "Coal": 0.3162,
+      "Gas": 0.1434,
+      "Hydro": 0.26,
+      "Nuclear": 0,
+      "Other Fossil": 0.0037,
+      "Other Renewables": 0.0321,
+      "Solar": 0.0757,
+      "Wind": 0.1459
     }
   },
   "TT": {
@@ -17628,15 +17628,15 @@
       "Wind": 0.0427
     },
     "2026": {
-      "Bioenergy": 0.0013,
-      "Coal": 0.3165,
-      "Gas": 0.5081,
-      "Hydro": 0.0098,
+      "Bioenergy": 0.0011,
+      "Coal": 0.3157,
+      "Gas": 0.5134,
+      "Hydro": 0.0112,
       "Nuclear": 0,
-      "Other Fossil": 0.0304,
+      "Other Fossil": 0.0327,
       "Other Renewables": 0,
-      "Solar": 0.0492,
-      "Wind": 0.0846
+      "Solar": 0.0561,
+      "Wind": 0.0696
     }
   },
   "TZ": {
@@ -17989,14 +17989,14 @@
     },
     "2026": {
       "Bioenergy": 0.0105,
-      "Coal": 0.168,
-      "Gas": 0.3781,
-      "Hydro": 0.0641,
-      "Nuclear": 0.1793,
-      "Other Fossil": 0.0099,
-      "Other Renewables": 0.004,
-      "Solar": 0.0761,
-      "Wind": 0.1102
+      "Coal": 0.154,
+      "Gas": 0.3633,
+      "Hydro": 0.0683,
+      "Nuclear": 0.1774,
+      "Other Fossil": 0.0146,
+      "Other Renewables": 0.0041,
+      "Solar": 0.0817,
+      "Wind": 0.1261
     }
   },
   "UY": {
@@ -18078,15 +18078,15 @@
       "Wind": 0.3332
     },
     "2026": {
-      "Bioenergy": 0.1454,
-      "Coal": 0.0014,
-      "Gas": 0.0089,
-      "Hydro": 0.402,
-      "Nuclear": 0.0006,
-      "Other Fossil": 0.0771,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0538,
-      "Wind": 0.3106
+      "Bioenergy": 0.1486,
+      "Coal": 0.001,
+      "Gas": 0.0056,
+      "Hydro": 0.3762,
+      "Nuclear": 0.0004,
+      "Other Fossil": 0.077,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0495,
+      "Wind": 0.3416
     }
   },
   "UZ": {
@@ -18170,12 +18170,12 @@
     "2026": {
       "Bioenergy": 0.0005,
       "Coal": 0.0697,
-      "Gas": 0.8123,
+      "Gas": 0.8122,
       "Hydro": 0.1013,
       "Nuclear": 0.001,
       "Other Fossil": 0.0111,
-      "Other Renewables": 0,
-      "Solar": 0.0022,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0023,
       "Wind": 0.0018
     }
   },
@@ -18888,15 +18888,15 @@
       "Wind": 0.0768
     },
     "2026": {
-      "Bioenergy": 0.0058,
-      "Coal": 0.732,
-      "Gas": 0.0529,
-      "Hydro": 0.0788,
-      "Nuclear": 0.0396,
+      "Bioenergy": 0.0059,
+      "Coal": 0.7316,
+      "Gas": 0.0509,
+      "Hydro": 0.0786,
+      "Nuclear": 0.0397,
       "Other Fossil": 0.0043,
       "Other Renewables": 0.0015,
-      "Solar": 0.0082,
-      "Wind": 0.0769
+      "Solar": 0.0114,
+      "Wind": 0.076
     }
   },
   "YE": {
@@ -19058,25 +19058,25 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.803,
+      "Coal": 0.8029,
       "Gas": 0,
       "Hydro": 0.0078,
       "Nuclear": 0.0442,
-      "Other Fossil": 0.0145,
+      "Other Fossil": 0.0146,
       "Other Renewables": 0.0012,
       "Solar": 0.0803,
       "Wind": 0.0491
     },
     "2026": {
       "Bioenergy": 0,
-      "Coal": 0.7227,
+      "Coal": 0.737,
       "Gas": 0,
-      "Hydro": 0.0083,
-      "Nuclear": 0.0771,
-      "Other Fossil": 0.0044,
-      "Other Renewables": 0.0017,
-      "Solar": 0.1276,
-      "Wind": 0.0582
+      "Hydro": 0.013,
+      "Nuclear": 0.0762,
+      "Other Fossil": 0.0053,
+      "Other Renewables": 0.0018,
+      "Solar": 0.1124,
+      "Wind": 0.0545
     }
   },
   "ZM": {