npm - @digital4better/data - Versions diffs - 1.2.18 → 1.2.20 - Mend

@digital4better/data 1.2.18 → 1.2.20

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

Files changed (65) hide show

package/data/factor/continent-monthly-green.csv +175 -175
package/data/factor/continent-monthly-green.json +1564 -1564
package/data/factor/continent-monthly.csv +175 -175
package/data/factor/continent-monthly.json +1559 -1559
package/data/factor/continent-yearly-green.csv +20 -20
package/data/factor/continent-yearly-green.json +180 -180
package/data/factor/continent-yearly.csv +20 -20
package/data/factor/continent-yearly.json +179 -179
package/data/factor/country-monthly-green.csv +1976 -1976
package/data/factor/country-monthly-green.json +15962 -15962
package/data/factor/country-monthly.csv +2017 -2017
package/data/factor/country-monthly.json +14434 -14434
package/data/factor/country-yearly-green.csv +281 -281
package/data/factor/country-yearly-green.json +2292 -2292
package/data/factor/country-yearly.csv +281 -281
package/data/factor/country-yearly.json +2101 -2101
package/data/factor/subdivision-monthly-green.csv +39 -39
package/data/factor/subdivision-monthly-green.json +336 -336
package/data/factor/subdivision-monthly.csv +39 -39
package/data/factor/subdivision-monthly.json +351 -351
package/data/factor/subdivision-yearly-green.csv +63 -63
package/data/factor/subdivision-yearly-green.json +561 -561
package/data/factor/subdivision-yearly.csv +63 -63
package/data/factor/subdivision-yearly.json +553 -553
package/data/factor/world-monthly-green.csv +75 -75
package/data/factor/world-monthly-green.json +675 -675
package/data/factor/world-monthly.csv +75 -75
package/data/factor/world-monthly.json +675 -675
package/data/factor/world-yearly-green.csv +7 -7
package/data/factor/world-yearly-green.json +63 -63
package/data/factor/world-yearly.csv +7 -7
package/data/factor/world-yearly.json +63 -63
package/data/mix/continent-monthly-green.csv +172 -172
package/data/mix/continent-monthly-green.json +595 -595
package/data/mix/continent-monthly.csv +172 -172
package/data/mix/continent-monthly.json +1112 -1112
package/data/mix/continent-yearly-green.csv +20 -20
package/data/mix/continent-yearly-green.json +66 -66
package/data/mix/continent-yearly.csv +20 -20
package/data/mix/continent-yearly.json +132 -132
package/data/mix/country-monthly-green.csv +1277 -1277
package/data/mix/country-monthly-green.json +3694 -3694
package/data/mix/country-monthly.csv +1277 -1277
package/data/mix/country-monthly.json +4661 -4661
package/data/mix/country-yearly-green.csv +169 -169
package/data/mix/country-yearly-green.json +517 -517
package/data/mix/country-yearly.csv +169 -169
package/data/mix/country-yearly.json +821 -821
package/data/mix/subdivision-monthly-green.csv +27 -27
package/data/mix/subdivision-monthly-green.json +51 -51
package/data/mix/subdivision-monthly.csv +27 -27
package/data/mix/subdivision-monthly.json +93 -93
package/data/mix/subdivision-yearly-green.csv +47 -47
package/data/mix/subdivision-yearly-green.json +62 -62
package/data/mix/subdivision-yearly.csv +47 -47
package/data/mix/subdivision-yearly.json +102 -102
package/data/mix/world-monthly-green.csv +75 -75
package/data/mix/world-monthly-green.json +298 -298
package/data/mix/world-monthly.csv +75 -75
package/data/mix/world-monthly.json +667 -667
package/data/mix/world-yearly-green.csv +7 -7
package/data/mix/world-yearly-green.json +28 -28
package/data/mix/world-yearly.csv +7 -7
package/data/mix/world-yearly.json +63 -63
package/package.json +1 -1

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

@@ -1,81 +1,81 @@
 {
   "AE": {
     "2019": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0176,
-      "Gas": 0.7027,
-      "Hydro": 0.0315,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.2339,
+      "Bioenergy": 0,
+      "Coal": 0,
+      "Gas": 0.9736,
+      "Hydro": 0,
+      "Nuclear": 0,
+      "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0077,
-      "Wind": 0.0014
+      "Solar": 0.0264,
+      "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0176,
-      "Gas": 0.7027,
-      "Hydro": 0.0315,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.2339,
+      "Bioenergy": 0,
+      "Coal": 0,
+      "Gas": 0.9736,
+      "Hydro": 0,
+      "Nuclear": 0,
+      "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0077,
-      "Wind": 0.0014
+      "Solar": 0.0264,
+      "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0176,
-      "Gas": 0.7027,
-      "Hydro": 0.0315,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.2339,
+      "Bioenergy": 0,
+      "Coal": 0,
+      "Gas": 0.9736,
+      "Hydro": 0,
+      "Nuclear": 0,
+      "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0077,
-      "Wind": 0.0014
+      "Solar": 0.0264,
+      "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0176,
-      "Gas": 0.7027,
-      "Hydro": 0.0315,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.2339,
+      "Bioenergy": 0,
+      "Coal": 0,
+      "Gas": 0.9736,
+      "Hydro": 0,
+      "Nuclear": 0,
+      "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0077,
-      "Wind": 0.0014
+      "Solar": 0.0264,
+      "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0176,
-      "Gas": 0.7027,
-      "Hydro": 0.0315,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.2339,
+      "Bioenergy": 0,
+      "Coal": 0,
+      "Gas": 0.9736,
+      "Hydro": 0,
+      "Nuclear": 0,
+      "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0077,
-      "Wind": 0.0014
+      "Solar": 0.0264,
+      "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0176,
-      "Gas": 0.7027,
-      "Hydro": 0.0315,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.2339,
+      "Bioenergy": 0,
+      "Coal": 0,
+      "Gas": 0.9736,
+      "Hydro": 0,
+      "Nuclear": 0,
+      "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0077,
-      "Wind": 0.0014
+      "Solar": 0.0264,
+      "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0176,
-      "Gas": 0.7027,
-      "Hydro": 0.0315,
-      "Nuclear": 0.005,
-      "Other Fossil": 0.2339,
+      "Bioenergy": 0,
+      "Coal": 0,
+      "Gas": 0.9736,
+      "Hydro": 0,
+      "Nuclear": 0,
+      "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0077,
-      "Wind": 0.0014
+      "Solar": 0.0264,
+      "Wind": 0
     }
   },
   "AF": {
@@ -146,15 +146,15 @@
       "Wind": 0.0564
     },
     "2025": {
-      "Bioenergy": 0.0173,
-      "Coal": 0.4357,
-      "Gas": 0.078,
-      "Hydro": 0.2574,
-      "Nuclear": 0.0436,
-      "Other Fossil": 0.0218,
-      "Other Renewables": 0.0044,
-      "Solar": 0.0762,
-      "Wind": 0.0655
+      "Bioenergy": 0.0167,
+      "Coal": 0.4376,
+      "Gas": 0.0757,
+      "Hydro": 0.2581,
+      "Nuclear": 0.0426,
+      "Other Fossil": 0.0213,
+      "Other Renewables": 0.0042,
+      "Solar": 0.0781,
+      "Wind": 0.0657
     }
   },
   "AG": {
@@ -241,7 +241,7 @@
       "Bioenergy": 0.0088,
       "Coal": 0.0528,
       "Gas": 0.0822,
-      "Hydro": 0.7336,
+      "Hydro": 0.7335,
       "Nuclear": 0.072,
       "Other Fossil": 0.007,
       "Other Renewables": 0.002,
@@ -276,9 +276,9 @@
       "Gas": 0.0815,
       "Hydro": 0.73,
       "Nuclear": 0.0621,
-      "Other Fossil": 0.0069,
+      "Other Fossil": 0.0068,
       "Other Renewables": 0.0021,
-      "Solar": 0.0188,
+      "Solar": 0.0189,
       "Wind": 0.0361
     },
     "2023": {
@@ -293,26 +293,26 @@
       "Wind": 0.0398
     },
     "2024": {
-      "Bioenergy": 0.0089,
+      "Bioenergy": 0.009,
       "Coal": 0.0423,
       "Gas": 0.0716,
-      "Hydro": 0.738,
+      "Hydro": 0.7379,
       "Nuclear": 0.064,
       "Other Fossil": 0.0064,
       "Other Renewables": 0.002,
-      "Solar": 0.0263,
+      "Solar": 0.0264,
       "Wind": 0.0404
     },
     "2025": {
-      "Bioenergy": 0.0088,
-      "Coal": 0.048,
-      "Gas": 0.0838,
-      "Hydro": 0.7307,
-      "Nuclear": 0.0636,
-      "Other Fossil": 0.0068,
+      "Bioenergy": 0.0089,
+      "Coal": 0.0468,
+      "Gas": 0.0816,
+      "Hydro": 0.7305,
+      "Nuclear": 0.0638,
+      "Other Fossil": 0.0069,
       "Other Renewables": 0.002,
-      "Solar": 0.0159,
-      "Wind": 0.0404
+      "Solar": 0.0194,
+      "Wind": 0.04
     }
   },
   "AM": {
@@ -541,15 +541,15 @@
       "Wind": 0.1136
     },
     "2025": {
-      "Bioenergy": 0.0087,
-      "Coal": 0.0044,
-      "Gas": 0.549,
-      "Hydro": 0.2087,
-      "Nuclear": 0.0689,
-      "Other Fossil": 0.0095,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0365,
-      "Wind": 0.1143
+      "Bioenergy": 0.0078,
+      "Coal": 0.0039,
+      "Gas": 0.5897,
+      "Hydro": 0.1881,
+      "Nuclear": 0.061,
+      "Other Fossil": 0.0112,
+      "Other Renewables": 0.0002,
+      "Solar": 0.033,
+      "Wind": 0.1052
     }
   },
   "AS": {
@@ -636,7 +636,7 @@
       "Bioenergy": 0.0331,
       "Coal": 0.0312,
       "Gas": 0.166,
-      "Hydro": 0.5903,
+      "Hydro": 0.5902,
       "Nuclear": 0.0176,
       "Other Fossil": 0.0169,
       "Other Renewables": 0.0005,
@@ -661,7 +661,7 @@
       "Hydro": 0.5787,
       "Nuclear": 0.0299,
       "Other Fossil": 0.0182,
-      "Other Renewables": 0.0009,
+      "Other Renewables": 0.0008,
       "Solar": 0.0383,
       "Wind": 0.1145
     },
@@ -673,7 +673,7 @@
       "Nuclear": 0.0272,
       "Other Fossil": 0.0183,
       "Other Renewables": 0.0009,
-      "Solar": 0.0537,
+      "Solar": 0.0538,
       "Wind": 0.119
     },
     "2023": {
@@ -688,26 +688,26 @@
       "Wind": 0.1324
     },
     "2024": {
-      "Bioenergy": 0.0273,
+      "Bioenergy": 0.0272,
       "Coal": 0.0026,
-      "Gas": 0.0905,
-      "Hydro": 0.6217,
+      "Gas": 0.093,
+      "Hydro": 0.62,
       "Nuclear": 0.0036,
       "Other Fossil": 0.0152,
       "Other Renewables": 0.0001,
-      "Solar": 0.1047,
-      "Wind": 0.1342
+      "Solar": 0.1044,
+      "Wind": 0.1338
     },
     "2025": {
-      "Bioenergy": 0.0338,
-      "Coal": 0.0212,
-      "Gas": 0.2831,
-      "Hydro": 0.4173,
-      "Nuclear": 0.0281,
-      "Other Fossil": 0.0169,
+      "Bioenergy": 0.0343,
+      "Coal": 0.0209,
+      "Gas": 0.2501,
+      "Hydro": 0.4301,
+      "Nuclear": 0.0286,
+      "Other Fossil": 0.0172,
       "Other Renewables": 0.0009,
-      "Solar": 0.0723,
-      "Wind": 0.1266
+      "Solar": 0.0816,
+      "Wind": 0.1364
     }
   },
   "AU": {
@@ -779,14 +779,14 @@
     },
     "2025": {
       "Bioenergy": 0.0011,
-      "Coal": 0.4977,
-      "Gas": 0.0627,
-      "Hydro": 0.0434,
+      "Coal": 0.511,
+      "Gas": 0.0612,
+      "Hydro": 0.0441,
       "Nuclear": 0,
       "Other Fossil": 0.0002,
       "Other Renewables": 0,
-      "Solar": 0.2559,
-      "Wind": 0.1389
+      "Solar": 0.2418,
+      "Wind": 0.1405
     }
   },
   "AW": {
@@ -1016,14 +1016,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5338,
+      "Coal": 0.5954,
       "Gas": 0,
-      "Hydro": 0.4511,
+      "Hydro": 0.3817,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0075,
-      "Wind": 0.0075
+      "Solar": 0.0076,
+      "Wind": 0.0153
     }
   },
   "BB": {
@@ -1173,15 +1173,15 @@
       "Wind": 0.0115
     },
     "2025": {
-      "Bioenergy": 0.0039,
-      "Coal": 0.3903,
-      "Gas": 0.4207,
+      "Bioenergy": 0.0038,
+      "Coal": 0.3877,
+      "Gas": 0.4003,
       "Hydro": 0.0151,
-      "Nuclear": 0.01,
-      "Other Fossil": 0.1172,
+      "Nuclear": 0.0097,
+      "Other Fossil": 0.1379,
       "Other Renewables": 0.001,
-      "Solar": 0.0269,
-      "Wind": 0.015
+      "Solar": 0.0297,
+      "Wind": 0.0149
     }
   },
   "BE": {
@@ -1241,26 +1241,26 @@
       "Wind": 0.1828
     },
     "2024": {
-      "Bioenergy": 0.0117,
+      "Bioenergy": 0.0119,
       "Coal": 0.0181,
       "Gas": 0.166,
-      "Hydro": 0.0249,
-      "Nuclear": 0.3965,
-      "Other Fossil": 0.0917,
+      "Hydro": 0.026,
+      "Nuclear": 0.3957,
+      "Other Fossil": 0.0919,
       "Other Renewables": 0.0009,
-      "Solar": 0.1119,
-      "Wind": 0.1781
+      "Solar": 0.1117,
+      "Wind": 0.1778
     },
     "2025": {
-      "Bioenergy": 0.0111,
-      "Coal": 0.0206,
-      "Gas": 0.2522,
-      "Hydro": 0.0219,
-      "Nuclear": 0.3837,
-      "Other Fossil": 0.0953,
-      "Other Renewables": 0.0008,
-      "Solar": 0.0577,
-      "Wind": 0.1567
+      "Bioenergy": 0.0117,
+      "Coal": 0.021,
+      "Gas": 0.2375,
+      "Hydro": 0.0237,
+      "Nuclear": 0.381,
+      "Other Fossil": 0.0994,
+      "Other Renewables": 0.0009,
+      "Solar": 0.0837,
+      "Wind": 0.1411
     }
   },
   "BF": {
@@ -1400,25 +1400,25 @@
     },
     "2024": {
       "Bioenergy": 0.0044,
-      "Coal": 0.2651,
-      "Gas": 0.0639,
+      "Coal": 0.265,
+      "Gas": 0.0638,
       "Hydro": 0.082,
-      "Nuclear": 0.4138,
+      "Nuclear": 0.4137,
       "Other Fossil": 0.0007,
       "Other Renewables": 0.0002,
       "Solar": 0.1291,
-      "Wind": 0.0408
+      "Wind": 0.0411
     },
     "2025": {
-      "Bioenergy": 0.0026,
-      "Coal": 0.404,
-      "Gas": 0.0555,
-      "Hydro": 0.051,
-      "Nuclear": 0.3638,
+      "Bioenergy": 0.0027,
+      "Coal": 0.3538,
+      "Gas": 0.0585,
+      "Hydro": 0.0501,
+      "Nuclear": 0.3961,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0871,
-      "Wind": 0.036
+      "Solar": 0.1026,
+      "Wind": 0.0362
     }
   },
   "BH": {
@@ -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.0046,
       "Wind": 0.0042
@@ -2358,15 +2358,15 @@
       "Wind": 0.041
     },
     "2025": {
-      "Bioenergy": 0.1692,
-      "Coal": 0.012,
-      "Gas": 0.0927,
-      "Hydro": 0.5327,
-      "Nuclear": 0.0095,
-      "Other Fossil": 0.1018,
+      "Bioenergy": 0.1693,
+      "Coal": 0.0135,
+      "Gas": 0.094,
+      "Hydro": 0.5273,
+      "Nuclear": 0.0093,
+      "Other Fossil": 0.1023,
       "Other Renewables": 0.0024,
-      "Solar": 0.0468,
-      "Wind": 0.0329
+      "Solar": 0.0465,
+      "Wind": 0.0353
     }
   },
   "CA": {
@@ -2437,15 +2437,15 @@
       "Wind": 0.0757
     },
     "2025": {
-      "Bioenergy": 0.0154,
-      "Coal": 0.0447,
-      "Gas": 0.1403,
-      "Hydro": 0.5779,
-      "Nuclear": 0.1309,
-      "Other Fossil": 0.0099,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0024,
-      "Wind": 0.0781
+      "Bioenergy": 0.0151,
+      "Coal": 0.0439,
+      "Gas": 0.1378,
+      "Hydro": 0.5896,
+      "Nuclear": 0.1167,
+      "Other Fossil": 0.0097,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0033,
+      "Wind": 0.0833
     }
   },
   "CD": {
@@ -2690,78 +2690,78 @@
       "Bioenergy": 0.0013,
       "Coal": 0.008,
       "Gas": 0.0119,
-      "Hydro": 0.5406,
-      "Nuclear": 0.3555,
-      "Other Fossil": 0.0502,
+      "Hydro": 0.5363,
+      "Nuclear": 0.3545,
+      "Other Fossil": 0.0521,
       "Other Renewables": 0.0003,
-      "Solar": 0.0256,
-      "Wind": 0.0065
+      "Solar": 0.0288,
+      "Wind": 0.0068
     },
     "2020": {
       "Bioenergy": 0.0011,
       "Coal": 0.006,
       "Gas": 0.0101,
-      "Hydro": 0.5655,
-      "Nuclear": 0.3303,
-      "Other Fossil": 0.0515,
+      "Hydro": 0.5604,
+      "Nuclear": 0.3296,
+      "Other Fossil": 0.0512,
       "Other Renewables": 0.0002,
-      "Solar": 0.0287,
-      "Wind": 0.0066
+      "Solar": 0.0347,
+      "Wind": 0.0067
     },
     "2021": {
       "Bioenergy": 0.0031,
-      "Coal": 0.0172,
-      "Gas": 0.0277,
-      "Hydro": 0.557,
-      "Nuclear": 0.2896,
-      "Other Fossil": 0.0538,
+      "Coal": 0.0171,
+      "Gas": 0.0276,
+      "Hydro": 0.5602,
+      "Nuclear": 0.288,
+      "Other Fossil": 0.0479,
       "Other Renewables": 0.0006,
-      "Solar": 0.0377,
-      "Wind": 0.0132
+      "Solar": 0.0416,
+      "Wind": 0.0139
     },
     "2022": {
       "Bioenergy": 0.0028,
-      "Coal": 0.0161,
-      "Gas": 0.0246,
-      "Hydro": 0.4873,
-      "Nuclear": 0.3539,
-      "Other Fossil": 0.0546,
+      "Coal": 0.016,
+      "Gas": 0.0244,
+      "Hydro": 0.4896,
+      "Nuclear": 0.3511,
+      "Other Fossil": 0.0442,
       "Other Renewables": 0.0006,
-      "Solar": 0.0459,
-      "Wind": 0.0142
+      "Solar": 0.0567,
+      "Wind": 0.0146
     },
     "2023": {
       "Bioenergy": 0.001,
       "Coal": 0.0056,
       "Gas": 0.0088,
-      "Hydro": 0.5503,
-      "Nuclear": 0.3266,
-      "Other Fossil": 0.0503,
+      "Hydro": 0.5479,
+      "Nuclear": 0.3242,
+      "Other Fossil": 0.0437,
       "Other Renewables": 0.0002,
-      "Solar": 0.0504,
-      "Wind": 0.0067
+      "Solar": 0.0612,
+      "Wind": 0.0073
     },
     "2024": {
       "Bioenergy": 0.0004,
       "Coal": 0.002,
-      "Gas": 0.0036,
-      "Hydro": 0.5955,
-      "Nuclear": 0.2942,
-      "Other Fossil": 0.0453,
+      "Gas": 0.0035,
+      "Hydro": 0.5894,
+      "Nuclear": 0.292,
+      "Other Fossil": 0.0396,
       "Other Renewables": 0.0001,
-      "Solar": 0.0554,
-      "Wind": 0.0036
+      "Solar": 0.0683,
+      "Wind": 0.0046
     },
     "2025": {
-      "Bioenergy": 0.003,
-      "Coal": 0.0162,
-      "Gas": 0.0283,
-      "Hydro": 0.4997,
-      "Nuclear": 0.3516,
-      "Other Fossil": 0.0437,
-      "Other Renewables": 0.0007,
-      "Solar": 0.0417,
-      "Wind": 0.0152
+      "Bioenergy": 0.0037,
+      "Coal": 0.0193,
+      "Gas": 0.0336,
+      "Hydro": 0.4234,
+      "Nuclear": 0.3755,
+      "Other Fossil": 0.0479,
+      "Other Renewables": 0.0008,
+      "Solar": 0.0763,
+      "Wind": 0.0193
     }
   },
   "CI": {
@@ -2990,15 +2990,15 @@
       "Wind": 0.1296
     },
     "2025": {
-      "Bioenergy": 0.024,
-      "Coal": 0.1299,
-      "Gas": 0.1617,
-      "Hydro": 0.2592,
+      "Bioenergy": 0.0233,
+      "Coal": 0.147,
+      "Gas": 0.1665,
+      "Hydro": 0.2488,
       "Nuclear": 0,
-      "Other Fossil": 0.0118,
-      "Other Renewables": 0.0015,
-      "Solar": 0.2744,
-      "Wind": 0.1376
+      "Other Fossil": 0.0119,
+      "Other Renewables": 0.0014,
+      "Solar": 0.264,
+      "Wind": 0.137
     }
   },
   "CM": {
@@ -3548,9 +3548,9 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.8182,
+      "Other Fossil": 0.8,
       "Other Renewables": 0,
-      "Solar": 0.1455,
+      "Solar": 0.1636,
       "Wind": 0.0364
     }
   },
@@ -3622,14 +3622,14 @@
       "Wind": 0.0103
     },
     "2025": {
-      "Bioenergy": 0.0336,
-      "Coal": 0.4418,
-      "Gas": 0.0647,
-      "Hydro": 0.0257,
-      "Nuclear": 0.3589,
-      "Other Fossil": 0.0109,
-      "Other Renewables": 0.0277,
-      "Solar": 0.0295,
+      "Bioenergy": 0.0343,
+      "Coal": 0.4228,
+      "Gas": 0.0634,
+      "Hydro": 0.0256,
+      "Nuclear": 0.3689,
+      "Other Fossil": 0.0103,
+      "Other Renewables": 0.0285,
+      "Solar": 0.0389,
       "Wind": 0.0074
     }
   },
@@ -3697,19 +3697,19 @@
       "Nuclear": 0.0111,
       "Other Fossil": 0.0445,
       "Other Renewables": 0.0004,
-      "Solar": 0.1479,
+      "Solar": 0.148,
       "Wind": 0.2727
     },
     "2025": {
-      "Bioenergy": 0.079,
-      "Coal": 0.2786,
-      "Gas": 0.2095,
-      "Hydro": 0.0353,
-      "Nuclear": 0.0038,
-      "Other Fossil": 0.0564,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0701,
-      "Wind": 0.2671
+      "Bioenergy": 0.0804,
+      "Coal": 0.2708,
+      "Gas": 0.1921,
+      "Hydro": 0.0346,
+      "Nuclear": 0.0048,
+      "Other Fossil": 0.0572,
+      "Other Renewables": 0.0002,
+      "Solar": 0.1025,
+      "Wind": 0.2576
     }
   },
   "DJ": {
@@ -3797,7 +3797,7 @@
       "Coal": 0.1378,
       "Gas": 0.1218,
       "Hydro": 0.0314,
-      "Nuclear": 0.0409,
+      "Nuclear": 0.0408,
       "Other Fossil": 0.0491,
       "Other Renewables": 0.0011,
       "Solar": 0.0356,
@@ -3811,7 +3811,7 @@
       "Nuclear": 0.045,
       "Other Fossil": 0.048,
       "Other Renewables": 0.0014,
-      "Solar": 0.0455,
+      "Solar": 0.0456,
       "Wind": 0.4829
     },
     "2021": {
@@ -3848,26 +3848,26 @@
       "Wind": 0.5468
     },
     "2024": {
-      "Bioenergy": 0.1066,
-      "Coal": 0.099,
+      "Bioenergy": 0.1064,
+      "Coal": 0.0988,
       "Gas": 0.0711,
       "Hydro": 0.0191,
-      "Nuclear": 0.0215,
-      "Other Fossil": 0.0343,
+      "Nuclear": 0.0216,
+      "Other Fossil": 0.0341,
       "Other Renewables": 0.0007,
-      "Solar": 0.105,
-      "Wind": 0.5426
+      "Solar": 0.1051,
+      "Wind": 0.5431
     },
     "2025": {
-      "Bioenergy": 0.1382,
-      "Coal": 0.1242,
-      "Gas": 0.1056,
-      "Hydro": 0.0239,
-      "Nuclear": 0.0303,
-      "Other Fossil": 0.0407,
-      "Other Renewables": 0.0009,
-      "Solar": 0.0403,
-      "Wind": 0.4959
+      "Bioenergy": 0.1374,
+      "Coal": 0.1105,
+      "Gas": 0.0925,
+      "Hydro": 0.0206,
+      "Nuclear": 0.0263,
+      "Other Fossil": 0.0372,
+      "Other Renewables": 0.0008,
+      "Solar": 0.0644,
+      "Wind": 0.5103
     }
   },
   "DM": {
@@ -4176,14 +4176,14 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0019,
-      "Gas": 0.0462,
-      "Hydro": 0.6323,
+      "Coal": 0.0022,
+      "Gas": 0.0464,
+      "Hydro": 0.6314,
       "Nuclear": 0.0015,
-      "Other Fossil": 0.303,
+      "Other Fossil": 0.3031,
       "Other Renewables": 0.0004,
-      "Solar": 0.0058,
-      "Wind": 0.0084
+      "Solar": 0.0057,
+      "Wind": 0.0088
     }
   },
   "EE": {
@@ -4195,7 +4195,7 @@
       "Nuclear": 0.0644,
       "Other Fossil": 0.5628,
       "Other Renewables": 0.003,
-      "Solar": 0.0093,
+      "Solar": 0.0094,
       "Wind": 0.1123
     },
     "2020": {
@@ -4228,7 +4228,7 @@
       "Nuclear": 0.0268,
       "Other Fossil": 0.6252,
       "Other Renewables": 0.0009,
-      "Solar": 0.0732,
+      "Solar": 0.0733,
       "Wind": 0.1014
     },
     "2023": {
@@ -4237,32 +4237,32 @@
       "Gas": 0.0994,
       "Hydro": 0.0704,
       "Nuclear": 0.0825,
-      "Other Fossil": 0.3376,
+      "Other Fossil": 0.3375,
       "Other Renewables": 0.0027,
       "Solar": 0.1159,
       "Wind": 0.1554
     },
     "2024": {
-      "Bioenergy": 0.0677,
-      "Coal": 0.0511,
-      "Gas": 0.0866,
-      "Hydro": 0.0659,
-      "Nuclear": 0.0755,
-      "Other Fossil": 0.3045,
+      "Bioenergy": 0.0675,
+      "Coal": 0.0509,
+      "Gas": 0.0864,
+      "Hydro": 0.0657,
+      "Nuclear": 0.0753,
+      "Other Fossil": 0.3037,
       "Other Renewables": 0.0024,
-      "Solar": 0.1441,
-      "Wind": 0.2023
+      "Solar": 0.1464,
+      "Wind": 0.2017
     },
     "2025": {
-      "Bioenergy": 0.0803,
-      "Coal": 0.0558,
-      "Gas": 0.0977,
-      "Hydro": 0.0581,
-      "Nuclear": 0.0743,
-      "Other Fossil": 0.4004,
-      "Other Renewables": 0.0023,
-      "Solar": 0.0244,
-      "Wind": 0.2065
+      "Bioenergy": 0.0799,
+      "Coal": 0.0514,
+      "Gas": 0.0897,
+      "Hydro": 0.0543,
+      "Nuclear": 0.0698,
+      "Other Fossil": 0.358,
+      "Other Renewables": 0.0022,
+      "Solar": 0.0636,
+      "Wind": 0.2312
     }
   },
   "EG": {
@@ -4324,24 +4324,24 @@
     "2024": {
       "Bioenergy": 0.0005,
       "Coal": 0,
-      "Gas": 0.8137,
-      "Hydro": 0.0645,
+      "Gas": 0.8034,
+      "Hydro": 0.0674,
       "Nuclear": 0,
-      "Other Fossil": 0.0757,
+      "Other Fossil": 0.0748,
       "Other Renewables": 0,
-      "Solar": 0.022,
-      "Wind": 0.0236
+      "Solar": 0.0245,
+      "Wind": 0.0294
     },
     "2025": {
-      "Bioenergy": 0.0004,
+      "Bioenergy": 0.0006,
       "Coal": 0,
-      "Gas": 0.8237,
-      "Hydro": 0.0589,
+      "Gas": 0.7876,
+      "Hydro": 0.0675,
       "Nuclear": 0,
-      "Other Fossil": 0.0767,
+      "Other Fossil": 0.0734,
       "Other Renewables": 0,
-      "Solar": 0.0194,
-      "Wind": 0.0209
+      "Solar": 0.0302,
+      "Wind": 0.0408
     }
   },
   "ER": {
@@ -4491,15 +4491,15 @@
       "Wind": 0.2368
     },
     "2025": {
-      "Bioenergy": 0.0146,
-      "Coal": 0.0136,
-      "Gas": 0.1831,
-      "Hydro": 0.1616,
-      "Nuclear": 0.2323,
-      "Other Fossil": 0.0069,
-      "Other Renewables": 0.0024,
-      "Solar": 0.1529,
-      "Wind": 0.2326
+      "Bioenergy": 0.0136,
+      "Coal": 0.0117,
+      "Gas": 0.1645,
+      "Hydro": 0.159,
+      "Nuclear": 0.2264,
+      "Other Fossil": 0.0067,
+      "Other Renewables": 0.0023,
+      "Solar": 0.1468,
+      "Wind": 0.2688
     }
   },
   "ET": {
@@ -4586,7 +4586,7 @@
       "Bioenergy": 0.1463,
       "Coal": 0.092,
       "Gas": 0.1047,
-      "Hydro": 0.1816,
+      "Hydro": 0.1815,
       "Nuclear": 0.3153,
       "Other Fossil": 0.0608,
       "Other Renewables": 0.0039,
@@ -4619,12 +4619,12 @@
       "Bioenergy": 0.1519,
       "Coal": 0.0705,
       "Gas": 0.0511,
-      "Hydro": 0.1864,
+      "Hydro": 0.1865,
       "Nuclear": 0.3194,
       "Other Fossil": 0.0567,
       "Other Renewables": 0.0011,
       "Solar": 0.012,
-      "Wind": 0.1509
+      "Wind": 0.151
     },
     "2023": {
       "Bioenergy": 0.1306,
@@ -4649,15 +4649,15 @@
       "Wind": 0.2352
     },
     "2025": {
-      "Bioenergy": 0.1094,
-      "Coal": 0.0239,
-      "Gas": 0.0232,
-      "Hydro": 0.1388,
-      "Nuclear": 0.3737,
-      "Other Fossil": 0.0545,
-      "Other Renewables": 0.0033,
-      "Solar": 0.0046,
-      "Wind": 0.2688
+      "Bioenergy": 0.1247,
+      "Coal": 0.0242,
+      "Gas": 0.0289,
+      "Hydro": 0.155,
+      "Nuclear": 0.3299,
+      "Other Fossil": 0.0532,
+      "Other Renewables": 0.0037,
+      "Solar": 0.0083,
+      "Wind": 0.2722
     }
   },
   "FJ": {
@@ -4940,7 +4940,7 @@
       "Other Fossil": 0.0082,
       "Other Renewables": 0.0003,
       "Solar": 0.0427,
-      "Wind": 0.0868
+      "Wind": 0.0869
     },
     "2023": {
       "Bioenergy": 0.0068,
@@ -4956,24 +4956,24 @@
     "2024": {
       "Bioenergy": 0.006,
       "Coal": 0.0012,
-      "Gas": 0.0341,
+      "Gas": 0.0342,
       "Hydro": 0.1223,
-      "Nuclear": 0.6963,
+      "Nuclear": 0.696,
       "Other Fossil": 0.0062,
       "Other Renewables": 0,
-      "Solar": 0.0444,
-      "Wind": 0.0896
+      "Solar": 0.0443,
+      "Wind": 0.0899
     },
     "2025": {
-      "Bioenergy": 0.005,
-      "Coal": 0.0066,
-      "Gas": 0.0579,
-      "Hydro": 0.1168,
-      "Nuclear": 0.692,
-      "Other Fossil": 0.0064,
+      "Bioenergy": 0.0052,
+      "Coal": 0.0045,
+      "Gas": 0.0525,
+      "Hydro": 0.1099,
+      "Nuclear": 0.6951,
+      "Other Fossil": 0.0068,
       "Other Renewables": 0,
-      "Solar": 0.028,
-      "Wind": 0.0874
+      "Solar": 0.035,
+      "Wind": 0.091
     }
   },
   "GA": {
@@ -5065,13 +5065,13 @@
       "Other Fossil": 0.0043,
       "Other Renewables": 0.0005,
       "Solar": 0.0427,
-      "Wind": 0.2176
+      "Wind": 0.2177
     },
     "2020": {
       "Bioenergy": 0.0677,
       "Coal": 0.026,
       "Gas": 0.3645,
-      "Hydro": 0.028,
+      "Hydro": 0.0279,
       "Nuclear": 0.1881,
       "Other Fossil": 0.0068,
       "Other Renewables": 0.0004,
@@ -5090,48 +5090,48 @@
       "Wind": 0.2307
     },
     "2022": {
-      "Bioenergy": 0.055,
+      "Bioenergy": 0.0548,
       "Coal": 0.0198,
-      "Gas": 0.4072,
+      "Gas": 0.4058,
       "Hydro": 0.0157,
-      "Nuclear": 0.1667,
-      "Other Fossil": 0.0097,
+      "Nuclear": 0.1661,
+      "Other Fossil": 0.0096,
       "Other Renewables": 0.0002,
-      "Solar": 0.0458,
-      "Wind": 0.2799
+      "Solar": 0.0457,
+      "Wind": 0.2823
     },
     "2023": {
-      "Bioenergy": 0.0538,
-      "Coal": 0.0237,
-      "Gas": 0.3527,
-      "Hydro": 0.028,
-      "Nuclear": 0.1645,
+      "Bioenergy": 0.0536,
+      "Coal": 0.0236,
+      "Gas": 0.3517,
+      "Hydro": 0.0279,
+      "Nuclear": 0.164,
       "Other Fossil": 0.0116,
       "Other Renewables": 0.0006,
-      "Solar": 0.0524,
-      "Wind": 0.3127
+      "Solar": 0.0522,
+      "Wind": 0.3147
     },
     "2024": {
-      "Bioenergy": 0.0736,
-      "Coal": 0.0223,
-      "Gas": 0.2986,
-      "Hydro": 0.0362,
-      "Nuclear": 0.1679,
-      "Other Fossil": 0.0149,
+      "Bioenergy": 0.074,
+      "Coal": 0.0224,
+      "Gas": 0.3002,
+      "Hydro": 0.0363,
+      "Nuclear": 0.1688,
+      "Other Fossil": 0.015,
       "Other Renewables": 0.0008,
-      "Solar": 0.0617,
-      "Wind": 0.324
+      "Solar": 0.0621,
+      "Wind": 0.3204
     },
     "2025": {
-      "Bioenergy": 0.07,
-      "Coal": 0.012,
-      "Gas": 0.367,
-      "Hydro": 0.0262,
-      "Nuclear": 0.1324,
-      "Other Fossil": 0.0155,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0243,
-      "Wind": 0.3522
+      "Bioenergy": 0.0688,
+      "Coal": 0.0156,
+      "Gas": 0.3951,
+      "Hydro": 0.031,
+      "Nuclear": 0.1452,
+      "Other Fossil": 0.0177,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0431,
+      "Wind": 0.2827
     }
   },
   "GD": {
@@ -5281,15 +5281,15 @@
       "Wind": 0.0136
     },
     "2025": {
-      "Bioenergy": 0.0059,
-      "Coal": 0.1449,
-      "Gas": 0.3147,
-      "Hydro": 0.4626,
-      "Nuclear": 0.0149,
+      "Bioenergy": 0.0064,
+      "Coal": 0.1632,
+      "Gas": 0.3437,
+      "Hydro": 0.4069,
+      "Nuclear": 0.0163,
       "Other Fossil": 0.0021,
-      "Other Renewables": 0.0015,
-      "Solar": 0.0229,
-      "Wind": 0.0305
+      "Other Renewables": 0.0016,
+      "Solar": 0.0264,
+      "Wind": 0.0332
     }
   },
   "GF": {
@@ -5933,7 +5933,7 @@
       "Nuclear": 0.0451,
       "Other Fossil": 0.0044,
       "Other Renewables": 0.0012,
-      "Solar": 0.0782,
+      "Solar": 0.0783,
       "Wind": 0.1337
     },
     "2020": {
@@ -5951,7 +5951,7 @@
       "Bioenergy": 0.0024,
       "Coal": 0.1224,
       "Gas": 0.4655,
-      "Hydro": 0.1067,
+      "Hydro": 0.1068,
       "Nuclear": 0.0179,
       "Other Fossil": 0.0017,
       "Other Renewables": 0.0005,
@@ -5961,12 +5961,12 @@
     "2022": {
       "Bioenergy": 0.0028,
       "Coal": 0.1326,
-      "Gas": 0.4241,
+      "Gas": 0.424,
       "Hydro": 0.0858,
       "Nuclear": 0.0186,
       "Other Fossil": 0.002,
       "Other Renewables": 0.0006,
-      "Solar": 0.1232,
+      "Solar": 0.1233,
       "Wind": 0.2102
     },
     "2023": {
@@ -5978,29 +5978,29 @@
       "Other Fossil": 0.0023,
       "Other Renewables": 0.0007,
       "Solar": 0.1781,
-      "Wind": 0.2194
+      "Wind": 0.2195
     },
     "2024": {
       "Bioenergy": 0.0007,
-      "Coal": 0.0675,
-      "Gas": 0.4215,
-      "Hydro": 0.0575,
+      "Coal": 0.0676,
+      "Gas": 0.4221,
+      "Hydro": 0.0576,
       "Nuclear": 0.0053,
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0002,
-      "Solar": 0.2274,
-      "Wind": 0.2193
+      "Solar": 0.2264,
+      "Wind": 0.2196
     },
     "2025": {
-      "Bioenergy": 0,
-      "Coal": 0.1026,
-      "Gas": 0.521,
-      "Hydro": 0.0428,
-      "Nuclear": 0,
-      "Other Fossil": 0,
-      "Other Renewables": 0,
-      "Solar": 0.155,
-      "Wind": 0.1786
+      "Bioenergy": 0.0003,
+      "Coal": 0.0876,
+      "Gas": 0.47,
+      "Hydro": 0.0407,
+      "Nuclear": 0.0018,
+      "Other Fossil": 0.0002,
+      "Other Renewables": 0.0001,
+      "Solar": 0.1905,
+      "Wind": 0.2088
     }
   },
   "GT": {
@@ -6387,15 +6387,15 @@
       "Wind": 0.0184
     },
     "2025": {
-      "Bioenergy": 0.0085,
-      "Coal": 0.5648,
-      "Gas": 0.3405,
-      "Hydro": 0.0215,
-      "Nuclear": 0.0142,
-      "Other Fossil": 0.0057,
+      "Bioenergy": 0.0083,
+      "Coal": 0.5654,
+      "Gas": 0.3397,
+      "Hydro": 0.0217,
+      "Nuclear": 0.0139,
+      "Other Fossil": 0.0055,
       "Other Renewables": 0.0014,
-      "Solar": 0.0221,
-      "Wind": 0.0213
+      "Solar": 0.0227,
+      "Wind": 0.0214
     }
   },
   "HN": {
@@ -6467,14 +6467,14 @@
     },
     "2025": {
       "Bioenergy": 0.1282,
-      "Coal": 0.005,
-      "Gas": 0.0048,
-      "Hydro": 0.2241,
+      "Coal": 0.0051,
+      "Gas": 0.0049,
+      "Hydro": 0.2238,
       "Nuclear": 0.0005,
       "Other Fossil": 0.4372,
       "Other Renewables": 0.0264,
-      "Solar": 0.1001,
-      "Wind": 0.0736
+      "Solar": 0.1,
+      "Wind": 0.0737
     }
   },
   "HR": {
@@ -6494,7 +6494,7 @@
       "Coal": 0.1104,
       "Gas": 0.253,
       "Hydro": 0.3434,
-      "Nuclear": 0.0648,
+      "Nuclear": 0.0647,
       "Other Fossil": 0.0089,
       "Other Renewables": 0.0308,
       "Solar": 0.0181,
@@ -6506,7 +6506,7 @@
       "Gas": 0.2097,
       "Hydro": 0.391,
       "Nuclear": 0.0549,
-      "Other Fossil": 0.0076,
+      "Other Fossil": 0.0075,
       "Other Renewables": 0.0284,
       "Solar": 0.0174,
       "Wind": 0.138
@@ -6517,7 +6517,7 @@
       "Gas": 0.2539,
       "Hydro": 0.2971,
       "Nuclear": 0.0572,
-      "Other Fossil": 0.0075,
+      "Other Fossil": 0.0074,
       "Other Renewables": 0.0244,
       "Solar": 0.027,
       "Wind": 0.1601
@@ -6539,21 +6539,21 @@
       "Gas": 0.2145,
       "Hydro": 0.3472,
       "Nuclear": 0.0543,
-      "Other Fossil": 0.0097,
+      "Other Fossil": 0.0098,
       "Other Renewables": 0.0163,
-      "Solar": 0.0701,
+      "Solar": 0.0702,
       "Wind": 0.1733
     },
-    "2025": {
-      "Bioenergy": 0.0394,
-      "Coal": 0.0439,
-      "Gas": 0.2815,
-      "Hydro": 0.3134,
-      "Nuclear": 0.0579,
-      "Other Fossil": 0.0125,
-      "Other Renewables": 0.0143,
-      "Solar": 0.0396,
-      "Wind": 0.1974
+    "2025": {
+      "Bioenergy": 0.038,
+      "Coal": 0.0344,
+      "Gas": 0.2406,
+      "Hydro": 0.3511,
+      "Nuclear": 0.046,
+      "Other Fossil": 0.0113,
+      "Other Renewables": 0.0141,
+      "Solar": 0.0509,
+      "Wind": 0.2136
     }
   },
   "HT": {
@@ -6651,7 +6651,7 @@
       "Bioenergy": 0.0311,
       "Coal": 0.126,
       "Gas": 0.2512,
-      "Hydro": 0.0537,
+      "Hydro": 0.0536,
       "Nuclear": 0.4033,
       "Other Fossil": 0.0217,
       "Other Renewables": 0.0045,
@@ -6677,8 +6677,8 @@
       "Nuclear": 0.3819,
       "Other Fossil": 0.0219,
       "Other Renewables": 0.0044,
-      "Solar": 0.1175,
-      "Wind": 0.0442
+      "Solar": 0.1176,
+      "Wind": 0.0443
     },
     "2023": {
       "Bioenergy": 0.0239,
@@ -6694,24 +6694,24 @@
     "2024": {
       "Bioenergy": 0.0265,
       "Coal": 0.0881,
-      "Gas": 0.191,
+      "Gas": 0.1911,
       "Hydro": 0.0455,
       "Nuclear": 0.3711,
-      "Other Fossil": 0.0177,
+      "Other Fossil": 0.0178,
       "Other Renewables": 0.004,
-      "Solar": 0.2112,
+      "Solar": 0.2113,
       "Wind": 0.0448
     },
     "2025": {
-      "Bioenergy": 0.0377,
-      "Coal": 0.0805,
-      "Gas": 0.2926,
-      "Hydro": 0.0471,
-      "Nuclear": 0.3496,
+      "Bioenergy": 0.0394,
+      "Coal": 0.0762,
+      "Gas": 0.2635,
+      "Hydro": 0.0456,
+      "Nuclear": 0.3625,
       "Other Fossil": 0.0177,
       "Other Renewables": 0.0041,
-      "Solar": 0.125,
-      "Wind": 0.0456
+      "Solar": 0.1453,
+      "Wind": 0.0459
     }
   },
   "ID": {
@@ -6847,7 +6847,7 @@
       "Other Fossil": 0.036,
       "Other Renewables": 0.0008,
       "Solar": 0.0191,
-      "Wind": 0.3593
+      "Wind": 0.3594
     },
     "2024": {
       "Bioenergy": 0.0079,
@@ -6861,15 +6861,15 @@
       "Wind": 0.3483
     },
     "2025": {
-      "Bioenergy": 0.0068,
-      "Coal": 0.036,
-      "Gas": 0.4043,
+      "Bioenergy": 0.0069,
+      "Coal": 0.0355,
+      "Gas": 0.4034,
       "Hydro": 0.0493,
-      "Nuclear": 0.027,
-      "Other Fossil": 0.0341,
-      "Other Renewables": 0.0008,
-      "Solar": 0.0119,
-      "Wind": 0.4296
+      "Nuclear": 0.0271,
+      "Other Fossil": 0.0342,
+      "Other Renewables": 0.0009,
+      "Solar": 0.0134,
+      "Wind": 0.4294
     }
   },
   "IL": {
@@ -7019,15 +7019,15 @@
       "Wind": 0.0452
     },
     "2025": {
-      "Bioenergy": 0.0163,
-      "Coal": 0.7633,
-      "Gas": 0.0102,
-      "Hydro": 0.0543,
-      "Nuclear": 0.0324,
-      "Other Fossil": 0.0003,
+      "Bioenergy": 0.0144,
+      "Coal": 0.7658,
+      "Gas": 0.0112,
+      "Hydro": 0.0535,
+      "Nuclear": 0.0304,
+      "Other Fossil": 0.0002,
       "Other Renewables": 0.0016,
-      "Solar": 0.0833,
-      "Wind": 0.0382
+      "Solar": 0.0884,
+      "Wind": 0.0344
     }
   },
   "IQ": {
@@ -7292,7 +7292,7 @@
     },
     "2021": {
       "Bioenergy": 0.0615,
-      "Coal": 0.0648,
+      "Coal": 0.0647,
       "Gas": 0.4753,
       "Hydro": 0.1583,
       "Nuclear": 0.0308,
@@ -7324,26 +7324,26 @@
       "Wind": 0.1015
     },
     "2024": {
-      "Bioenergy": 0.0555,
-      "Coal": 0.0352,
-      "Gas": 0.4092,
+      "Bioenergy": 0.0554,
+      "Coal": 0.0351,
+      "Gas": 0.408,
       "Hydro": 0.1861,
       "Nuclear": 0.0346,
-      "Other Fossil": 0.0313,
-      "Other Renewables": 0.0189,
-      "Solar": 0.1321,
-      "Wind": 0.097
+      "Other Fossil": 0.0335,
+      "Other Renewables": 0.0188,
+      "Solar": 0.132,
+      "Wind": 0.0964
     },
     "2025": {
-      "Bioenergy": 0.0542,
-      "Coal": 0.0411,
-      "Gas": 0.5059,
-      "Hydro": 0.1129,
-      "Nuclear": 0.0352,
-      "Other Fossil": 0.0252,
-      "Other Renewables": 0.0192,
-      "Solar": 0.0744,
-      "Wind": 0.1319
+      "Bioenergy": 0.0544,
+      "Coal": 0.0406,
+      "Gas": 0.5032,
+      "Hydro": 0.1124,
+      "Nuclear": 0.0354,
+      "Other Fossil": 0.0298,
+      "Other Renewables": 0.019,
+      "Solar": 0.0767,
+      "Wind": 0.1284
     }
   },
   "JM": {
@@ -7651,15 +7651,15 @@
       "Wind": 0.1314
     },
     "2025": {
-      "Bioenergy": 0.0174,
-      "Coal": 0.0307,
-      "Gas": 0.042,
-      "Hydro": 0.2623,
-      "Nuclear": 0.0015,
-      "Other Fossil": 0.0827,
-      "Other Renewables": 0.3989,
-      "Solar": 0.0351,
-      "Wind": 0.1294
+      "Bioenergy": 0.017,
+      "Coal": 0.0349,
+      "Gas": 0.0478,
+      "Hydro": 0.2502,
+      "Nuclear": 0.0017,
+      "Other Fossil": 0.0817,
+      "Other Renewables": 0.3974,
+      "Solar": 0.0345,
+      "Wind": 0.1348
     }
   },
   "KG": {
@@ -7730,14 +7730,14 @@
       "Wind": 0.0067
     },
     "2025": {
-      "Bioenergy": 0.0017,
-      "Coal": 0.0995,
-      "Gas": 0.0159,
-      "Hydro": 0.8397,
-      "Nuclear": 0.0042,
-      "Other Fossil": 0.0256,
+      "Bioenergy": 0.0016,
+      "Coal": 0.0997,
+      "Gas": 0.0157,
+      "Hydro": 0.8398,
+      "Nuclear": 0.0041,
+      "Other Fossil": 0.0255,
       "Other Renewables": 0.0004,
-      "Solar": 0.0065,
+      "Solar": 0.0067,
       "Wind": 0.0064
     }
   },
@@ -7809,15 +7809,15 @@
       "Wind": 0.0185
     },
     "2025": {
-      "Bioenergy": 0.014,
-      "Coal": 0.4636,
-      "Gas": 0.0256,
-      "Hydro": 0.372,
-      "Nuclear": 0.0143,
-      "Other Fossil": 0.0557,
+      "Bioenergy": 0.0138,
+      "Coal": 0.4642,
+      "Gas": 0.0248,
+      "Hydro": 0.3722,
+      "Nuclear": 0.014,
+      "Other Fossil": 0.0556,
       "Other Renewables": 0.0014,
-      "Solar": 0.0318,
-      "Wind": 0.0215
+      "Solar": 0.0325,
+      "Wind": 0.0216
     }
   },
   "KI": {
@@ -8442,14 +8442,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5504,
-      "Gas": 0.2979,
-      "Hydro": 0.0745,
+      "Coal": 0.5726,
+      "Gas": 0.2894,
+      "Hydro": 0.0664,
       "Nuclear": 0,
-      "Other Fossil": 0.0227,
+      "Other Fossil": 0.0218,
       "Other Renewables": 0,
-      "Solar": 0.0082,
-      "Wind": 0.0463
+      "Solar": 0.0101,
+      "Wind": 0.0397
     }
   },
   "LA": {
@@ -8935,7 +8935,7 @@
       "Nuclear": 0.173,
       "Other Fossil": 0.0417,
       "Other Renewables": 0.0047,
-      "Solar": 0.0292,
+      "Solar": 0.0293,
       "Wind": 0.1838
     },
     "2020": {
@@ -8946,63 +8946,63 @@
       "Nuclear": 0.1448,
       "Other Fossil": 0.0382,
       "Other Renewables": 0.0044,
-      "Solar": 0.0301,
+      "Solar": 0.0302,
       "Wind": 0.1952
     },
     "2021": {
       "Bioenergy": 0.0533,
       "Coal": 0.1139,
-      "Gas": 0.2747,
-      "Hydro": 0.1488,
+      "Gas": 0.2746,
+      "Hydro": 0.1489,
       "Nuclear": 0.1594,
       "Other Fossil": 0.0369,
       "Other Renewables": 0.0046,
-      "Solar": 0.0368,
+      "Solar": 0.0369,
       "Wind": 0.1715
     },
     "2022": {
       "Bioenergy": 0.0516,
       "Coal": 0.1206,
-      "Gas": 0.226,
+      "Gas": 0.2259,
       "Hydro": 0.1432,
       "Nuclear": 0.1412,
-      "Other Fossil": 0.0472,
+      "Other Fossil": 0.0471,
       "Other Renewables": 0.0047,
-      "Solar": 0.0641,
-      "Wind": 0.2014
+      "Solar": 0.0642,
+      "Wind": 0.2015
     },
     "2023": {
       "Bioenergy": 0.0386,
       "Coal": 0.0891,
       "Gas": 0.195,
-      "Hydro": 0.135,
+      "Hydro": 0.1349,
       "Nuclear": 0.1202,
-      "Other Fossil": 0.0575,
+      "Other Fossil": 0.0574,
       "Other Renewables": 0.0039,
-      "Solar": 0.0891,
-      "Wind": 0.2715
+      "Solar": 0.0892,
+      "Wind": 0.2716
     },
     "2024": {
       "Bioenergy": 0.0307,
       "Coal": 0.0609,
       "Gas": 0.1656,
-      "Hydro": 0.1099,
+      "Hydro": 0.1098,
       "Nuclear": 0.0913,
       "Other Fossil": 0.0841,
       "Other Renewables": 0.0029,
-      "Solar": 0.1398,
+      "Solar": 0.1399,
       "Wind": 0.3148
     },
     "2025": {
-      "Bioenergy": 0.0228,
-      "Coal": 0.0608,
-      "Gas": 0.2932,
-      "Hydro": 0.0837,
-      "Nuclear": 0.0804,
-      "Other Fossil": 0.1109,
-      "Other Renewables": 0.0025,
-      "Solar": 0.0463,
-      "Wind": 0.2992
+      "Bioenergy": 0.0243,
+      "Coal": 0.0505,
+      "Gas": 0.2596,
+      "Hydro": 0.0767,
+      "Nuclear": 0.0678,
+      "Other Fossil": 0.108,
+      "Other Renewables": 0.0021,
+      "Solar": 0.0667,
+      "Wind": 0.3443
     }
   },
   "LU": {
@@ -9014,52 +9014,52 @@
       "Nuclear": 0.1813,
       "Other Fossil": 0.041,
       "Other Renewables": 0.0049,
-      "Solar": 0.05,
+      "Solar": 0.0501,
       "Wind": 0.1279
     },
     "2020": {
       "Bioenergy": 0.0716,
       "Coal": 0.1151,
       "Gas": 0.2389,
-      "Hydro": 0.1523,
+      "Hydro": 0.1522,
       "Nuclear": 0.1668,
       "Other Fossil": 0.0391,
       "Other Renewables": 0.0051,
-      "Solar": 0.0574,
+      "Solar": 0.0575,
       "Wind": 0.1538
     },
     "2021": {
       "Bioenergy": 0.0794,
-      "Coal": 0.1201,
-      "Gas": 0.2382,
-      "Hydro": 0.1481,
+      "Coal": 0.12,
+      "Gas": 0.2381,
+      "Hydro": 0.1482,
       "Nuclear": 0.1686,
-      "Other Fossil": 0.0379,
+      "Other Fossil": 0.0378,
       "Other Renewables": 0.0049,
-      "Solar": 0.0655,
+      "Solar": 0.0656,
       "Wind": 0.1374
     },
     "2022": {
       "Bioenergy": 0.0844,
-      "Coal": 0.1282,
-      "Gas": 0.2269,
+      "Coal": 0.1281,
+      "Gas": 0.2268,
       "Hydro": 0.1306,
       "Nuclear": 0.1501,
-      "Other Fossil": 0.0383,
+      "Other Fossil": 0.0382,
       "Other Renewables": 0.005,
-      "Solar": 0.0879,
-      "Wind": 0.1486
+      "Solar": 0.0881,
+      "Wind": 0.1487
     },
     "2023": {
       "Bioenergy": 0.0551,
       "Coal": 0.111,
-      "Gas": 0.1981,
+      "Gas": 0.198,
       "Hydro": 0.1442,
       "Nuclear": 0.1506,
-      "Other Fossil": 0.0367,
+      "Other Fossil": 0.0366,
       "Other Renewables": 0.0049,
-      "Solar": 0.0991,
-      "Wind": 0.2003
+      "Solar": 0.0992,
+      "Wind": 0.2004
     },
     "2024": {
       "Bioenergy": 0.0735,
@@ -9069,19 +9069,19 @@
       "Nuclear": 0.1479,
       "Other Fossil": 0.0371,
       "Other Renewables": 0.0047,
-      "Solar": 0.1155,
-      "Wind": 0.1859
+      "Solar": 0.1157,
+      "Wind": 0.1857
     },
     "2025": {
-      "Bioenergy": 0.06,
-      "Coal": 0.1192,
-      "Gas": 0.2311,
-      "Hydro": 0.1469,
-      "Nuclear": 0.158,
-      "Other Fossil": 0.0398,
+      "Bioenergy": 0.0742,
+      "Coal": 0.1112,
+      "Gas": 0.2165,
+      "Hydro": 0.1406,
+      "Nuclear": 0.1512,
+      "Other Fossil": 0.0391,
       "Other Renewables": 0.0048,
-      "Solar": 0.0558,
-      "Wind": 0.1843
+      "Solar": 0.0842,
+      "Wind": 0.1783
     }
   },
   "LV": {
@@ -9113,54 +9113,54 @@
       "Gas": 0.3106,
       "Hydro": 0.3885,
       "Nuclear": 0.0576,
-      "Other Fossil": 0.0714,
+      "Other Fossil": 0.0713,
       "Other Renewables": 0.0017,
-      "Solar": 0.0123,
+      "Solar": 0.0124,
       "Wind": 0.0405
     },
     "2022": {
       "Bioenergy": 0.058,
-      "Coal": 0.0585,
+      "Coal": 0.0584,
       "Gas": 0.2505,
-      "Hydro": 0.4326,
+      "Hydro": 0.4327,
       "Nuclear": 0.0677,
-      "Other Fossil": 0.0449,
+      "Other Fossil": 0.0448,
       "Other Renewables": 0.0023,
       "Solar": 0.0231,
-      "Wind": 0.0623
+      "Wind": 0.0624
     },
     "2023": {
       "Bioenergy": 0.0367,
-      "Coal": 0.039,
+      "Coal": 0.0389,
       "Gas": 0.2485,
       "Hydro": 0.4887,
       "Nuclear": 0.0568,
       "Other Fossil": 0.0241,
       "Other Renewables": 0.0019,
-      "Solar": 0.0407,
-      "Wind": 0.0636
+      "Solar": 0.0408,
+      "Wind": 0.0637
     },
     "2024": {
-      "Bioenergy": 0.0459,
-      "Coal": 0.0395,
-      "Gas": 0.2678,
-      "Hydro": 0.4253,
-      "Nuclear": 0.0591,
-      "Other Fossil": 0.0161,
+      "Bioenergy": 0.0543,
+      "Coal": 0.0392,
+      "Gas": 0.2658,
+      "Hydro": 0.4251,
+      "Nuclear": 0.0587,
+      "Other Fossil": 0.0103,
       "Other Renewables": 0.0019,
-      "Solar": 0.0779,
-      "Wind": 0.0665
+      "Solar": 0.0774,
+      "Wind": 0.0674
     },
     "2025": {
-      "Bioenergy": 0.0303,
-      "Coal": 0.0032,
-      "Gas": 0.5085,
-      "Hydro": 0.3898,
-      "Nuclear": 0.0045,
-      "Other Fossil": 0.0153,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0194,
-      "Wind": 0.0289
+      "Bioenergy": 0.0523,
+      "Coal": 0.0077,
+      "Gas": 0.4014,
+      "Hydro": 0.4429,
+      "Nuclear": 0.011,
+      "Other Fossil": 0.0119,
+      "Other Renewables": 0.0003,
+      "Solar": 0.0341,
+      "Wind": 0.0385
     }
   },
   "LY": {
@@ -9363,8 +9363,8 @@
       "Nuclear": 0.0308,
       "Other Fossil": 0.0035,
       "Other Renewables": 0.001,
-      "Solar": 0.0078,
-      "Wind": 0.0182
+      "Solar": 0.0079,
+      "Wind": 0.0183
     },
     "2023": {
       "Bioenergy": 0.0008,
@@ -9390,14 +9390,14 @@
     },
     "2025": {
       "Bioenergy": 0.0006,
-      "Coal": 0.0032,
-      "Gas": 0.9222,
+      "Coal": 0.0031,
+      "Gas": 0.9221,
       "Hydro": 0.045,
       "Nuclear": 0.0042,
-      "Other Fossil": 0.0004,
+      "Other Fossil": 0.0005,
       "Other Renewables": 0.0001,
-      "Solar": 0.0217,
-      "Wind": 0.0027
+      "Solar": 0.022,
+      "Wind": 0.0026
     }
   },
   "ME": {
@@ -9409,7 +9409,7 @@
       "Nuclear": 0.06,
       "Other Fossil": 0.0058,
       "Other Renewables": 0.0017,
-      "Solar": 0.01,
+      "Solar": 0.0101,
       "Wind": 0.0883
     },
     "2020": {
@@ -9420,7 +9420,7 @@
       "Nuclear": 0.0516,
       "Other Fossil": 0.005,
       "Other Renewables": 0.0015,
-      "Solar": 0.0084,
+      "Solar": 0.0085,
       "Wind": 0.1041
     },
     "2021": {
@@ -9429,9 +9429,9 @@
       "Gas": 0.0351,
       "Hydro": 0.4625,
       "Nuclear": 0.0316,
-      "Other Fossil": 0.0031,
+      "Other Fossil": 0.003,
       "Other Renewables": 0.0009,
-      "Solar": 0.0086,
+      "Solar": 0.0087,
       "Wind": 0.0929
     },
     "2022": {
@@ -9453,7 +9453,7 @@
       "Nuclear": 0.006,
       "Other Fossil": 0.0006,
       "Other Renewables": 0.0002,
-      "Solar": 0.0028,
+      "Solar": 0.0029,
       "Wind": 0.0889
     },
     "2024": {
@@ -9468,15 +9468,15 @@
       "Wind": 0.0916
     },
     "2025": {
-      "Bioenergy": 0.0042,
-      "Coal": 0.4227,
-      "Gas": 0.0397,
-      "Hydro": 0.4036,
-      "Nuclear": 0.0301,
-      "Other Fossil": 0.0032,
-      "Other Renewables": 0.0009,
-      "Solar": 0.0063,
-      "Wind": 0.0891
+      "Bioenergy": 0.0037,
+      "Coal": 0.3896,
+      "Gas": 0.0336,
+      "Hydro": 0.437,
+      "Nuclear": 0.0261,
+      "Other Fossil": 0.0028,
+      "Other Renewables": 0.0008,
+      "Solar": 0.0066,
+      "Wind": 0.0997
     }
   },
   "MG": {
@@ -9578,7 +9578,7 @@
       "Nuclear": 0.061,
       "Other Fossil": 0.006,
       "Other Renewables": 0.0018,
-      "Solar": 0.0081,
+      "Solar": 0.0082,
       "Wind": 0.047
     },
     "2021": {
@@ -9598,7 +9598,7 @@
       "Gas": 0.1882,
       "Hydro": 0.2297,
       "Nuclear": 0.0414,
-      "Other Fossil": 0.0396,
+      "Other Fossil": 0.0395,
       "Other Renewables": 0.0013,
       "Solar": 0.0123,
       "Wind": 0.0391
@@ -9619,22 +9619,22 @@
       "Coal": 0.3936,
       "Gas": 0.2328,
       "Hydro": 0.2409,
-      "Nuclear": 0.0182,
-      "Other Fossil": 0.0018,
+      "Nuclear": 0.0183,
+      "Other Fossil": 0.0019,
       "Other Renewables": 0.0006,
       "Solar": 0.05,
-      "Wind": 0.043
+      "Wind": 0.0428
     },
     "2025": {
-      "Bioenergy": 0.0192,
-      "Coal": 0.3407,
-      "Gas": 0.257,
-      "Hydro": 0.2274,
-      "Nuclear": 0.0554,
-      "Other Fossil": 0.0059,
-      "Other Renewables": 0.0017,
-      "Solar": 0.0231,
-      "Wind": 0.0696
+      "Bioenergy": 0.0193,
+      "Coal": 0.3167,
+      "Gas": 0.2779,
+      "Hydro": 0.2273,
+      "Nuclear": 0.0556,
+      "Other Fossil": 0.006,
+      "Other Renewables": 0.0018,
+      "Solar": 0.0376,
+      "Wind": 0.0578
     }
   },
   "ML": {
@@ -9864,14 +9864,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.9222,
+      "Coal": 0.9198,
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0778
+      "Wind": 0.0802
     }
   },
   "MO": {
@@ -9942,15 +9942,15 @@
       "Wind": 0.0626
     },
     "2025": {
-      "Bioenergy": 0.057,
-      "Coal": 0.4698,
-      "Gas": 0.1639,
-      "Hydro": 0.0732,
-      "Nuclear": 0.0484,
-      "Other Fossil": 0.036,
-      "Other Renewables": 0.0049,
-      "Solar": 0.0741,
-      "Wind": 0.0727
+      "Bioenergy": 0.0564,
+      "Coal": 0.4718,
+      "Gas": 0.1613,
+      "Hydro": 0.0739,
+      "Nuclear": 0.0473,
+      "Other Fossil": 0.0354,
+      "Other Renewables": 0.0047,
+      "Solar": 0.0763,
+      "Wind": 0.0729
     }
   },
   "MQ": {
@@ -10216,7 +10216,7 @@
     "2021": {
       "Bioenergy": 0.0045,
       "Coal": 0.0247,
-      "Gas": 0.8673,
+      "Gas": 0.8672,
       "Hydro": 0.025,
       "Nuclear": 0.0335,
       "Other Fossil": 0.0234,
@@ -10228,12 +10228,12 @@
       "Bioenergy": 0.0052,
       "Coal": 0.0288,
       "Gas": 0.8159,
-      "Hydro": 0.0267,
+      "Hydro": 0.0268,
       "Nuclear": 0.0339,
-      "Other Fossil": 0.0277,
+      "Other Fossil": 0.0276,
       "Other Renewables": 0.0011,
       "Solar": 0.0417,
-      "Wind": 0.019
+      "Wind": 0.0191
     },
     "2023": {
       "Bioenergy": 0.0043,
@@ -10250,23 +10250,23 @@
       "Bioenergy": 0.0064,
       "Coal": 0.0302,
       "Gas": 0.7037,
-      "Hydro": 0.0407,
+      "Hydro": 0.0406,
       "Nuclear": 0.0461,
       "Other Fossil": 0.0069,
       "Other Renewables": 0.0015,
-      "Solar": 0.1363,
+      "Solar": 0.1364,
       "Wind": 0.0282
     },
     "2025": {
-      "Bioenergy": 0.0067,
-      "Coal": 0.0368,
-      "Gas": 0.7612,
-      "Hydro": 0.0382,
-      "Nuclear": 0.0487,
-      "Other Fossil": 0.0052,
+      "Bioenergy": 0.0068,
+      "Coal": 0.0358,
+      "Gas": 0.7594,
+      "Hydro": 0.0381,
+      "Nuclear": 0.0489,
+      "Other Fossil": 0.0053,
       "Other Renewables": 0.0015,
-      "Solar": 0.0708,
-      "Wind": 0.0309
+      "Solar": 0.0735,
+      "Wind": 0.0306
     }
   },
   "MU": {
@@ -10575,14 +10575,14 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.047,
-      "Gas": 0.611,
-      "Hydro": 0.0497,
-      "Nuclear": 0.0428,
-      "Other Fossil": 0.1114,
-      "Other Renewables": 0.012,
-      "Solar": 0.047,
-      "Wind": 0.0786
+      "Coal": 0.0563,
+      "Gas": 0.6021,
+      "Hydro": 0.0491,
+      "Nuclear": 0.0422,
+      "Other Fossil": 0.1141,
+      "Other Renewables": 0.0118,
+      "Solar": 0.0464,
+      "Wind": 0.0776
     }
   },
   "MY": {
@@ -10653,12 +10653,12 @@
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0243,
-      "Coal": 0.4267,
-      "Gas": 0.3404,
-      "Hydro": 0.1837,
+      "Bioenergy": 0.0239,
+      "Coal": 0.4443,
+      "Gas": 0.3283,
+      "Hydro": 0.1797,
       "Nuclear": 0,
-      "Other Fossil": 0.0061,
+      "Other Fossil": 0.0049,
       "Other Renewables": 0,
       "Solar": 0.0189,
       "Wind": 0
@@ -11128,14 +11128,14 @@
     },
     "2025": {
       "Bioenergy": 0.1682,
-      "Coal": 0.0024,
-      "Gas": 0.0188,
-      "Hydro": 0.0887,
+      "Coal": 0.0027,
+      "Gas": 0.0191,
+      "Hydro": 0.0876,
       "Nuclear": 0.0019,
-      "Other Fossil": 0.3981,
+      "Other Fossil": 0.3982,
       "Other Renewables": 0.1562,
-      "Solar": 0.0133,
-      "Wind": 0.1524
+      "Solar": 0.0132,
+      "Wind": 0.1529
     }
   },
   "NL": {
@@ -11206,15 +11206,15 @@
       "Wind": 0.2732
     },
     "2025": {
-      "Bioenergy": 0.0688,
-      "Coal": 0.1565,
-      "Gas": 0.4042,
+      "Bioenergy": 0.0707,
+      "Coal": 0.141,
+      "Gas": 0.4095,
       "Hydro": 0.0009,
-      "Nuclear": 0.0297,
-      "Other Fossil": 0.0137,
+      "Nuclear": 0.0303,
+      "Other Fossil": 0.0083,
       "Other Renewables": 0.0038,
-      "Solar": 0.0815,
-      "Wind": 0.241
+      "Solar": 0.1185,
+      "Wind": 0.2171
     }
   },
   "NO": {
@@ -11255,7 +11255,7 @@
       "Bioenergy": 0.0002,
       "Coal": 0.001,
       "Gas": 0.0101,
-      "Hydro": 0.879,
+      "Hydro": 0.8789,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0018,
       "Other Renewables": 0.0027,
@@ -11287,13 +11287,13 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.0071,
-      "Hydro": 0.9088,
+      "Gas": 0.0074,
+      "Hydro": 0.9027,
       "Nuclear": 0,
       "Other Fossil": 0.0006,
-      "Other Renewables": 0.0025,
+      "Other Renewables": 0.0026,
       "Solar": 0,
-      "Wind": 0.0809
+      "Wind": 0.0866
     }
   },
   "NP": {
@@ -11364,14 +11364,14 @@
       "Wind": 0.0165
     },
     "2025": {
-      "Bioenergy": 0.0047,
-      "Coal": 0.1145,
-      "Gas": 0.0211,
-      "Hydro": 0.7978,
-      "Nuclear": 0.0118,
-      "Other Fossil": 0.0016,
-      "Other Renewables": 0.0012,
-      "Solar": 0.0283,
+      "Bioenergy": 0.0045,
+      "Coal": 0.115,
+      "Gas": 0.0205,
+      "Hydro": 0.7979,
+      "Nuclear": 0.0115,
+      "Other Fossil": 0.0015,
+      "Other Renewables": 0.0011,
+      "Solar": 0.0289,
       "Wind": 0.019
     }
   },
@@ -12154,15 +12154,15 @@
       "Wind": 0.0244
     },
     "2025": {
-      "Bioenergy": 0.0099,
-      "Coal": 0.0905,
-      "Gas": 0.2555,
-      "Hydro": 0.1769,
-      "Nuclear": 0.2058,
-      "Other Fossil": 0,
+      "Bioenergy": 0.0089,
+      "Coal": 0.1463,
+      "Gas": 0.2064,
+      "Hydro": 0.1597,
+      "Nuclear": 0.2016,
+      "Other Fossil": 0.0038,
       "Other Renewables": 0,
-      "Solar": 0.2356,
-      "Wind": 0.0258
+      "Solar": 0.2541,
+      "Wind": 0.0192
     }
   },
   "PL": {
@@ -12222,26 +12222,26 @@
       "Wind": 0.1447
     },
     "2024": {
-      "Bioenergy": 0.0152,
-      "Coal": 0.5574,
-      "Gas": 0.1068,
-      "Hydro": 0.0156,
+      "Bioenergy": 0.0151,
+      "Coal": 0.5564,
+      "Gas": 0.1066,
+      "Hydro": 0.0154,
       "Nuclear": 0.0037,
-      "Other Fossil": 0.0415,
-      "Other Renewables": 0.001,
-      "Solar": 0.1101,
-      "Wind": 0.1488
+      "Other Fossil": 0.0411,
+      "Other Renewables": 0.0013,
+      "Solar": 0.1098,
+      "Wind": 0.1507
     },
     "2025": {
-      "Bioenergy": 0.0175,
-      "Coal": 0.6081,
-      "Gas": 0.1238,
-      "Hydro": 0.0089,
+      "Bioenergy": 0.0182,
+      "Coal": 0.5751,
+      "Gas": 0.1235,
+      "Hydro": 0.0094,
       "Nuclear": 0,
-      "Other Fossil": 0.0539,
+      "Other Fossil": 0.0548,
       "Other Renewables": 0.0021,
-      "Solar": 0.0536,
-      "Wind": 0.1321
+      "Solar": 0.0723,
+      "Wind": 0.1446
     }
   },
   "PM": {
@@ -12392,14 +12392,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.25,
-      "Gas": 0.4516,
+      "Coal": 0.1583,
+      "Gas": 0.4667,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.2823,
+      "Other Fossil": 0.35,
       "Other Renewables": 0,
-      "Solar": 0.0081,
-      "Wind": 0.0081
+      "Solar": 0.0083,
+      "Wind": 0.0167
     }
   },
   "PS": {
@@ -12517,14 +12517,14 @@
     },
     "2022": {
       "Bioenergy": 0.0707,
-      "Coal": 0.0319,
+      "Coal": 0.0318,
       "Gas": 0.3732,
       "Hydro": 0.1348,
-      "Nuclear": 0.0381,
+      "Nuclear": 0.038,
       "Other Fossil": 0.0081,
       "Other Renewables": 0.0013,
-      "Solar": 0.0659,
-      "Wind": 0.276
+      "Solar": 0.066,
+      "Wind": 0.2761
     },
     "2023": {
       "Bioenergy": 0.0634,
@@ -12534,30 +12534,30 @@
       "Nuclear": 0.042,
       "Other Fossil": 0.008,
       "Other Renewables": 0.0014,
-      "Solar": 0.096,
+      "Solar": 0.0961,
       "Wind": 0.2812
     },
     "2024": {
       "Bioenergy": 0.0664,
       "Coal": 0.0289,
       "Gas": 0.1455,
-      "Hydro": 0.2731,
+      "Hydro": 0.273,
       "Nuclear": 0.0445,
       "Other Fossil": 0.0092,
       "Other Renewables": 0.0014,
-      "Solar": 0.1288,
-      "Wind": 0.3022
+      "Solar": 0.1291,
+      "Wind": 0.3021
     },
     "2025": {
-      "Bioenergy": 0.0546,
-      "Coal": 0.0148,
-      "Gas": 0.1613,
-      "Hydro": 0.3773,
-      "Nuclear": 0.0197,
-      "Other Fossil": 0.0066,
-      "Other Renewables": 0.0006,
-      "Solar": 0.0815,
-      "Wind": 0.2836
+      "Bioenergy": 0.0529,
+      "Coal": 0.0119,
+      "Gas": 0.1442,
+      "Hydro": 0.3644,
+      "Nuclear": 0.016,
+      "Other Fossil": 0.0054,
+      "Other Renewables": 0.0005,
+      "Solar": 0.085,
+      "Wind": 0.3196
     }
   },
   "PY": {
@@ -12861,19 +12861,19 @@
       "Nuclear": 0.2036,
       "Other Fossil": 0.0014,
       "Other Renewables": 0.0004,
-      "Solar": 0.0779,
+      "Solar": 0.078,
       "Wind": 0.1188
     },
     "2025": {
-      "Bioenergy": 0.0116,
-      "Coal": 0.1599,
-      "Gas": 0.2511,
-      "Hydro": 0.1946,
-      "Nuclear": 0.2079,
-      "Other Fossil": 0.0024,
-      "Other Renewables": 0.0007,
-      "Solar": 0.0507,
-      "Wind": 0.1212
+      "Bioenergy": 0.0118,
+      "Coal": 0.1466,
+      "Gas": 0.2351,
+      "Hydro": 0.2057,
+      "Nuclear": 0.2111,
+      "Other Fossil": 0.002,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0618,
+      "Wind": 0.1254
     }
   },
   "RS": {
@@ -12906,14 +12906,14 @@
       "Hydro": 0.3097,
       "Nuclear": 0.0122,
       "Other Fossil": 0.0232,
-      "Other Renewables": 0.0004,
+      "Other Renewables": 0.0003,
       "Solar": 0.0018,
       "Wind": 0.036
     },
     "2022": {
       "Bioenergy": 0.0098,
       "Coal": 0.6141,
-      "Gas": 0.0468,
+      "Gas": 0.0467,
       "Hydro": 0.2545,
       "Nuclear": 0.0206,
       "Other Fossil": 0.0092,
@@ -12934,25 +12934,25 @@
     },
     "2024": {
       "Bioenergy": 0.0086,
-      "Coal": 0.6058,
+      "Coal": 0.606,
       "Gas": 0.0331,
       "Hydro": 0.2896,
       "Nuclear": 0.0114,
       "Other Fossil": 0.008,
       "Other Renewables": 0.0004,
       "Solar": 0.0055,
-      "Wind": 0.0376
+      "Wind": 0.0375
     },
     "2025": {
-      "Bioenergy": 0.0062,
-      "Coal": 0.6364,
-      "Gas": 0.0716,
-      "Hydro": 0.2355,
-      "Nuclear": 0.0014,
-      "Other Fossil": 0.0062,
-      "Other Renewables": 0,
-      "Solar": 0.0002,
-      "Wind": 0.0424
+      "Bioenergy": 0.0074,
+      "Coal": 0.6211,
+      "Gas": 0.0666,
+      "Hydro": 0.2543,
+      "Nuclear": 0.0019,
+      "Other Fossil": 0.0063,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0004,
+      "Wind": 0.042
     }
   },
   "RU": {
@@ -13024,14 +13024,14 @@
     },
     "2025": {
       "Bioenergy": 0.0008,
-      "Coal": 0.1942,
-      "Gas": 0.4849,
-      "Hydro": 0.1342,
-      "Nuclear": 0.1701,
-      "Other Fossil": 0.0114,
+      "Coal": 0.2017,
+      "Gas": 0.4878,
+      "Hydro": 0.1341,
+      "Nuclear": 0.1601,
+      "Other Fossil": 0.0117,
       "Other Renewables": 0,
-      "Solar": 0.0002,
-      "Wind": 0.0042
+      "Solar": 0.0005,
+      "Wind": 0.0034
     }
   },
   "RW": {
@@ -13497,15 +13497,15 @@
       "Wind": 0.2507
     },
     "2025": {
-      "Bioenergy": 0.0445,
+      "Bioenergy": 0.0422,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4239,
-      "Nuclear": 0.2863,
+      "Hydro": 0.4071,
+      "Nuclear": 0.2864,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0019,
-      "Wind": 0.2433
+      "Solar": 0.0045,
+      "Wind": 0.2598
     }
   },
   "SG": {
@@ -13682,7 +13682,7 @@
       "Bioenergy": 0.0083,
       "Coal": 0.2453,
       "Gas": 0.0338,
-      "Hydro": 0.2968,
+      "Hydro": 0.2967,
       "Nuclear": 0.3867,
       "Other Fossil": 0.0081,
       "Other Renewables": 0.0002,
@@ -13695,7 +13695,7 @@
       "Gas": 0.0445,
       "Hydro": 0.3072,
       "Nuclear": 0.3713,
-      "Other Fossil": 0.009,
+      "Other Fossil": 0.0089,
       "Other Renewables": 0.0003,
       "Solar": 0.0203,
       "Wind": 0.0044
@@ -13734,15 +13734,15 @@
       "Wind": 0.0022
     },
     "2025": {
-      "Bioenergy": 0.0086,
-      "Coal": 0.2464,
-      "Gas": 0.0619,
-      "Hydro": 0.2218,
-      "Nuclear": 0.4033,
-      "Other Fossil": 0.0004,
+      "Bioenergy": 0.0079,
+      "Coal": 0.2274,
+      "Gas": 0.0584,
+      "Hydro": 0.2399,
+      "Nuclear": 0.3855,
+      "Other Fossil": 0.0002,
       "Other Renewables": 0.0001,
-      "Solar": 0.0556,
-      "Wind": 0.0019
+      "Solar": 0.0798,
+      "Wind": 0.0009
     }
   },
   "SK": {
@@ -13774,7 +13774,7 @@
       "Gas": 0.1406,
       "Hydro": 0.1457,
       "Nuclear": 0.533,
-      "Other Fossil": 0.0603,
+      "Other Fossil": 0.0602,
       "Other Renewables": 0.0169,
       "Solar": 0.018,
       "Wind": 0.0036
@@ -13804,23 +13804,23 @@
     "2024": {
       "Bioenergy": 0.0312,
       "Coal": 0.0079,
-      "Gas": 0.0855,
+      "Gas": 0.0858,
       "Hydro": 0.1632,
-      "Nuclear": 0.6309,
+      "Nuclear": 0.6307,
       "Other Fossil": 0.045,
       "Other Renewables": 0.0164,
       "Solar": 0.0197,
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0253,
+      "Bioenergy": 0.0267,
       "Coal": 0.004,
-      "Gas": 0.1157,
-      "Hydro": 0.093,
-      "Nuclear": 0.6821,
-      "Other Fossil": 0.0519,
-      "Other Renewables": 0.0159,
-      "Solar": 0.0121,
+      "Gas": 0.112,
+      "Hydro": 0.0959,
+      "Nuclear": 0.68,
+      "Other Fossil": 0.052,
+      "Other Renewables": 0.016,
+      "Solar": 0.0134,
       "Wind": 0
     }
   },
@@ -14830,25 +14830,25 @@
     },
     "2024": {
       "Bioenergy": 0.0609,
-      "Coal": 0.2227,
-      "Gas": 0.5969,
-      "Hydro": 0.0459,
-      "Nuclear": 0.0077,
+      "Coal": 0.222,
+      "Gas": 0.5978,
+      "Hydro": 0.0458,
+      "Nuclear": 0.0076,
       "Other Fossil": 0.002,
       "Other Renewables": 0.0008,
       "Solar": 0.0366,
-      "Wind": 0.0265
+      "Wind": 0.0267
     },
     "2025": {
-      "Bioenergy": 0.0735,
-      "Coal": 0.2358,
-      "Gas": 0.5424,
-      "Hydro": 0.0572,
-      "Nuclear": 0.0092,
-      "Other Fossil": 0.0013,
-      "Other Renewables": 0.0009,
-      "Solar": 0.04,
-      "Wind": 0.0398
+      "Bioenergy": 0.0853,
+      "Coal": 0.2059,
+      "Gas": 0.5662,
+      "Hydro": 0.0605,
+      "Nuclear": 0.0082,
+      "Other Fossil": 0.0011,
+      "Other Renewables": 0.0008,
+      "Solar": 0.0404,
+      "Wind": 0.0314
     }
   },
   "TJ": {
@@ -15147,24 +15147,24 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.9833,
+      "Gas": 0.9828,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0167
+      "Wind": 0.0172
     },
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.9825,
+      "Gas": 0.9781,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0175
+      "Wind": 0.0219
     }
   },
   "TO": {
@@ -15314,15 +15314,15 @@
       "Wind": 0.107
     },
     "2025": {
-      "Bioenergy": 0.0239,
-      "Coal": 0.3531,
-      "Gas": 0.2691,
-      "Hydro": 0.1506,
+      "Bioenergy": 0.025,
+      "Coal": 0.3494,
+      "Gas": 0.2429,
+      "Hydro": 0.1662,
       "Nuclear": 0.0002,
-      "Other Fossil": 0.003,
-      "Other Renewables": 0.0326,
-      "Solar": 0.0649,
-      "Wind": 0.1026
+      "Other Fossil": 0.0027,
+      "Other Renewables": 0.0335,
+      "Solar": 0.0718,
+      "Wind": 0.1083
     }
   },
   "TT": {
@@ -15779,8 +15779,8 @@
     "2024": {
       "Bioenergy": 0.0106,
       "Coal": 0.1489,
-      "Gas": 0.4255,
-      "Hydro": 0.0536,
+      "Gas": 0.4256,
+      "Hydro": 0.0535,
       "Nuclear": 0.1782,
       "Other Fossil": 0.0069,
       "Other Renewables": 0.004,
@@ -15789,14 +15789,14 @@
     },
     "2025": {
       "Bioenergy": 0.0103,
-      "Coal": 0.1881,
-      "Gas": 0.3847,
-      "Hydro": 0.0555,
-      "Nuclear": 0.1788,
-      "Other Fossil": 0.0086,
-      "Other Renewables": 0.0039,
-      "Solar": 0.0605,
-      "Wind": 0.1097
+      "Coal": 0.1774,
+      "Gas": 0.3706,
+      "Hydro": 0.0577,
+      "Nuclear": 0.179,
+      "Other Fossil": 0.0089,
+      "Other Renewables": 0.004,
+      "Solar": 0.068,
+      "Wind": 0.1241
     }
   },
   "UY": {
@@ -15867,15 +15867,15 @@
       "Wind": 0.3322
     },
     "2025": {
-      "Bioenergy": 0.1358,
-      "Coal": 0.0027,
-      "Gas": 0.0616,
-      "Hydro": 0.4055,
+      "Bioenergy": 0.1421,
+      "Coal": 0.0031,
+      "Gas": 0.05,
+      "Hydro": 0.4089,
       "Nuclear": 0.0021,
-      "Other Fossil": 0.0274,
+      "Other Fossil": 0.0214,
       "Other Renewables": 0.0005,
-      "Solar": 0.0488,
-      "Wind": 0.3155
+      "Solar": 0.049,
+      "Wind": 0.3227
     }
   },
   "UZ": {
@@ -15946,14 +15946,14 @@
       "Wind": 0.0015
     },
     "2025": {
-      "Bioenergy": 0.0005,
+      "Bioenergy": 0.0004,
       "Coal": 0.07,
       "Gas": 0.8122,
       "Hydro": 0.1013,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
-      "Solar": 0.0019,
+      "Solar": 0.002,
       "Wind": 0.0017
     }
   },
@@ -16569,24 +16569,24 @@
     "2024": {
       "Bioenergy": 0.0034,
       "Coal": 0.8205,
-      "Gas": 0.0306,
+      "Gas": 0.0307,
       "Hydro": 0.0472,
       "Nuclear": 0.0251,
-      "Other Fossil": 0.0025,
+      "Other Fossil": 0.0026,
       "Other Renewables": 0.0008,
       "Solar": 0.005,
-      "Wind": 0.065
+      "Wind": 0.0647
     },
     "2025": {
-      "Bioenergy": 0.0082,
-      "Coal": 0.6824,
-      "Gas": 0.0786,
-      "Hydro": 0.0688,
-      "Nuclear": 0.0596,
-      "Other Fossil": 0.0064,
-      "Other Renewables": 0.0018,
-      "Solar": 0.0125,
-      "Wind": 0.0818
+      "Bioenergy": 0.0084,
+      "Coal": 0.6813,
+      "Gas": 0.0764,
+      "Hydro": 0.0687,
+      "Nuclear": 0.0598,
+      "Other Fossil": 0.0065,
+      "Other Renewables": 0.0019,
+      "Solar": 0.0158,
+      "Wind": 0.0814
     }
   },
   "YE": {