npm - @digital4better/data - Versions diffs - 1.3.43 → 1.3.45 - Mend

@digital4better/data 1.3.43 → 1.3.45

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 +360 -360
package/data/factor/continent-monthly-green.json +3036 -3036
package/data/factor/continent-monthly.csv +369 -369
package/data/factor/continent-monthly.json +3108 -3108
package/data/factor/continent-yearly-green.csv +36 -36
package/data/factor/continent-yearly-green.json +304 -304
package/data/factor/continent-yearly.csv +36 -36
package/data/factor/continent-yearly.json +306 -306
package/data/factor/country-monthly-green.csv +3208 -3208
package/data/factor/country-monthly-green.json +25964 -25964
package/data/factor/country-monthly.csv +3688 -3688
package/data/factor/country-monthly.json +25147 -25147
package/data/factor/country-yearly-green.csv +478 -478
package/data/factor/country-yearly-green.json +3789 -3789
package/data/factor/country-yearly.csv +481 -481
package/data/factor/country-yearly.json +3432 -3432
package/data/factor/subdivision-monthly-green.csv +988 -988
package/data/factor/subdivision-monthly-green.json +8889 -8889
package/data/factor/subdivision-monthly.csv +988 -988
package/data/factor/subdivision-monthly.json +8870 -8870
package/data/factor/subdivision-yearly-green.csv +234 -234
package/data/factor/subdivision-yearly-green.json +1180 -1180
package/data/factor/subdivision-yearly.csv +217 -217
package/data/factor/subdivision-yearly.json +1051 -1051
package/data/factor/world-monthly-green.csv +88 -88
package/data/factor/world-monthly-green.json +790 -790
package/data/factor/world-monthly.csv +88 -88
package/data/factor/world-monthly.json +785 -785
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 +303 -303
package/data/mix/continent-monthly-green.json +823 -823
package/data/mix/continent-monthly.csv +303 -303
package/data/mix/continent-monthly.json +1236 -1236
package/data/mix/continent-yearly-green.csv +31 -31
package/data/mix/continent-yearly-green.json +85 -85
package/data/mix/continent-yearly.csv +31 -31
package/data/mix/continent-yearly.json +136 -136
package/data/mix/country-monthly-green.csv +2309 -2309
package/data/mix/country-monthly-green.json +5090 -5090
package/data/mix/country-monthly.csv +2309 -2309
package/data/mix/country-monthly.json +7659 -7659
package/data/mix/country-yearly-green.csv +273 -273
package/data/mix/country-yearly-green.json +674 -674
package/data/mix/country-yearly.csv +273 -273
package/data/mix/country-yearly.json +1173 -1173
package/data/mix/subdivision-monthly-green.csv +937 -937
package/data/mix/subdivision-monthly-green.json +2312 -2312
package/data/mix/subdivision-monthly.csv +937 -937
package/data/mix/subdivision-monthly.json +3113 -3113
package/data/mix/subdivision-yearly-green.csv +86 -86
package/data/mix/subdivision-yearly-green.json +216 -216
package/data/mix/subdivision-yearly.csv +86 -86
package/data/mix/subdivision-yearly.json +311 -311
package/data/mix/world-monthly-green.csv +69 -69
package/data/mix/world-monthly-green.json +172 -172
package/data/mix/world-monthly.csv +69 -69
package/data/mix/world-monthly.json +270 -270
package/data/mix/world-yearly-green.csv +5 -5
package/data/mix/world-yearly-green.json +15 -15
package/data/mix/world-yearly.csv +5 -5
package/data/mix/world-yearly.json +22 -22
package/package.json +1 -1

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

@@ -92,9 +92,9 @@
   "AF": {
     "2019": {
       "Bioenergy": 0.0119,
-      "Coal": 0.4642,
+      "Coal": 0.4641,
       "Gas": 0.0929,
-      "Hydro": 0.2984,
+      "Hydro": 0.2985,
       "Nuclear": 0.0413,
       "Other Fossil": 0.0242,
       "Other Renewables": 0.003,
@@ -114,20 +114,20 @@
     },
     "2021": {
       "Bioenergy": 0.0149,
-      "Coal": 0.4546,
+      "Coal": 0.4545,
       "Gas": 0.0856,
       "Hydro": 0.2924,
-      "Nuclear": 0.0413,
-      "Other Fossil": 0.0232,
+      "Nuclear": 0.0412,
+      "Other Fossil": 0.0233,
       "Other Renewables": 0.0032,
       "Solar": 0.0414,
       "Wind": 0.0435
     },
     "2022": {
       "Bioenergy": 0.0162,
-      "Coal": 0.445,
+      "Coal": 0.4449,
       "Gas": 0.0818,
-      "Hydro": 0.2922,
+      "Hydro": 0.2923,
       "Nuclear": 0.0411,
       "Other Fossil": 0.0234,
       "Other Renewables": 0.0032,
@@ -135,21 +135,21 @@
       "Wind": 0.0485
     },
     "2023": {
-      "Bioenergy": 0.0168,
-      "Coal": 0.4473,
+      "Bioenergy": 0.0167,
+      "Coal": 0.4475,
       "Gas": 0.0784,
       "Hydro": 0.2814,
       "Nuclear": 0.0412,
       "Other Fossil": 0.0212,
       "Other Renewables": 0.0032,
       "Solar": 0.0567,
-      "Wind": 0.0538
+      "Wind": 0.0537
     },
     "2024": {
-      "Bioenergy": 0.0162,
-      "Coal": 0.4339,
-      "Gas": 0.076,
-      "Hydro": 0.2846,
+      "Bioenergy": 0.0164,
+      "Coal": 0.4328,
+      "Gas": 0.0769,
+      "Hydro": 0.2847,
       "Nuclear": 0.0405,
       "Other Fossil": 0.0202,
       "Other Renewables": 0.003,
@@ -160,7 +160,7 @@
       "Bioenergy": 0.016,
       "Coal": 0.4126,
       "Gas": 0.0732,
-      "Hydro": 0.2849,
+      "Hydro": 0.2848,
       "Nuclear": 0.0406,
       "Other Fossil": 0.0201,
       "Other Renewables": 0.003,
@@ -168,15 +168,15 @@
       "Wind": 0.0626
     },
     "2026": {
-      "Bioenergy": 0.0178,
-      "Coal": 0.4256,
-      "Gas": 0.0775,
-      "Hydro": 0.2586,
-      "Nuclear": 0.0384,
-      "Other Fossil": 0.02,
-      "Other Renewables": 0.0034,
-      "Solar": 0.0889,
-      "Wind": 0.0699
+      "Bioenergy": 0.0169,
+      "Coal": 0.4274,
+      "Gas": 0.0777,
+      "Hydro": 0.261,
+      "Nuclear": 0.0386,
+      "Other Fossil": 0.0199,
+      "Other Renewables": 0.0033,
+      "Solar": 0.0896,
+      "Wind": 0.0656
     }
   },
   "AG": {
@@ -283,13 +283,13 @@
     },
     "2020": {
       "Bioenergy": 0.0093,
-      "Coal": 0.0468,
+      "Coal": 0.0467,
       "Gas": 0.0797,
       "Hydro": 0.7386,
       "Nuclear": 0.0682,
       "Other Fossil": 0.0066,
       "Other Renewables": 0.0027,
-      "Solar": 0.0147,
+      "Solar": 0.0148,
       "Wind": 0.0335
     },
     "2021": {
@@ -306,8 +306,8 @@
     "2022": {
       "Bioenergy": 0.0096,
       "Coal": 0.0523,
-      "Gas": 0.0817,
-      "Hydro": 0.73,
+      "Gas": 0.0816,
+      "Hydro": 0.7301,
       "Nuclear": 0.0619,
       "Other Fossil": 0.0068,
       "Other Renewables": 0.0026,
@@ -328,10 +328,10 @@
     "2024": {
       "Bioenergy": 0.0089,
       "Coal": 0.0413,
-      "Gas": 0.0716,
+      "Gas": 0.0715,
       "Hydro": 0.7381,
       "Nuclear": 0.0637,
-      "Other Fossil": 0.0064,
+      "Other Fossil": 0.0065,
       "Other Renewables": 0.0025,
       "Solar": 0.0269,
       "Wind": 0.0405
@@ -339,113 +339,113 @@
     "2025": {
       "Bioenergy": 0.0088,
       "Coal": 0.0398,
-      "Gas": 0.0739,
+      "Gas": 0.0738,
       "Hydro": 0.7327,
       "Nuclear": 0.0635,
-      "Other Fossil": 0.0063,
+      "Other Fossil": 0.0064,
       "Other Renewables": 0.0025,
       "Solar": 0.0323,
       "Wind": 0.0402
     },
     "2026": {
-      "Bioenergy": 0.0092,
-      "Coal": 0.0416,
-      "Gas": 0.0763,
-      "Hydro": 0.7327,
-      "Nuclear": 0.0617,
+      "Bioenergy": 0.0093,
+      "Coal": 0.0402,
+      "Gas": 0.0745,
+      "Hydro": 0.7332,
+      "Nuclear": 0.0612,
       "Other Fossil": 0.0066,
       "Other Renewables": 0.0024,
-      "Solar": 0.0231,
-      "Wind": 0.0465
+      "Solar": 0.0268,
+      "Wind": 0.0458
     }
   },
   "AM": {
     "2019": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.3984,
-      "Hydro": 0.3132,
-      "Nuclear": 0.2883,
+      "Gas": 0.3556,
+      "Hydro": 0.386,
+      "Nuclear": 0.2573,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0,
+      "Solar": 0.0012,
       "Wind": 0
     },
     "2020": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.4096,
-      "Hydro": 0.2315,
-      "Nuclear": 0.3589,
+      "Gas": 0.3676,
+      "Hydro": 0.301,
+      "Nuclear": 0.3221,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0,
+      "Solar": 0.0093,
       "Wind": 0
     },
     "2021": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.4411,
-      "Hydro": 0.2853,
-      "Nuclear": 0.2618,
+      "Gas": 0.4012,
+      "Hydro": 0.3393,
+      "Nuclear": 0.2381,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0118,
+      "Solar": 0.0214,
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.0042,
-      "Gas": 0.4313,
-      "Hydro": 0.2185,
-      "Nuclear": 0.3176,
+      "Bioenergy": 0.0001,
+      "Coal": 0.0038,
+      "Gas": 0.3846,
+      "Hydro": 0.2862,
+      "Nuclear": 0.2831,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.0276,
+      "Solar": 0.0416,
       "Wind": 0.0005
     },
     "2023": {
       "Bioenergy": 0.0002,
-      "Coal": 0.0053,
-      "Gas": 0.4367,
-      "Hydro": 0.1945,
-      "Nuclear": 0.317,
+      "Coal": 0.0047,
+      "Gas": 0.3866,
+      "Hydro": 0.2504,
+      "Nuclear": 0.2807,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.0455,
-      "Wind": 0.0007
+      "Solar": 0.0767,
+      "Wind": 0.0006
     },
     "2024": {
       "Bioenergy": 0.0003,
-      "Coal": 0.0088,
-      "Gas": 0.4016,
-      "Hydro": 0.2054,
-      "Nuclear": 0.3274,
+      "Coal": 0.0076,
+      "Gas": 0.3488,
+      "Hydro": 0.2747,
+      "Nuclear": 0.2786,
       "Other Fossil": 0.0001,
       "Other Renewables": 0.0001,
-      "Solar": 0.0552,
-      "Wind": 0.0012
+      "Solar": 0.0889,
+      "Wind": 0.001
     },
     "2025": {
       "Bioenergy": 0.0001,
-      "Coal": 0.0026,
-      "Gas": 0.3535,
-      "Hydro": 0.2668,
-      "Nuclear": 0.3056,
+      "Coal": 0.0025,
+      "Gas": 0.3429,
+      "Hydro": 0.2788,
+      "Nuclear": 0.2964,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0709,
+      "Solar": 0.0789,
       "Wind": 0.0004
     },
     "2026": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.4087,
-      "Hydro": 0.1739,
-      "Nuclear": 0.3304,
+      "Gas": 0.4191,
+      "Hydro": 0.1722,
+      "Nuclear": 0.3213,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.087,
+      "Solar": 0.0874,
       "Wind": 0
     }
   },
@@ -586,8 +586,8 @@
     },
     "2023": {
       "Bioenergy": 0.0094,
-      "Coal": 0.0177,
-      "Gas": 0.4744,
+      "Coal": 0.0167,
+      "Gas": 0.4755,
       "Hydro": 0.2939,
       "Nuclear": 0.0616,
       "Other Fossil": 0.0169,
@@ -597,19 +597,19 @@
     },
     "2024": {
       "Bioenergy": 0.0097,
-      "Coal": 0.0101,
-      "Gas": 0.5039,
+      "Coal": 0.0125,
+      "Gas": 0.5014,
       "Hydro": 0.2503,
       "Nuclear": 0.072,
       "Other Fossil": 0.0117,
       "Other Renewables": 0.0001,
-      "Solar": 0.0288,
+      "Solar": 0.0287,
       "Wind": 0.1135
     },
     "2025": {
       "Bioenergy": 0.0117,
-      "Coal": 0.0203,
-      "Gas": 0.4933,
+      "Coal": 0.0126,
+      "Gas": 0.5009,
       "Hydro": 0.2256,
       "Nuclear": 0.0738,
       "Other Fossil": 0.0085,
@@ -618,15 +618,15 @@
       "Wind": 0.1299
     },
     "2026": {
-      "Bioenergy": 0.0099,
-      "Coal": 0.0401,
-      "Gas": 0.5545,
-      "Hydro": 0.1527,
-      "Nuclear": 0.0682,
-      "Other Fossil": 0.0084,
+      "Bioenergy": 0.0101,
+      "Coal": 0.0078,
+      "Gas": 0.5821,
+      "Hydro": 0.163,
+      "Nuclear": 0.058,
+      "Other Fossil": 0.009,
       "Other Renewables": 0,
-      "Solar": 0.0471,
-      "Wind": 0.119
+      "Solar": 0.0453,
+      "Wind": 0.1246
     }
   },
   "AS": {
@@ -733,7 +733,7 @@
     },
     "2020": {
       "Bioenergy": 0.0275,
-      "Coal": 0.0153,
+      "Coal": 0.0152,
       "Gas": 0.1532,
       "Hydro": 0.6271,
       "Nuclear": 0.0143,
@@ -770,7 +770,7 @@
       "Gas": 0.1131,
       "Hydro": 0.6131,
       "Nuclear": 0.0122,
-      "Other Fossil": 0.0171,
+      "Other Fossil": 0.0172,
       "Other Renewables": 0.0005,
       "Solar": 0.079,
       "Wind": 0.1324
@@ -789,7 +789,7 @@
     "2025": {
       "Bioenergy": 0.0292,
       "Coal": 0.0114,
-      "Gas": 0.1244,
+      "Gas": 0.1243,
       "Hydro": 0.5307,
       "Nuclear": 0.0168,
       "Other Fossil": 0.0166,
@@ -798,15 +798,15 @@
       "Wind": 0.1306
     },
     "2026": {
-      "Bioenergy": 0.0339,
-      "Coal": 0.0215,
-      "Gas": 0.205,
-      "Hydro": 0.4164,
-      "Nuclear": 0.0315,
-      "Other Fossil": 0.0175,
-      "Other Renewables": 0.0012,
-      "Solar": 0.1156,
-      "Wind": 0.1575
+      "Bioenergy": 0.032,
+      "Coal": 0.0181,
+      "Gas": 0.1914,
+      "Hydro": 0.4314,
+      "Nuclear": 0.0263,
+      "Other Fossil": 0.0169,
+      "Other Renewables": 0.001,
+      "Solar": 0.1331,
+      "Wind": 0.1497
     }
   },
   "AU": {
@@ -888,15 +888,15 @@
       "Wind": 0.1585
     },
     "2026": {
-      "Bioenergy": 0.0032,
-      "Coal": 0.4887,
-      "Gas": 0.0519,
-      "Hydro": 0.0506,
+      "Bioenergy": 0.0029,
+      "Coal": 0.4852,
+      "Gas": 0.052,
+      "Hydro": 0.0511,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.2563,
-      "Wind": 0.1493
+      "Solar": 0.2544,
+      "Wind": 0.1544
     }
   },
   "AW": {
@@ -993,90 +993,90 @@
     "2019": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.9366,
-      "Hydro": 0.0634,
+      "Gas": 0.9189,
+      "Hydro": 0.0794,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0,
+      "Solar": 0.0016,
       "Wind": 0
     },
     "2020": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.9559,
-      "Hydro": 0.0441,
+      "Gas": 0.9406,
+      "Hydro": 0.0568,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0,
+      "Solar": 0.0025,
       "Wind": 0
     },
     "2021": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.9253,
-      "Hydro": 0.0499,
+      "Gas": 0.9174,
+      "Hydro": 0.0577,
       "Nuclear": 0,
-      "Other Fossil": 0.0232,
+      "Other Fossil": 0.023,
       "Other Renewables": 0,
-      "Solar": 0.0016,
+      "Solar": 0.002,
       "Wind": 0
     },
     "2022": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.9322,
-      "Hydro": 0.061,
+      "Gas": 0.9192,
+      "Hydro": 0.0737,
       "Nuclear": 0,
-      "Other Fossil": 0.0045,
+      "Other Fossil": 0.0044,
       "Other Renewables": 0,
-      "Solar": 0.0023,
+      "Solar": 0.0026,
       "Wind": 0
     },
     "2023": {
       "Bioenergy": 0.0001,
       "Coal": 0.0021,
-      "Gas": 0.9229,
-      "Hydro": 0.0672,
+      "Gas": 0.9154,
+      "Hydro": 0.0745,
       "Nuclear": 0.0002,
       "Other Fossil": 0.0045,
       "Other Renewables": 0,
-      "Solar": 0.0027,
+      "Solar": 0.003,
       "Wind": 0.0002
     },
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.8686,
-      "Hydro": 0.1158,
+      "Gas": 0.8405,
+      "Hydro": 0.1453,
       "Nuclear": 0,
-      "Other Fossil": 0.0047,
+      "Other Fossil": 0.0025,
       "Other Renewables": 0,
-      "Solar": 0.011,
+      "Solar": 0.0117,
       "Wind": 0
     },
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.8678,
-      "Hydro": 0.1219,
+      "Gas": 0.8632,
+      "Hydro": 0.1292,
       "Nuclear": 0,
-      "Other Fossil": 0.0046,
+      "Other Fossil": 0.0031,
       "Other Renewables": 0,
-      "Solar": 0.0057,
+      "Solar": 0.0045,
       "Wind": 0
     },
     "2026": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.8952,
-      "Hydro": 0.0961,
+      "Gas": 0.8028,
+      "Hydro": 0.1449,
       "Nuclear": 0,
       "Other Fossil": 0.0044,
       "Other Renewables": 0,
-      "Solar": 0.0044,
-      "Wind": 0
+      "Solar": 0.012,
+      "Wind": 0.0359
     }
   },
   "BA": {
@@ -1159,14 +1159,14 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Coal": 0.4725,
+      "Coal": 0.456,
       "Gas": 0,
-      "Hydro": 0.4932,
+      "Hydro": 0.5063,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0213,
-      "Wind": 0.013
+      "Solar": 0.0211,
+      "Wind": 0.0165
     }
   },
   "BB": {
@@ -1286,9 +1286,9 @@
       "Bioenergy": 0.0016,
       "Coal": 0.1121,
       "Gas": 0.6112,
-      "Hydro": 0.0196,
+      "Hydro": 0.0197,
       "Nuclear": 0.0046,
-      "Other Fossil": 0.239,
+      "Other Fossil": 0.2391,
       "Other Renewables": 0.0004,
       "Solar": 0.0065,
       "Wind": 0.0048
@@ -1297,7 +1297,7 @@
       "Bioenergy": 0.0019,
       "Coal": 0.1401,
       "Gas": 0.5194,
-      "Hydro": 0.0209,
+      "Hydro": 0.021,
       "Nuclear": 0.0049,
       "Other Fossil": 0.297,
       "Other Renewables": 0.0004,
@@ -1317,8 +1317,8 @@
     },
     "2024": {
       "Bioenergy": 0.0025,
-      "Coal": 0.3479,
-      "Gas": 0.4712,
+      "Coal": 0.3477,
+      "Gas": 0.4713,
       "Hydro": 0.0247,
       "Nuclear": 0.0062,
       "Other Fossil": 0.1174,
@@ -1335,18 +1335,18 @@
       "Other Fossil": 0.1104,
       "Other Renewables": 0.0006,
       "Solar": 0.0292,
-      "Wind": 0.013
+      "Wind": 0.0131
     },
     "2026": {
-      "Bioenergy": 0.0042,
-      "Coal": 0.4175,
-      "Gas": 0.4472,
-      "Hydro": 0.0216,
-      "Nuclear": 0.0091,
-      "Other Fossil": 0.0464,
+      "Bioenergy": 0.004,
+      "Coal": 0.4171,
+      "Gas": 0.4424,
+      "Hydro": 0.0229,
+      "Nuclear": 0.009,
+      "Other Fossil": 0.054,
       "Other Renewables": 0.0008,
-      "Solar": 0.0353,
-      "Wind": 0.018
+      "Solar": 0.0339,
+      "Wind": 0.016
     }
   },
   "BE": {
@@ -1428,15 +1428,15 @@
       "Wind": 0.1776
     },
     "2026": {
-      "Bioenergy": 0.0139,
-      "Coal": 0.03,
-      "Gas": 0.1989,
-      "Hydro": 0.0383,
-      "Nuclear": 0.2444,
-      "Other Fossil": 0.1374,
-      "Other Renewables": 0.0017,
-      "Solar": 0.1094,
-      "Wind": 0.226
+      "Bioenergy": 0.0186,
+      "Coal": 0.0327,
+      "Gas": 0.223,
+      "Hydro": 0.0447,
+      "Nuclear": 0.205,
+      "Other Fossil": 0.1212,
+      "Other Renewables": 0.002,
+      "Solar": 0.13,
+      "Wind": 0.2228
     }
   },
   "BF": {
@@ -1599,7 +1599,7 @@
     "2025": {
       "Bioenergy": 0.0039,
       "Coal": 0.2634,
-      "Gas": 0.0567,
+      "Gas": 0.0566,
       "Hydro": 0.0746,
       "Nuclear": 0.3952,
       "Other Fossil": 0.0005,
@@ -1608,15 +1608,15 @@
       "Wind": 0.0369
     },
     "2026": {
-      "Bioenergy": 0.0039,
-      "Coal": 0.253,
-      "Gas": 0.0749,
-      "Hydro": 0.1345,
-      "Nuclear": 0.3746,
+      "Bioenergy": 0.004,
+      "Coal": 0.2438,
+      "Gas": 0.073,
+      "Hydro": 0.1353,
+      "Nuclear": 0.3818,
       "Other Fossil": 0.0008,
       "Other Renewables": 0.0003,
-      "Solar": 0.1155,
-      "Wind": 0.0426
+      "Solar": 0.1194,
+      "Wind": 0.0416
     }
   },
   "BH": {
@@ -2150,13 +2150,13 @@
     "2026": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.6768,
-      "Hydro": 0.2824,
+      "Gas": 0.6876,
+      "Hydro": 0.2736,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0306,
-      "Wind": 0.0102
+      "Solar": 0.0291,
+      "Wind": 0.0097
     }
   },
   "BR": {
@@ -2238,15 +2238,15 @@
       "Wind": 0.1527
     },
     "2026": {
-      "Bioenergy": 0.0548,
-      "Coal": 0.0144,
-      "Gas": 0.0763,
-      "Hydro": 0.6044,
-      "Nuclear": 0.0113,
-      "Other Fossil": 0.0066,
+      "Bioenergy": 0.0558,
+      "Coal": 0.0134,
+      "Gas": 0.0726,
+      "Hydro": 0.5999,
+      "Nuclear": 0.0133,
+      "Other Fossil": 0.0065,
       "Other Renewables": 0,
-      "Solar": 0.1313,
-      "Wind": 0.1009
+      "Solar": 0.1305,
+      "Wind": 0.1079
     }
   },
   "BS": {
@@ -2521,92 +2521,92 @@
   },
   "BY": {
     "2019": {
-      "Bioenergy": 0.003,
+      "Bioenergy": 0.0029,
       "Coal": 0.0001,
-      "Gas": 0.8793,
-      "Hydro": 0.0091,
+      "Gas": 0.863,
+      "Hydro": 0.0182,
       "Nuclear": 0.0002,
-      "Other Fossil": 0.099,
+      "Other Fossil": 0.0971,
       "Other Renewables": 0,
-      "Solar": 0.0048,
-      "Wind": 0.0045
+      "Solar": 0.0091,
+      "Wind": 0.0093
     },
     "2020": {
-      "Bioenergy": 0.0064,
+      "Bioenergy": 0.0063,
       "Coal": 0.0008,
-      "Gas": 0.8166,
-      "Hydro": 0.0114,
-      "Nuclear": 0.0098,
-      "Other Fossil": 0.1447,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0043,
-      "Wind": 0.006
+      "Gas": 0.7938,
+      "Hydro": 0.026,
+      "Nuclear": 0.0095,
+      "Other Fossil": 0.1407,
+      "Other Renewables": 0,
+      "Solar": 0.011,
+      "Wind": 0.0119
     },
     "2021": {
-      "Bioenergy": 0.006,
+      "Bioenergy": 0.0059,
       "Coal": 0.0005,
-      "Gas": 0.7077,
-      "Hydro": 0.0101,
-      "Nuclear": 0.1412,
-      "Other Fossil": 0.1256,
+      "Gas": 0.6931,
+      "Hydro": 0.0201,
+      "Nuclear": 0.1383,
+      "Other Fossil": 0.1231,
       "Other Renewables": 0,
-      "Solar": 0.0047,
-      "Wind": 0.0042
+      "Solar": 0.0096,
+      "Wind": 0.0094
     },
     "2022": {
-      "Bioenergy": 0.0062,
+      "Bioenergy": 0.006,
       "Coal": 0,
-      "Gas": 0.7344,
-      "Hydro": 0.0095,
-      "Nuclear": 0.1169,
-      "Other Fossil": 0.1233,
+      "Gas": 0.7135,
+      "Hydro": 0.0231,
+      "Nuclear": 0.1137,
+      "Other Fossil": 0.1198,
       "Other Renewables": 0,
-      "Solar": 0.0054,
-      "Wind": 0.0043
+      "Solar": 0.013,
+      "Wind": 0.0109
     },
     "2023": {
-      "Bioenergy": 0.0122,
+      "Bioenergy": 0.0119,
       "Coal": 0.0001,
-      "Gas": 0.5904,
-      "Hydro": 0.0092,
-      "Nuclear": 0.2862,
-      "Other Fossil": 0.0937,
+      "Gas": 0.5618,
+      "Hydro": 0.021,
+      "Nuclear": 0.279,
+      "Other Fossil": 0.1051,
       "Other Renewables": 0,
-      "Solar": 0.0037,
-      "Wind": 0.0045
+      "Solar": 0.0108,
+      "Wind": 0.0103
     },
     "2024": {
-      "Bioenergy": 0.0099,
-      "Coal": 0.0012,
-      "Gas": 0.5392,
-      "Hydro": 0.0125,
-      "Nuclear": 0.3621,
-      "Other Fossil": 0.0635,
+      "Bioenergy": 0.0097,
+      "Coal": 0.0011,
+      "Gas": 0.4995,
+      "Hydro": 0.021,
+      "Nuclear": 0.355,
+      "Other Fossil": 0.0915,
       "Other Renewables": 0.0001,
-      "Solar": 0.0065,
-      "Wind": 0.0051
+      "Solar": 0.0122,
+      "Wind": 0.0098
     },
     "2025": {
       "Bioenergy": 0.0075,
       "Coal": 0.0001,
-      "Gas": 0.4953,
-      "Hydro": 0.0228,
-      "Nuclear": 0.3887,
-      "Other Fossil": 0.067,
+      "Gas": 0.4628,
+      "Hydro": 0.0261,
+      "Nuclear": 0.3862,
+      "Other Fossil": 0.0967,
       "Other Renewables": 0,
-      "Solar": 0.008,
-      "Wind": 0.0106
+      "Solar": 0.0084,
+      "Wind": 0.0123
     },
     "2026": {
-      "Bioenergy": 0.0118,
+      "Bioenergy": 0.0124,
       "Coal": 0,
-      "Gas": 0.545,
-      "Hydro": 0.0403,
-      "Nuclear": 0.3033,
-      "Other Fossil": 0.0664,
+      "Gas": 0.575,
+      "Hydro": 0.0149,
+      "Nuclear": 0.2776,
+      "Other Fossil": 0.0997,
       "Other Renewables": 0,
-      "Solar": 0.0142,
-      "Wind": 0.019
+      "Solar": 0.0074,
+      "Wind": 0.013
     }
   },
   "BZ": {
@@ -2657,7 +2657,7 @@
     "2023": {
       "Bioenergy": 0.1835,
       "Coal": 0.0179,
-      "Gas": 0.1006,
+      "Gas": 0.1007,
       "Hydro": 0.5146,
       "Nuclear": 0.0085,
       "Other Fossil": 0.1009,
@@ -2667,9 +2667,9 @@
     },
     "2024": {
       "Bioenergy": 0.1834,
-      "Coal": 0.017,
-      "Gas": 0.1019,
-      "Hydro": 0.5057,
+      "Coal": 0.0171,
+      "Gas": 0.1018,
+      "Hydro": 0.5056,
       "Nuclear": 0.0089,
       "Other Fossil": 0.1006,
       "Other Renewables": 0.0022,
@@ -2678,46 +2678,46 @@
     },
     "2025": {
       "Bioenergy": 0.1826,
-      "Coal": 0.0163,
-      "Gas": 0.1003,
+      "Coal": 0.016,
+      "Gas": 0.1005,
       "Hydro": 0.5018,
       "Nuclear": 0.0084,
       "Other Fossil": 0.0997,
       "Other Renewables": 0.0021,
-      "Solar": 0.0463,
+      "Solar": 0.0464,
       "Wind": 0.0425
     },
     "2026": {
-      "Bioenergy": 0.1803,
-      "Coal": 0.0164,
-      "Gas": 0.0947,
-      "Hydro": 0.5168,
-      "Nuclear": 0.0064,
-      "Other Fossil": 0.0982,
-      "Other Renewables": 0.0022,
-      "Solar": 0.051,
-      "Wind": 0.0338
+      "Bioenergy": 0.1797,
+      "Coal": 0.0153,
+      "Gas": 0.0969,
+      "Hydro": 0.5149,
+      "Nuclear": 0.007,
+      "Other Fossil": 0.099,
+      "Other Renewables": 0.002,
+      "Solar": 0.0506,
+      "Wind": 0.0346
     }
   },
   "CA": {
     "2019": {
-      "Bioenergy": 0.0168,
-      "Coal": 0.0744,
-      "Gas": 0.1061,
-      "Hydro": 0.5899,
+      "Bioenergy": 0.0177,
+      "Coal": 0.0742,
+      "Gas": 0.1057,
+      "Hydro": 0.59,
       "Nuclear": 0.1487,
-      "Other Fossil": 0.0087,
+      "Other Fossil": 0.0084,
       "Other Renewables": 0.0003,
       "Solar": 0.0038,
       "Wind": 0.0514
     },
     "2020": {
-      "Bioenergy": 0.0151,
-      "Coal": 0.0582,
-      "Gas": 0.1098,
-      "Hydro": 0.6023,
+      "Bioenergy": 0.0161,
+      "Coal": 0.0579,
+      "Gas": 0.1094,
+      "Hydro": 0.6022,
       "Nuclear": 0.1455,
-      "Other Fossil": 0.0078,
+      "Other Fossil": 0.0075,
       "Other Renewables": 0.0002,
       "Solar": 0.004,
       "Wind": 0.0572
@@ -2734,31 +2734,31 @@
       "Wind": 0.0577
     },
     "2022": {
-      "Bioenergy": 0.0153,
-      "Coal": 0.0393,
-      "Gas": 0.1285,
+      "Bioenergy": 0.0144,
+      "Coal": 0.0394,
+      "Gas": 0.1296,
       "Hydro": 0.6131,
       "Nuclear": 0.1282,
-      "Other Fossil": 0.009,
+      "Other Fossil": 0.0087,
       "Other Renewables": 0.0002,
       "Solar": 0.0049,
       "Wind": 0.0614
     },
     "2023": {
-      "Bioenergy": 0.0161,
-      "Coal": 0.0359,
-      "Gas": 0.1468,
+      "Bioenergy": 0.0143,
+      "Coal": 0.0353,
+      "Gas": 0.1497,
       "Hydro": 0.5833,
       "Nuclear": 0.1376,
-      "Other Fossil": 0.0079,
+      "Other Fossil": 0.0074,
       "Other Renewables": 0.0002,
       "Solar": 0.0076,
       "Wind": 0.0646
     },
     "2024": {
-      "Bioenergy": 0.0172,
-      "Coal": 0.0386,
-      "Gas": 0.1575,
+      "Bioenergy": 0.0158,
+      "Coal": 0.0231,
+      "Gas": 0.1744,
       "Hydro": 0.5594,
       "Nuclear": 0.134,
       "Other Fossil": 0.0084,
@@ -2767,10 +2767,10 @@
       "Wind": 0.0757
     },
     "2025": {
-      "Bioenergy": 0.0178,
-      "Coal": 0.0404,
-      "Gas": 0.164,
-      "Hydro": 0.5469,
+      "Bioenergy": 0.0164,
+      "Coal": 0.0242,
+      "Gas": 0.1816,
+      "Hydro": 0.547,
       "Nuclear": 0.1307,
       "Other Fossil": 0.0087,
       "Other Renewables": 0.0006,
@@ -2778,15 +2778,15 @@
       "Wind": 0.081
     },
     "2026": {
-      "Bioenergy": 0.0181,
-      "Coal": 0.0403,
-      "Gas": 0.1649,
-      "Hydro": 0.5642,
-      "Nuclear": 0.113,
+      "Bioenergy": 0.0167,
+      "Coal": 0.0239,
+      "Gas": 0.1823,
+      "Hydro": 0.5757,
+      "Nuclear": 0.1086,
       "Other Fossil": 0.0087,
-      "Other Renewables": 0.0009,
-      "Solar": 0.0029,
-      "Wind": 0.0869
+      "Other Renewables": 0.0008,
+      "Solar": 0.0053,
+      "Wind": 0.0781
     }
   },
   "CD": {
@@ -3118,7 +3118,7 @@
     "2024": {
       "Bioenergy": 0.0004,
       "Coal": 0.002,
-      "Gas": 0.0036,
+      "Gas": 0.0035,
       "Hydro": 0.5854,
       "Nuclear": 0.2899,
       "Other Fossil": 0.0453,
@@ -3132,21 +3132,21 @@
       "Gas": 0.0231,
       "Hydro": 0.5151,
       "Nuclear": 0.269,
-      "Other Fossil": 0.0508,
+      "Other Fossil": 0.0509,
       "Other Renewables": 0.0007,
       "Solar": 0.1121,
       "Wind": 0.0145
     },
     "2026": {
-      "Bioenergy": 0.0071,
-      "Coal": 0.0325,
-      "Gas": 0.0607,
-      "Hydro": 0.4287,
-      "Nuclear": 0.2741,
-      "Other Fossil": 0.0532,
-      "Other Renewables": 0.0018,
-      "Solar": 0.1032,
-      "Wind": 0.0389
+      "Bioenergy": 0.0059,
+      "Coal": 0.0271,
+      "Gas": 0.052,
+      "Hydro": 0.4319,
+      "Nuclear": 0.284,
+      "Other Fossil": 0.0521,
+      "Other Renewables": 0.0015,
+      "Solar": 0.1124,
+      "Wind": 0.0332
     }
   },
   "CI": {
@@ -3408,15 +3408,15 @@
       "Wind": 0.1426
     },
     "2026": {
-      "Bioenergy": 0.0213,
-      "Coal": 0.1628,
-      "Gas": 0.1714,
-      "Hydro": 0.1984,
+      "Bioenergy": 0.022,
+      "Coal": 0.1601,
+      "Gas": 0.1699,
+      "Hydro": 0.2003,
       "Nuclear": 0,
-      "Other Fossil": 0.0141,
-      "Other Renewables": 0.0013,
-      "Solar": 0.2981,
-      "Wind": 0.1327
+      "Other Fossil": 0.0154,
+      "Other Renewables": 0.0014,
+      "Solar": 0.2917,
+      "Wind": 0.1393
     }
   },
   "CM": {
@@ -3555,9 +3555,9 @@
       "Wind": 0.0878
     },
     "2023": {
-      "Bioenergy": 0.021,
-      "Coal": 0.6187,
-      "Gas": 0.0299,
+      "Bioenergy": 0.0207,
+      "Coal": 0.6191,
+      "Gas": 0.0298,
       "Hydro": 0.1241,
       "Nuclear": 0.0466,
       "Other Fossil": 0.0017,
@@ -3566,9 +3566,9 @@
       "Wind": 0.0952
     },
     "2024": {
-      "Bioenergy": 0.02,
-      "Coal": 0.591,
-      "Gas": 0.0286,
+      "Bioenergy": 0.0205,
+      "Coal": 0.589,
+      "Gas": 0.0301,
       "Hydro": 0.1293,
       "Nuclear": 0.0451,
       "Other Fossil": 0.0017,
@@ -3577,26 +3577,26 @@
       "Wind": 0.1001
     },
     "2025": {
-      "Bioenergy": 0.0195,
-      "Coal": 0.5555,
-      "Gas": 0.0285,
-      "Hydro": 0.1272,
+      "Bioenergy": 0.0193,
+      "Coal": 0.5559,
+      "Gas": 0.0284,
+      "Hydro": 0.1271,
       "Nuclear": 0.0464,
       "Other Fossil": 0.0016,
       "Other Renewables": 0,
-      "Solar": 0.1125,
+      "Solar": 0.1126,
       "Wind": 0.1087
     },
     "2026": {
-      "Bioenergy": 0.0206,
-      "Coal": 0.5654,
-      "Gas": 0.0308,
-      "Hydro": 0.096,
-      "Nuclear": 0.0441,
-      "Other Fossil": 0.0017,
+      "Bioenergy": 0.0196,
+      "Coal": 0.5633,
+      "Gas": 0.0288,
+      "Hydro": 0.0989,
+      "Nuclear": 0.0451,
+      "Other Fossil": 0.0016,
       "Other Renewables": 0,
-      "Solar": 0.1222,
-      "Wind": 0.1193
+      "Solar": 0.1205,
+      "Wind": 0.1223
     }
   },
   "CO": {
@@ -3754,7 +3754,7 @@
       "Other Fossil": 0.1059,
       "Other Renewables": 0.1171,
       "Solar": 0.0018,
-      "Wind": 0.098
+      "Wind": 0.0979
     },
     "2025": {
       "Bioenergy": 0.0042,
@@ -3768,15 +3768,15 @@
       "Wind": 0.1164
     },
     "2026": {
-      "Bioenergy": 0.01,
-      "Coal": 0.0013,
-      "Gas": 0.0071,
-      "Hydro": 0.6327,
-      "Nuclear": 0.0005,
-      "Other Fossil": 0.0514,
-      "Other Renewables": 0.1145,
-      "Solar": 0.003,
-      "Wind": 0.1796
+      "Bioenergy": 0.0098,
+      "Coal": 0.0009,
+      "Gas": 0.0058,
+      "Hydro": 0.6448,
+      "Nuclear": 0.0004,
+      "Other Fossil": 0.0473,
+      "Other Renewables": 0.1161,
+      "Solar": 0.0024,
+      "Wind": 0.1724
     }
   },
   "CU": {
@@ -4043,10 +4043,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.8197,
+      "Other Fossil": 0.7773,
       "Other Renewables": 0,
-      "Solar": 0.1311,
-      "Wind": 0.0492
+      "Solar": 0.1516,
+      "Wind": 0.0711
     }
   },
   "CZ": {
@@ -4128,15 +4128,15 @@
       "Wind": 0.0092
     },
     "2026": {
-      "Bioenergy": 0.0354,
-      "Coal": 0.4218,
-      "Gas": 0.0843,
-      "Hydro": 0.0205,
-      "Nuclear": 0.3476,
-      "Other Fossil": 0.0061,
-      "Other Renewables": 0.0297,
-      "Solar": 0.0451,
-      "Wind": 0.0095
+      "Bioenergy": 0.0355,
+      "Coal": 0.398,
+      "Gas": 0.0821,
+      "Hydro": 0.0199,
+      "Nuclear": 0.3651,
+      "Other Fossil": 0.007,
+      "Other Renewables": 0.0304,
+      "Solar": 0.0522,
+      "Wind": 0.0098
     }
   },
   "DE": {
@@ -4218,15 +4218,15 @@
       "Wind": 0.2717
     },
     "2026": {
-      "Bioenergy": 0.0802,
-      "Coal": 0.2269,
-      "Gas": 0.1793,
-      "Hydro": 0.026,
-      "Nuclear": 0,
-      "Other Fossil": 0.037,
-      "Other Renewables": 0.0064,
-      "Solar": 0.1411,
-      "Wind": 0.303
+      "Bioenergy": 0.0812,
+      "Coal": 0.2112,
+      "Gas": 0.1767,
+      "Hydro": 0.0271,
+      "Nuclear": 0.0005,
+      "Other Fossil": 0.0374,
+      "Other Renewables": 0.0066,
+      "Solar": 0.1606,
+      "Wind": 0.2986
     }
   },
   "DJ": {
@@ -4323,7 +4323,7 @@
     "2019": {
       "Bioenergy": 0.1107,
       "Coal": 0.1377,
-      "Gas": 0.1218,
+      "Gas": 0.1217,
       "Hydro": 0.0315,
       "Nuclear": 0.0408,
       "Other Fossil": 0.049,
@@ -4333,8 +4333,8 @@
     },
     "2020": {
       "Bioenergy": 0.0921,
-      "Coal": 0.14,
-      "Gas": 0.1052,
+      "Coal": 0.1399,
+      "Gas": 0.1051,
       "Hydro": 0.0397,
       "Nuclear": 0.045,
       "Other Fossil": 0.0479,
@@ -4370,7 +4370,7 @@
       "Gas": 0.0767,
       "Hydro": 0.0177,
       "Nuclear": 0.0199,
-      "Other Fossil": 0.0358,
+      "Other Fossil": 0.0359,
       "Other Renewables": 0.0008,
       "Solar": 0.0916,
       "Wind": 0.5467
@@ -4381,32 +4381,32 @@
       "Gas": 0.0711,
       "Hydro": 0.0192,
       "Nuclear": 0.0215,
-      "Other Fossil": 0.0338,
+      "Other Fossil": 0.0339,
       "Other Renewables": 0.0008,
       "Solar": 0.1054,
-      "Wind": 0.5432
+      "Wind": 0.5433
     },
     "2025": {
       "Bioenergy": 0.0951,
-      "Coal": 0.0833,
-      "Gas": 0.0862,
+      "Coal": 0.0832,
+      "Gas": 0.0861,
       "Hydro": 0.0308,
       "Nuclear": 0.0371,
-      "Other Fossil": 0.0368,
+      "Other Fossil": 0.0369,
       "Other Renewables": 0.0015,
       "Solar": 0.1264,
       "Wind": 0.5028
     },
     "2026": {
-      "Bioenergy": 0.1483,
+      "Bioenergy": 0.1413,
       "Coal": 0.0673,
-      "Gas": 0.0646,
-      "Hydro": 0.0222,
-      "Nuclear": 0.026,
-      "Other Fossil": 0.0532,
-      "Other Renewables": 0.001,
-      "Solar": 0.0721,
-      "Wind": 0.5452
+      "Gas": 0.0637,
+      "Hydro": 0.0238,
+      "Nuclear": 0.0274,
+      "Other Fossil": 0.052,
+      "Other Renewables": 0.0011,
+      "Solar": 0.0899,
+      "Wind": 0.5334
     }
   },
   "DM": {
@@ -4758,22 +4758,22 @@
       "Wind": 0.0062
     },
     "2026": {
-      "Bioenergy": 0.0043,
-      "Coal": 0.0014,
-      "Gas": 0.0355,
-      "Hydro": 0.6186,
-      "Nuclear": 0.0006,
-      "Other Fossil": 0.33,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0034,
-      "Wind": 0.006
+      "Bioenergy": 0.0018,
+      "Coal": 0.0003,
+      "Gas": 0.0301,
+      "Hydro": 0.677,
+      "Nuclear": 0.0002,
+      "Other Fossil": 0.286,
+      "Other Renewables": 0,
+      "Solar": 0.0009,
+      "Wind": 0.0038
     }
   },
   "EE": {
     "2019": {
       "Bioenergy": 0.0784,
       "Coal": 0.0467,
-      "Gas": 0.074,
+      "Gas": 0.0739,
       "Hydro": 0.0489,
       "Nuclear": 0.0643,
       "Other Fossil": 0.5626,
@@ -4785,9 +4785,9 @@
       "Bioenergy": 0.0843,
       "Coal": 0.0663,
       "Gas": 0.1129,
-      "Hydro": 0.0824,
+      "Hydro": 0.0825,
       "Nuclear": 0.0981,
-      "Other Fossil": 0.3606,
+      "Other Fossil": 0.3605,
       "Other Renewables": 0.0038,
       "Solar": 0.0311,
       "Wind": 0.1606
@@ -4815,23 +4815,23 @@
       "Wind": 0.1014
     },
     "2023": {
-      "Bioenergy": 0.0749,
+      "Bioenergy": 0.0748,
       "Coal": 0.0604,
       "Gas": 0.0992,
-      "Hydro": 0.0705,
-      "Nuclear": 0.0824,
-      "Other Fossil": 0.3374,
+      "Hydro": 0.0706,
+      "Nuclear": 0.0823,
+      "Other Fossil": 0.3375,
       "Other Renewables": 0.0034,
       "Solar": 0.1165,
-      "Wind": 0.1553
+      "Wind": 0.1554
     },
     "2024": {
       "Bioenergy": 0.0673,
       "Coal": 0.0496,
-      "Gas": 0.0864,
+      "Gas": 0.0863,
       "Hydro": 0.0658,
       "Nuclear": 0.0748,
-      "Other Fossil": 0.3033,
+      "Other Fossil": 0.3034,
       "Other Renewables": 0.003,
       "Solar": 0.1482,
       "Wind": 0.2016
@@ -4839,24 +4839,24 @@
     "2025": {
       "Bioenergy": 0.0657,
       "Coal": 0.0517,
-      "Gas": 0.0971,
+      "Gas": 0.0969,
       "Hydro": 0.0648,
       "Nuclear": 0.0815,
-      "Other Fossil": 0.26,
+      "Other Fossil": 0.2601,
       "Other Renewables": 0.0032,
       "Solar": 0.1625,
       "Wind": 0.2136
     },
     "2026": {
-      "Bioenergy": 0.0723,
-      "Coal": 0.0573,
-      "Gas": 0.1067,
-      "Hydro": 0.0706,
-      "Nuclear": 0.0844,
-      "Other Fossil": 0.2857,
+      "Bioenergy": 0.0706,
+      "Coal": 0.0553,
+      "Gas": 0.1042,
+      "Hydro": 0.0702,
+      "Nuclear": 0.0829,
+      "Other Fossil": 0.2832,
       "Other Renewables": 0.0032,
-      "Solar": 0.1045,
-      "Wind": 0.2152
+      "Solar": 0.1158,
+      "Wind": 0.2145
     }
   },
   "EG": {
@@ -5041,15 +5041,15 @@
   },
   "ES": {
     "2019": {
-      "Bioenergy": 0.0123,
-      "Coal": 0.0485,
-      "Gas": 0.311,
-      "Hydro": 0.1099,
+      "Bioenergy": 0.0122,
+      "Coal": 0.0481,
+      "Gas": 0.3112,
+      "Hydro": 0.1098,
       "Nuclear": 0.2272,
-      "Other Fossil": 0.0206,
-      "Other Renewables": 0.0037,
-      "Solar": 0.0578,
-      "Wind": 0.209
+      "Other Fossil": 0.0205,
+      "Other Renewables": 0.0036,
+      "Solar": 0.0579,
+      "Wind": 0.2093
     },
     "2020": {
       "Bioenergy": 0.0164,
@@ -5060,36 +5060,36 @@
       "Other Fossil": 0.0191,
       "Other Renewables": 0.0038,
       "Solar": 0.0827,
-      "Wind": 0.2203
+      "Wind": 0.2202
     },
     "2021": {
       "Bioenergy": 0.017,
-      "Coal": 0.0227,
+      "Coal": 0.0226,
       "Gas": 0.2484,
-      "Hydro": 0.1333,
+      "Hydro": 0.1332,
       "Nuclear": 0.2198,
       "Other Fossil": 0.0173,
       "Other Renewables": 0.0036,
-      "Solar": 0.1023,
+      "Solar": 0.1024,
       "Wind": 0.2357
     },
     "2022": {
       "Bioenergy": 0.0154,
       "Coal": 0.0302,
-      "Gas": 0.2932,
-      "Hydro": 0.0836,
+      "Gas": 0.2934,
+      "Hydro": 0.0835,
       "Nuclear": 0.2141,
       "Other Fossil": 0.014,
       "Other Renewables": 0.0032,
-      "Solar": 0.1215,
-      "Wind": 0.2248
+      "Solar": 0.1216,
+      "Wind": 0.2247
     },
     "2023": {
       "Bioenergy": 0.0124,
       "Coal": 0.0159,
       "Gas": 0.2193,
-      "Hydro": 0.0978,
-      "Nuclear": 0.2187,
+      "Hydro": 0.0977,
+      "Nuclear": 0.2188,
       "Other Fossil": 0.0109,
       "Other Renewables": 0.0029,
       "Solar": 0.1767,
@@ -5098,35 +5098,35 @@
     "2024": {
       "Bioenergy": 0.0138,
       "Coal": 0.012,
-      "Gas": 0.1708,
+      "Gas": 0.1707,
       "Hydro": 0.1279,
-      "Nuclear": 0.2102,
+      "Nuclear": 0.2101,
       "Other Fossil": 0.0094,
       "Other Renewables": 0.0027,
-      "Solar": 0.2166,
-      "Wind": 0.2368
+      "Solar": 0.2168,
+      "Wind": 0.2367
     },
     "2025": {
       "Bioenergy": 0.0144,
       "Coal": 0.0051,
-      "Gas": 0.2039,
+      "Gas": 0.204,
       "Hydro": 0.1178,
-      "Nuclear": 0.2028,
+      "Nuclear": 0.2027,
       "Other Fossil": 0.0076,
       "Other Renewables": 0.0023,
-      "Solar": 0.2291,
-      "Wind": 0.2169
+      "Solar": 0.2293,
+      "Wind": 0.2167
     },
     "2026": {
-      "Bioenergy": 0.0133,
-      "Coal": 0.0005,
-      "Gas": 0.1658,
-      "Hydro": 0.1722,
-      "Nuclear": 0.2003,
-      "Other Fossil": 0.0058,
-      "Other Renewables": 0.0022,
-      "Solar": 0.1643,
-      "Wind": 0.2755
+      "Bioenergy": 0.0132,
+      "Coal": 0.0004,
+      "Gas": 0.1672,
+      "Hydro": 0.1588,
+      "Nuclear": 0.2054,
+      "Other Fossil": 0.0065,
+      "Other Renewables": 0.0023,
+      "Solar": 0.1783,
+      "Wind": 0.268
     }
   },
   "ET": {
@@ -5228,7 +5228,7 @@
       "Nuclear": 0.3152,
       "Other Fossil": 0.0607,
       "Other Renewables": 0.0044,
-      "Solar": 0.0088,
+      "Solar": 0.0089,
       "Wind": 0.0864
     },
     "2020": {
@@ -5298,15 +5298,15 @@
       "Wind": 0.2579
     },
     "2026": {
-      "Bioenergy": 0.126,
-      "Coal": 0.0155,
-      "Gas": 0.0688,
-      "Hydro": 0.1467,
-      "Nuclear": 0.337,
-      "Other Fossil": 0.0521,
-      "Other Renewables": 0.0037,
-      "Solar": 0.0076,
-      "Wind": 0.2426
+      "Bioenergy": 0.14,
+      "Coal": 0.019,
+      "Gas": 0.055,
+      "Hydro": 0.1406,
+      "Nuclear": 0.3505,
+      "Other Fossil": 0.0528,
+      "Other Renewables": 0.0044,
+      "Solar": 0.0124,
+      "Wind": 0.2252
     }
   },
   "FJ": {
@@ -5593,7 +5593,7 @@
     },
     "2020": {
       "Bioenergy": 0.006,
-      "Coal": 0.0035,
+      "Coal": 0.0034,
       "Gas": 0.072,
       "Hydro": 0.1207,
       "Nuclear": 0.6866,
@@ -5617,7 +5617,7 @@
       "Bioenergy": 0.0092,
       "Coal": 0.014,
       "Gas": 0.1059,
-      "Hydro": 0.1027,
+      "Hydro": 0.1028,
       "Nuclear": 0.63,
       "Other Fossil": 0.0082,
       "Other Renewables": 0.0003,
@@ -5650,23 +5650,23 @@
       "Bioenergy": 0.0051,
       "Coal": 0.0026,
       "Gas": 0.0317,
-      "Hydro": 0.0986,
+      "Hydro": 0.0985,
       "Nuclear": 0.7053,
       "Other Fossil": 0.0077,
       "Other Renewables": 0,
-      "Solar": 0.0567,
+      "Solar": 0.0568,
       "Wind": 0.0923
     },
     "2026": {
-      "Bioenergy": 0.006,
-      "Coal": 0.002,
-      "Gas": 0.0401,
-      "Hydro": 0.1094,
-      "Nuclear": 0.6854,
-      "Other Fossil": 0.0067,
+      "Bioenergy": 0.0062,
+      "Coal": 0.0021,
+      "Gas": 0.0373,
+      "Hydro": 0.1057,
+      "Nuclear": 0.6892,
+      "Other Fossil": 0.0068,
       "Other Renewables": 0,
-      "Solar": 0.0427,
-      "Wind": 0.1076
+      "Solar": 0.0466,
+      "Wind": 0.106
     }
   },
   "GA": {
@@ -5762,7 +5762,7 @@
   "GB": {
     "2019": {
       "Bioenergy": 0.0617,
-      "Coal": 0.0329,
+      "Coal": 0.0328,
       "Gas": 0.4161,
       "Hydro": 0.0247,
       "Nuclear": 0.1996,
@@ -5795,7 +5795,7 @@
     },
     "2022": {
       "Bioenergy": 0.0549,
-      "Coal": 0.0198,
+      "Coal": 0.0197,
       "Gas": 0.4064,
       "Hydro": 0.0157,
       "Nuclear": 0.1663,
@@ -5818,10 +5818,10 @@
     "2024": {
       "Bioenergy": 0.0741,
       "Coal": 0.022,
-      "Gas": 0.3006,
+      "Gas": 0.3005,
       "Hydro": 0.0365,
       "Nuclear": 0.1689,
-      "Other Fossil": 0.015,
+      "Other Fossil": 0.0151,
       "Other Renewables": 0.001,
       "Solar": 0.0624,
       "Wind": 0.3195
@@ -5838,15 +5838,15 @@
       "Wind": 0.3222
     },
     "2026": {
-      "Bioenergy": 0.0701,
-      "Coal": 0.0118,
-      "Gas": 0.3023,
-      "Hydro": 0.0286,
-      "Nuclear": 0.1293,
-      "Other Fossil": 0.0197,
-      "Other Renewables": 0.0007,
-      "Solar": 0.0491,
-      "Wind": 0.3885
+      "Bioenergy": 0.0715,
+      "Coal": 0.0106,
+      "Gas": 0.2884,
+      "Hydro": 0.0282,
+      "Nuclear": 0.1408,
+      "Other Fossil": 0.02,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0601,
+      "Wind": 0.3798
     }
   },
   "GD": {
@@ -5960,7 +5960,7 @@
       "Other Fossil": 0.0011,
       "Other Renewables": 0.0005,
       "Solar": 0.0037,
-      "Wind": 0.0147
+      "Wind": 0.0146
     },
     "2021": {
       "Bioenergy": 0.0028,
@@ -5979,7 +5979,7 @@
       "Gas": 0.2366,
       "Hydro": 0.6751,
       "Nuclear": 0.0056,
-      "Other Fossil": 0.0011,
+      "Other Fossil": 0.0012,
       "Other Renewables": 0.0004,
       "Solar": 0.0046,
       "Wind": 0.0142
@@ -5997,8 +5997,8 @@
     },
     "2024": {
       "Bioenergy": 0.0016,
-      "Coal": 0.0406,
-      "Gas": 0.2034,
+      "Coal": 0.0405,
+      "Gas": 0.2035,
       "Hydro": 0.7311,
       "Nuclear": 0.0039,
       "Other Fossil": 0.0004,
@@ -6007,10 +6007,10 @@
       "Wind": 0.0136
     },
     "2025": {
-      "Bioenergy": 0.0023,
+      "Bioenergy": 0.0022,
       "Coal": 0.0549,
       "Gas": 0.1951,
-      "Hydro": 0.716,
+      "Hydro": 0.7161,
       "Nuclear": 0.0056,
       "Other Fossil": 0.0006,
       "Other Renewables": 0.0004,
@@ -6018,15 +6018,15 @@
       "Wind": 0.016
     },
     "2026": {
-      "Bioenergy": 0.0061,
-      "Coal": 0.1404,
-      "Gas": 0.2776,
-      "Hydro": 0.5019,
-      "Nuclear": 0.0132,
-      "Other Fossil": 0.0015,
-      "Other Renewables": 0.0011,
-      "Solar": 0.0269,
-      "Wind": 0.0313
+      "Bioenergy": 0.0053,
+      "Coal": 0.1286,
+      "Gas": 0.2744,
+      "Hydro": 0.5249,
+      "Nuclear": 0.0121,
+      "Other Fossil": 0.0013,
+      "Other Renewables": 0.001,
+      "Solar": 0.0243,
+      "Wind": 0.0281
     }
   },
   "GF": {
@@ -6764,7 +6764,7 @@
     "2020": {
       "Bioenergy": 0.0055,
       "Coal": 0.1501,
-      "Gas": 0.4453,
+      "Gas": 0.4452,
       "Hydro": 0.0859,
       "Nuclear": 0.0401,
       "Other Fossil": 0.0039,
@@ -6829,14 +6829,14 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Coal": 0.0581,
-      "Gas": 0.3918,
-      "Hydro": 0.1381,
+      "Coal": 0.0585,
+      "Gas": 0.3856,
+      "Hydro": 0.1269,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.1658,
-      "Wind": 0.2462
+      "Solar": 0.1821,
+      "Wind": 0.247
     }
   },
   "GT": {
@@ -7202,7 +7202,7 @@
   "HK": {
     "2019": {
       "Bioenergy": 0.0067,
-      "Coal": 0.5741,
+      "Coal": 0.574,
       "Gas": 0.3454,
       "Hydro": 0.0348,
       "Nuclear": 0.0134,
@@ -7215,9 +7215,9 @@
       "Bioenergy": 0.0072,
       "Coal": 0.5715,
       "Gas": 0.3446,
-      "Hydro": 0.0355,
+      "Hydro": 0.0356,
       "Nuclear": 0.0134,
-      "Other Fossil": 0.006,
+      "Other Fossil": 0.0061,
       "Other Renewables": 0.001,
       "Solar": 0.0094,
       "Wind": 0.0113
@@ -7226,7 +7226,7 @@
       "Bioenergy": 0.0077,
       "Coal": 0.5709,
       "Gas": 0.343,
-      "Hydro": 0.0328,
+      "Hydro": 0.0329,
       "Nuclear": 0.0134,
       "Other Fossil": 0.0061,
       "Other Renewables": 0.001,
@@ -7256,10 +7256,10 @@
       "Wind": 0.0175
     },
     "2024": {
-      "Bioenergy": 0.0081,
-      "Coal": 0.5642,
-      "Gas": 0.3399,
-      "Hydro": 0.0303,
+      "Bioenergy": 0.0082,
+      "Coal": 0.5638,
+      "Gas": 0.3401,
+      "Hydro": 0.0304,
       "Nuclear": 0.0132,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.001,
@@ -7267,7 +7267,7 @@
       "Wind": 0.0184
     },
     "2025": {
-      "Bioenergy": 0.0081,
+      "Bioenergy": 0.008,
       "Coal": 0.5573,
       "Gas": 0.3389,
       "Hydro": 0.0304,
@@ -7278,15 +7278,15 @@
       "Wind": 0.0204
     },
     "2026": {
-      "Bioenergy": 0.0087,
-      "Coal": 0.5615,
-      "Gas": 0.3403,
-      "Hydro": 0.0218,
-      "Nuclear": 0.0125,
-      "Other Fossil": 0.0051,
+      "Bioenergy": 0.0083,
+      "Coal": 0.5621,
+      "Gas": 0.3404,
+      "Hydro": 0.0226,
+      "Nuclear": 0.0126,
+      "Other Fossil": 0.005,
       "Other Renewables": 0.0011,
-      "Solar": 0.0262,
-      "Wind": 0.0228
+      "Solar": 0.0265,
+      "Wind": 0.0214
     }
   },
   "HN": {
@@ -7359,7 +7359,7 @@
     "2025": {
       "Bioenergy": 0.0898,
       "Coal": 0.0055,
-      "Gas": 0.0054,
+      "Gas": 0.0055,
       "Hydro": 0.2325,
       "Nuclear": 0.0005,
       "Other Fossil": 0.4567,
@@ -7368,14 +7368,14 @@
       "Wind": 0.0774
     },
     "2026": {
-      "Bioenergy": 0.0897,
-      "Coal": 0.0055,
-      "Gas": 0.0051,
-      "Hydro": 0.2333,
+      "Bioenergy": 0.0896,
+      "Coal": 0.0054,
+      "Gas": 0.0053,
+      "Hydro": 0.2332,
       "Nuclear": 0.0004,
-      "Other Fossil": 0.4566,
+      "Other Fossil": 0.4567,
       "Other Renewables": 0.0276,
-      "Solar": 0.1049,
+      "Solar": 0.1048,
       "Wind": 0.077
     }
   },
@@ -7428,9 +7428,9 @@
       "Bioenergy": 0.0378,
       "Coal": 0.0878,
       "Gas": 0.224,
-      "Hydro": 0.4061,
+      "Hydro": 0.4062,
       "Nuclear": 0.0293,
-      "Other Fossil": 0.0089,
+      "Other Fossil": 0.009,
       "Other Renewables": 0.0156,
       "Solar": 0.0327,
       "Wind": 0.1577
@@ -7438,10 +7438,10 @@
     "2024": {
       "Bioenergy": 0.0399,
       "Coal": 0.0736,
-      "Gas": 0.2145,
+      "Gas": 0.2144,
       "Hydro": 0.3473,
       "Nuclear": 0.054,
-      "Other Fossil": 0.0098,
+      "Other Fossil": 0.0099,
       "Other Renewables": 0.0167,
       "Solar": 0.0707,
       "Wind": 0.1735
@@ -7449,24 +7449,24 @@
     "2025": {
       "Bioenergy": 0.0405,
       "Coal": 0.0737,
-      "Gas": 0.1984,
+      "Gas": 0.1983,
       "Hydro": 0.2933,
       "Nuclear": 0.0631,
-      "Other Fossil": 0.0089,
+      "Other Fossil": 0.009,
       "Other Renewables": 0.0168,
       "Solar": 0.1018,
       "Wind": 0.2034
     },
     "2026": {
-      "Bioenergy": 0.0386,
-      "Coal": 0.0595,
-      "Gas": 0.2106,
-      "Hydro": 0.3944,
-      "Nuclear": 0.0347,
-      "Other Fossil": 0.0068,
-      "Other Renewables": 0.0189,
-      "Solar": 0.0428,
-      "Wind": 0.1939
+      "Bioenergy": 0.0402,
+      "Coal": 0.061,
+      "Gas": 0.1959,
+      "Hydro": 0.3877,
+      "Nuclear": 0.0372,
+      "Other Fossil": 0.0072,
+      "Other Renewables": 0.018,
+      "Solar": 0.0505,
+      "Wind": 0.2024
     }
   },
   "HT": {
@@ -7573,9 +7573,9 @@
     },
     "2020": {
       "Bioenergy": 0.0311,
-      "Coal": 0.126,
+      "Coal": 0.1259,
       "Gas": 0.251,
-      "Hydro": 0.0537,
+      "Hydro": 0.0538,
       "Nuclear": 0.4032,
       "Other Fossil": 0.0216,
       "Other Renewables": 0.005,
@@ -7607,12 +7607,12 @@
     "2023": {
       "Bioenergy": 0.0239,
       "Coal": 0.0979,
-      "Gas": 0.2078,
+      "Gas": 0.2077,
       "Hydro": 0.0476,
-      "Nuclear": 0.3887,
+      "Nuclear": 0.3886,
       "Other Fossil": 0.0193,
       "Other Renewables": 0.0032,
-      "Solar": 0.1647,
+      "Solar": 0.1648,
       "Wind": 0.047
     },
     "2024": {
@@ -7621,7 +7621,7 @@
       "Gas": 0.1911,
       "Hydro": 0.0456,
       "Nuclear": 0.3709,
-      "Other Fossil": 0.0177,
+      "Other Fossil": 0.0178,
       "Other Renewables": 0.0044,
       "Solar": 0.2117,
       "Wind": 0.0449
@@ -7629,7 +7629,7 @@
     "2025": {
       "Bioenergy": 0.037,
       "Coal": 0.0581,
-      "Gas": 0.2044,
+      "Gas": 0.2043,
       "Hydro": 0.0346,
       "Nuclear": 0.3623,
       "Other Fossil": 0.0157,
@@ -7638,15 +7638,15 @@
       "Wind": 0.0365
     },
     "2026": {
-      "Bioenergy": 0.0358,
-      "Coal": 0.0658,
-      "Gas": 0.2523,
-      "Hydro": 0.048,
-      "Nuclear": 0.3668,
-      "Other Fossil": 0.0193,
-      "Other Renewables": 0.0044,
-      "Solar": 0.1554,
-      "Wind": 0.0522
+      "Bioenergy": 0.037,
+      "Coal": 0.0629,
+      "Gas": 0.2436,
+      "Hydro": 0.0455,
+      "Nuclear": 0.3715,
+      "Other Fossil": 0.0189,
+      "Other Renewables": 0.0043,
+      "Solar": 0.167,
+      "Wind": 0.0494
     }
   },
   "ID": {
@@ -7696,7 +7696,7 @@
     },
     "2023": {
       "Bioenergy": 0.0411,
-      "Coal": 0.5904,
+      "Coal": 0.5905,
       "Gas": 0.2103,
       "Hydro": 0.0719,
       "Nuclear": 0.0003,
@@ -7707,7 +7707,7 @@
     },
     "2024": {
       "Bioenergy": 0.0411,
-      "Coal": 0.5904,
+      "Coal": 0.5903,
       "Gas": 0.2103,
       "Hydro": 0.0719,
       "Nuclear": 0.0003,
@@ -7798,13 +7798,13 @@
     "2024": {
       "Bioenergy": 0.0176,
       "Coal": 0.0487,
-      "Gas": 0.4453,
+      "Gas": 0.4455,
       "Hydro": 0.0499,
       "Nuclear": 0.0321,
-      "Other Fossil": 0.0257,
+      "Other Fossil": 0.0258,
       "Other Renewables": 0.0013,
-      "Solar": 0.0334,
-      "Wind": 0.3459
+      "Solar": 0.0329,
+      "Wind": 0.3461
     },
     "2025": {
       "Bioenergy": 0.0187,
@@ -7818,15 +7818,15 @@
       "Wind": 0.342
     },
     "2026": {
-      "Bioenergy": 0.0186,
-      "Coal": 0.0289,
-      "Gas": 0.4061,
-      "Hydro": 0.0619,
-      "Nuclear": 0.0384,
-      "Other Fossil": 0.0222,
+      "Bioenergy": 0.0185,
+      "Coal": 0.0336,
+      "Gas": 0.3959,
+      "Hydro": 0.0599,
+      "Nuclear": 0.0374,
+      "Other Fossil": 0.022,
       "Other Renewables": 0.0015,
-      "Solar": 0.0241,
-      "Wind": 0.3982
+      "Solar": 0.0365,
+      "Wind": 0.3949
     }
   },
   "IL": {
@@ -7998,15 +7998,15 @@
       "Wind": 0.0557
     },
     "2026": {
-      "Bioenergy": 0.0131,
-      "Coal": 0.7091,
-      "Gas": 0.0113,
-      "Hydro": 0.0544,
-      "Nuclear": 0.0325,
-      "Other Fossil": 0.0003,
-      "Other Renewables": 0.0017,
-      "Solar": 0.1382,
-      "Wind": 0.0394
+      "Bioenergy": 0.0104,
+      "Coal": 0.7123,
+      "Gas": 0.0103,
+      "Hydro": 0.0575,
+      "Nuclear": 0.0314,
+      "Other Fossil": 0.0002,
+      "Other Renewables": 0.0018,
+      "Solar": 0.1393,
+      "Wind": 0.0366
     }
   },
   "IQ": {
@@ -8322,7 +8322,7 @@
       "Other Fossil": 0.0317,
       "Other Renewables": 0.019,
       "Solar": 0.0982,
-      "Wind": 0.0822
+      "Wind": 0.0823
     },
     "2023": {
       "Bioenergy": 0.0556,
@@ -8338,10 +8338,10 @@
     "2024": {
       "Bioenergy": 0.0542,
       "Coal": 0.0338,
-      "Gas": 0.3992,
+      "Gas": 0.3991,
       "Hydro": 0.2037,
       "Nuclear": 0.0337,
-      "Other Fossil": 0.0328,
+      "Other Fossil": 0.0329,
       "Other Renewables": 0.0187,
       "Solar": 0.1294,
       "Wind": 0.0945
@@ -8349,24 +8349,24 @@
     "2025": {
       "Bioenergy": 0.0496,
       "Coal": 0.0312,
-      "Gas": 0.4281,
+      "Gas": 0.428,
       "Hydro": 0.1649,
       "Nuclear": 0.0316,
-      "Other Fossil": 0.0199,
+      "Other Fossil": 0.02,
       "Other Renewables": 0.0191,
       "Solar": 0.1638,
       "Wind": 0.0918
     },
     "2026": {
-      "Bioenergy": 0.0548,
-      "Coal": 0.0314,
-      "Gas": 0.4773,
-      "Hydro": 0.1139,
-      "Nuclear": 0.0346,
-      "Other Fossil": 0.0133,
-      "Other Renewables": 0.0188,
-      "Solar": 0.1346,
-      "Wind": 0.1211
+      "Bioenergy": 0.0526,
+      "Coal": 0.0287,
+      "Gas": 0.4432,
+      "Hydro": 0.1442,
+      "Nuclear": 0.0324,
+      "Other Fossil": 0.0137,
+      "Other Renewables": 0.0184,
+      "Solar": 0.1482,
+      "Wind": 0.1187
     }
   },
   "JM": {
@@ -8628,15 +8628,15 @@
       "Wind": 0.0134
     },
     "2026": {
-      "Bioenergy": 0.076,
-      "Coal": 0.3186,
-      "Gas": 0.3152,
-      "Hydro": 0.0487,
-      "Nuclear": 0.093,
-      "Other Fossil": 0.0335,
-      "Other Renewables": 0.0121,
-      "Solar": 0.0838,
-      "Wind": 0.0191
+      "Bioenergy": 0.0734,
+      "Coal": 0.3138,
+      "Gas": 0.3206,
+      "Hydro": 0.0491,
+      "Nuclear": 0.0939,
+      "Other Fossil": 0.0341,
+      "Other Renewables": 0.0112,
+      "Solar": 0.0846,
+      "Wind": 0.0192
     }
   },
   "KE": {
@@ -8718,15 +8718,15 @@
       "Wind": 0.1328
     },
     "2026": {
-      "Bioenergy": 0.0306,
-      "Coal": 0.0228,
-      "Gas": 0.0313,
-      "Hydro": 0.2167,
-      "Nuclear": 0.0011,
-      "Other Fossil": 0.0807,
-      "Other Renewables": 0.4247,
-      "Solar": 0.0389,
-      "Wind": 0.1532
+      "Bioenergy": 0.0326,
+      "Coal": 0.0262,
+      "Gas": 0.0359,
+      "Hydro": 0.2201,
+      "Nuclear": 0.0013,
+      "Other Fossil": 0.0864,
+      "Other Renewables": 0.4409,
+      "Solar": 0.0355,
+      "Wind": 0.1211
     }
   },
   "KG": {
@@ -8754,69 +8754,69 @@
     },
     "2021": {
       "Bioenergy": 0.0007,
-      "Coal": 0.1362,
-      "Gas": 0.0141,
-      "Hydro": 0.8418,
+      "Coal": 0.1418,
+      "Gas": 0.0147,
+      "Hydro": 0.8343,
       "Nuclear": 0.0018,
-      "Other Fossil": 0.0017,
+      "Other Fossil": 0.003,
       "Other Renewables": 0.0001,
       "Solar": 0.0015,
       "Wind": 0.0021
     },
     "2022": {
       "Bioenergy": 0.0017,
-      "Coal": 0.1483,
-      "Gas": 0.0163,
-      "Hydro": 0.8162,
+      "Coal": 0.1529,
+      "Gas": 0.0162,
+      "Hydro": 0.8103,
       "Nuclear": 0.0045,
-      "Other Fossil": 0.0028,
+      "Other Fossil": 0.0042,
       "Other Renewables": 0.0004,
       "Solar": 0.0041,
       "Wind": 0.0058
     },
     "2023": {
       "Bioenergy": 0.0016,
-      "Coal": 0.1517,
-      "Gas": 0.0143,
-      "Hydro": 0.8165,
-      "Nuclear": 0.0039,
-      "Other Fossil": 0.0029,
+      "Coal": 0.1448,
+      "Gas": 0.0218,
+      "Hydro": 0.8129,
+      "Nuclear": 0.0038,
+      "Other Fossil": 0.0059,
       "Other Renewables": 0.0003,
       "Solar": 0.0037,
       "Wind": 0.0051
     },
     "2024": {
-      "Bioenergy": 0.0019,
-      "Coal": 0.1233,
-      "Gas": 0.0175,
-      "Hydro": 0.8109,
-      "Nuclear": 0.0047,
-      "Other Fossil": 0.0281,
-      "Other Renewables": 0.0004,
-      "Solar": 0.0065,
-      "Wind": 0.0066
+      "Bioenergy": 0.003,
+      "Coal": 0.1891,
+      "Gas": 0.0293,
+      "Hydro": 0.7362,
+      "Nuclear": 0.0073,
+      "Other Fossil": 0.0142,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0099,
+      "Wind": 0.0105
     },
     "2025": {
-      "Bioenergy": 0.0015,
-      "Coal": 0.0964,
-      "Gas": 0.0153,
-      "Hydro": 0.8355,
-      "Nuclear": 0.0039,
-      "Other Fossil": 0.0335,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0075,
-      "Wind": 0.006
+      "Bioenergy": 0.0029,
+      "Coal": 0.21,
+      "Gas": 0.034,
+      "Hydro": 0.7032,
+      "Nuclear": 0.0072,
+      "Other Fossil": 0.0171,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0139,
+      "Wind": 0.0112
     },
     "2026": {
-      "Bioenergy": 0.0017,
-      "Coal": 0.0977,
-      "Gas": 0.0157,
-      "Hydro": 0.833,
-      "Nuclear": 0.0037,
-      "Other Fossil": 0.0335,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0077,
-      "Wind": 0.0067
+      "Bioenergy": 0,
+      "Coal": 0.1663,
+      "Gas": 0.0293,
+      "Hydro": 0.7849,
+      "Nuclear": 0,
+      "Other Fossil": 0.0196,
+      "Other Renewables": 0,
+      "Solar": 0,
+      "Wind": 0
     }
   },
   "KH": {
@@ -8836,7 +8836,7 @@
       "Coal": 0.4682,
       "Gas": 0.0306,
       "Hydro": 0.3805,
-      "Nuclear": 0.014,
+      "Nuclear": 0.0139,
       "Other Fossil": 0.0647,
       "Other Renewables": 0.0011,
       "Solar": 0.017,
@@ -8865,8 +8865,8 @@
       "Wind": 0.0164
     },
     "2023": {
-      "Bioenergy": 0.0134,
-      "Coal": 0.4651,
+      "Bioenergy": 0.0133,
+      "Coal": 0.4652,
       "Gas": 0.0265,
       "Hydro": 0.374,
       "Nuclear": 0.0139,
@@ -8877,8 +8877,8 @@
     },
     "2024": {
       "Bioenergy": 0.0132,
-      "Coal": 0.4606,
-      "Gas": 0.0257,
+      "Coal": 0.4602,
+      "Gas": 0.026,
       "Hydro": 0.3751,
       "Nuclear": 0.0137,
       "Other Fossil": 0.0638,
@@ -8888,7 +8888,7 @@
     },
     "2025": {
       "Bioenergy": 0.0131,
-      "Coal": 0.4533,
+      "Coal": 0.4534,
       "Gas": 0.0248,
       "Hydro": 0.3751,
       "Nuclear": 0.0138,
@@ -8898,15 +8898,15 @@
       "Wind": 0.0212
     },
     "2026": {
-      "Bioenergy": 0.0137,
-      "Coal": 0.4578,
-      "Gas": 0.0262,
-      "Hydro": 0.3662,
-      "Nuclear": 0.013,
+      "Bioenergy": 0.0134,
+      "Coal": 0.4584,
+      "Gas": 0.0263,
+      "Hydro": 0.3671,
+      "Nuclear": 0.0131,
       "Other Fossil": 0.0637,
       "Other Renewables": 0.0011,
-      "Solar": 0.0346,
-      "Wind": 0.0237
+      "Solar": 0.0348,
+      "Wind": 0.0222
     }
   },
   "KI": {
@@ -9348,15 +9348,15 @@
       "Wind": 0.0062
     },
     "2026": {
-      "Bioenergy": 0.0206,
-      "Coal": 0.3007,
-      "Gas": 0.3274,
-      "Hydro": 0.0041,
-      "Nuclear": 0.2651,
-      "Other Fossil": 0.0088,
-      "Other Renewables": 0.0023,
-      "Solar": 0.0618,
-      "Wind": 0.0092
+      "Bioenergy": 0.0197,
+      "Coal": 0.2825,
+      "Gas": 0.3337,
+      "Hydro": 0.0042,
+      "Nuclear": 0.2716,
+      "Other Fossil": 0.0084,
+      "Other Renewables": 0.0021,
+      "Solar": 0.0706,
+      "Wind": 0.0072
     }
   },
   "KW": {
@@ -10172,9 +10172,9 @@
   "LT": {
     "2019": {
       "Bioenergy": 0.0548,
-      "Coal": 0.1272,
+      "Coal": 0.1271,
       "Gas": 0.2291,
-      "Hydro": 0.1562,
+      "Hydro": 0.1563,
       "Nuclear": 0.1727,
       "Other Fossil": 0.0412,
       "Other Renewables": 0.0061,
@@ -10183,8 +10183,8 @@
     },
     "2020": {
       "Bioenergy": 0.0532,
-      "Coal": 0.0994,
-      "Gas": 0.2929,
+      "Coal": 0.0993,
+      "Gas": 0.2928,
       "Hydro": 0.1417,
       "Nuclear": 0.1445,
       "Other Fossil": 0.0377,
@@ -10195,10 +10195,10 @@
     "2021": {
       "Bioenergy": 0.0534,
       "Coal": 0.1133,
-      "Gas": 0.2747,
+      "Gas": 0.2746,
       "Hydro": 0.1492,
       "Nuclear": 0.159,
-      "Other Fossil": 0.0364,
+      "Other Fossil": 0.0363,
       "Other Renewables": 0.0059,
       "Solar": 0.037,
       "Wind": 0.1713
@@ -10206,63 +10206,63 @@
     "2022": {
       "Bioenergy": 0.0518,
       "Coal": 0.1191,
-      "Gas": 0.2263,
-      "Hydro": 0.1432,
+      "Gas": 0.2262,
+      "Hydro": 0.1433,
       "Nuclear": 0.1408,
       "Other Fossil": 0.0469,
       "Other Renewables": 0.006,
       "Solar": 0.0647,
-      "Wind": 0.2012
+      "Wind": 0.2013
     },
     "2023": {
       "Bioenergy": 0.0386,
       "Coal": 0.0877,
-      "Gas": 0.1947,
-      "Hydro": 0.1351,
-      "Nuclear": 0.12,
-      "Other Fossil": 0.0573,
+      "Gas": 0.1946,
+      "Hydro": 0.1352,
+      "Nuclear": 0.1199,
+      "Other Fossil": 0.0574,
       "Other Renewables": 0.0049,
       "Solar": 0.0901,
       "Wind": 0.2715
     },
     "2024": {
       "Bioenergy": 0.0306,
-      "Coal": 0.0594,
-      "Gas": 0.1656,
+      "Coal": 0.0593,
+      "Gas": 0.1655,
       "Hydro": 0.1101,
       "Nuclear": 0.0908,
-      "Other Fossil": 0.0841,
+      "Other Fossil": 0.0842,
       "Other Renewables": 0.0036,
-      "Solar": 0.1407,
+      "Solar": 0.1408,
       "Wind": 0.315
     },
     "2025": {
       "Bioenergy": 0.02,
       "Coal": 0.0404,
-      "Gas": 0.1914,
+      "Gas": 0.1913,
       "Hydro": 0.0719,
       "Nuclear": 0.0623,
-      "Other Fossil": 0.1003,
+      "Other Fossil": 0.1004,
       "Other Renewables": 0.0024,
       "Solar": 0.1578,
-      "Wind": 0.3535
+      "Wind": 0.3536
     },
     "2026": {
-      "Bioenergy": 0.02,
-      "Coal": 0.0444,
-      "Gas": 0.173,
-      "Hydro": 0.0792,
-      "Nuclear": 0.065,
-      "Other Fossil": 0.0984,
-      "Other Renewables": 0.0025,
-      "Solar": 0.0994,
-      "Wind": 0.418
+      "Bioenergy": 0.0191,
+      "Coal": 0.0386,
+      "Gas": 0.1637,
+      "Hydro": 0.0703,
+      "Nuclear": 0.0558,
+      "Other Fossil": 0.1,
+      "Other Renewables": 0.0021,
+      "Solar": 0.1058,
+      "Wind": 0.4447
     }
   },
   "LU": {
     "2019": {
       "Bioenergy": 0.0571,
-      "Coal": 0.1332,
+      "Coal": 0.1331,
       "Gas": 0.2555,
       "Hydro": 0.1488,
       "Nuclear": 0.1809,
@@ -10275,21 +10275,21 @@
       "Bioenergy": 0.0715,
       "Coal": 0.1149,
       "Gas": 0.2385,
-      "Hydro": 0.1525,
+      "Hydro": 0.1526,
       "Nuclear": 0.1665,
       "Other Fossil": 0.0386,
       "Other Renewables": 0.0065,
       "Solar": 0.0574,
-      "Wind": 0.1535
+      "Wind": 0.1536
     },
     "2021": {
       "Bioenergy": 0.0795,
       "Coal": 0.1194,
-      "Gas": 0.2382,
+      "Gas": 0.2381,
       "Hydro": 0.1484,
       "Nuclear": 0.1681,
       "Other Fossil": 0.0373,
-      "Other Renewables": 0.0063,
+      "Other Renewables": 0.0062,
       "Solar": 0.0657,
       "Wind": 0.1372
     },
@@ -10297,7 +10297,7 @@
       "Bioenergy": 0.0846,
       "Coal": 0.1265,
       "Gas": 0.2272,
-      "Hydro": 0.1306,
+      "Hydro": 0.1307,
       "Nuclear": 0.1496,
       "Other Fossil": 0.0381,
       "Other Renewables": 0.0063,
@@ -10307,21 +10307,21 @@
     "2023": {
       "Bioenergy": 0.0551,
       "Coal": 0.1093,
-      "Gas": 0.1977,
-      "Hydro": 0.1444,
+      "Gas": 0.1975,
+      "Hydro": 0.1445,
       "Nuclear": 0.1503,
-      "Other Fossil": 0.0365,
+      "Other Fossil": 0.0366,
       "Other Renewables": 0.0061,
-      "Solar": 0.1003,
-      "Wind": 0.2002
+      "Solar": 0.1004,
+      "Wind": 0.2003
     },
     "2024": {
       "Bioenergy": 0.0734,
       "Coal": 0.096,
-      "Gas": 0.1811,
+      "Gas": 0.1809,
       "Hydro": 0.1562,
       "Nuclear": 0.1472,
-      "Other Fossil": 0.0371,
+      "Other Fossil": 0.0373,
       "Other Renewables": 0.0058,
       "Solar": 0.117,
       "Wind": 0.1861
@@ -10329,24 +10329,24 @@
     "2025": {
       "Bioenergy": 0.0696,
       "Coal": 0.0919,
-      "Gas": 0.1832,
+      "Gas": 0.183,
       "Hydro": 0.1301,
       "Nuclear": 0.1448,
-      "Other Fossil": 0.0371,
+      "Other Fossil": 0.0373,
       "Other Renewables": 0.0057,
       "Solar": 0.1504,
       "Wind": 0.1873
     },
     "2026": {
-      "Bioenergy": 0.0508,
-      "Coal": 0.0988,
-      "Gas": 0.1942,
-      "Hydro": 0.1458,
-      "Nuclear": 0.146,
-      "Other Fossil": 0.0388,
+      "Bioenergy": 0.0514,
+      "Coal": 0.0946,
+      "Gas": 0.189,
+      "Hydro": 0.1453,
+      "Nuclear": 0.1426,
+      "Other Fossil": 0.0392,
       "Other Renewables": 0.0055,
-      "Solar": 0.0991,
-      "Wind": 0.221
+      "Solar": 0.1177,
+      "Wind": 0.2148
     }
   },
   "LV": {
@@ -10384,20 +10384,20 @@
       "Wind": 0.0405
     },
     "2022": {
-      "Bioenergy": 0.0581,
+      "Bioenergy": 0.058,
       "Coal": 0.0577,
       "Gas": 0.2506,
       "Hydro": 0.4327,
       "Nuclear": 0.0675,
       "Other Fossil": 0.0448,
       "Other Renewables": 0.0029,
-      "Solar": 0.0234,
-      "Wind": 0.0622
+      "Solar": 0.0235,
+      "Wind": 0.0623
     },
     "2023": {
       "Bioenergy": 0.0367,
-      "Coal": 0.0383,
-      "Gas": 0.2483,
+      "Coal": 0.0382,
+      "Gas": 0.2482,
       "Hydro": 0.4888,
       "Nuclear": 0.0566,
       "Other Fossil": 0.0241,
@@ -10408,8 +10408,8 @@
     "2024": {
       "Bioenergy": 0.0562,
       "Coal": 0.0381,
-      "Gas": 0.2653,
-      "Hydro": 0.4256,
+      "Gas": 0.2652,
+      "Hydro": 0.4257,
       "Nuclear": 0.0582,
       "Other Fossil": 0.0092,
       "Other Renewables": 0.0023,
@@ -10428,15 +10428,15 @@
       "Wind": 0.0526
     },
     "2026": {
-      "Bioenergy": 0.0422,
+      "Bioenergy": 0.0404,
       "Coal": 0.0005,
-      "Gas": 0.4273,
-      "Hydro": 0.4293,
-      "Nuclear": 0.0007,
-      "Other Fossil": 0.0234,
+      "Gas": 0.427,
+      "Hydro": 0.4194,
+      "Nuclear": 0.0008,
+      "Other Fossil": 0.0206,
       "Other Renewables": 0,
-      "Solar": 0.0543,
-      "Wind": 0.0222
+      "Solar": 0.0619,
+      "Wind": 0.0294
     }
   },
   "LY": {
@@ -10532,91 +10532,91 @@
   "MA": {
     "2019": {
       "Bioenergy": 0,
-      "Coal": 0.671,
-      "Gas": 0.1007,
-      "Hydro": 0.0446,
+      "Coal": 0.6721,
+      "Gas": 0.0997,
+      "Hydro": 0.0443,
       "Nuclear": 0,
-      "Other Fossil": 0.0188,
+      "Other Fossil": 0.0186,
       "Other Renewables": 0,
-      "Solar": 0.0424,
-      "Wind": 0.1225
+      "Solar": 0.0427,
+      "Wind": 0.1226
     },
     "2020": {
       "Bioenergy": 0,
-      "Coal": 0.6949,
-      "Gas": 0.0831,
-      "Hydro": 0.0374,
-      "Nuclear": 0.0001,
-      "Other Fossil": 0.0174,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0419,
-      "Wind": 0.125
+      "Coal": 0.6985,
+      "Gas": 0.0801,
+      "Hydro": 0.0363,
+      "Nuclear": 0,
+      "Other Fossil": 0.017,
+      "Other Renewables": 0,
+      "Solar": 0.0422,
+      "Wind": 0.1259
     },
     "2021": {
       "Bioenergy": 0,
-      "Coal": 0.6773,
-      "Gas": 0.0833,
-      "Hydro": 0.0332,
-      "Nuclear": 0.0001,
-      "Other Fossil": 0.0184,
+      "Coal": 0.6786,
+      "Gas": 0.0821,
+      "Hydro": 0.0327,
+      "Nuclear": 0,
+      "Other Fossil": 0.0182,
       "Other Renewables": 0,
-      "Solar": 0.049,
-      "Wind": 0.1388
+      "Solar": 0.0491,
+      "Wind": 0.1392
     },
     "2022": {
-      "Bioenergy": 0.0001,
-      "Coal": 0.7069,
-      "Gas": 0.0695,
-      "Hydro": 0.0237,
-      "Nuclear": 0.0006,
-      "Other Fossil": 0.0249,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0382,
-      "Wind": 0.1358
+      "Bioenergy": 0,
+      "Coal": 0.723,
+      "Gas": 0.0558,
+      "Hydro": 0.0182,
+      "Nuclear": 0,
+      "Other Fossil": 0.0234,
+      "Other Renewables": 0,
+      "Solar": 0.0392,
+      "Wind": 0.1404
     },
     "2023": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.6376,
-      "Gas": 0.1049,
-      "Hydro": 0.0203,
-      "Nuclear": 0.0007,
-      "Other Fossil": 0.0224,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0536,
-      "Wind": 0.16
+      "Bioenergy": 0,
+      "Coal": 0.6535,
+      "Gas": 0.0904,
+      "Hydro": 0.0137,
+      "Nuclear": 0,
+      "Other Fossil": 0.0204,
+      "Other Renewables": 0,
+      "Solar": 0.0555,
+      "Wind": 0.1665
     },
     "2024": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.5838,
-      "Gas": 0.1108,
-      "Hydro": 0.0256,
-      "Nuclear": 0.0009,
-      "Other Fossil": 0.0219,
-      "Other Renewables": 0.0004,
-      "Solar": 0.0389,
-      "Wind": 0.2174
+      "Bioenergy": 0,
+      "Coal": 0.602,
+      "Gas": 0.0914,
+      "Hydro": 0.0169,
+      "Nuclear": 0,
+      "Other Fossil": 0.0192,
+      "Other Renewables": 0,
+      "Solar": 0.0406,
+      "Wind": 0.2299
     },
     "2025": {
-      "Bioenergy": 0.0003,
-      "Coal": 0.5726,
-      "Gas": 0.1239,
-      "Hydro": 0.0308,
-      "Nuclear": 0.0012,
-      "Other Fossil": 0.0233,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0412,
-      "Wind": 0.2062
+      "Bioenergy": 0,
+      "Coal": 0.6088,
+      "Gas": 0.0983,
+      "Hydro": 0.0189,
+      "Nuclear": 0,
+      "Other Fossil": 0.0191,
+      "Other Renewables": 0,
+      "Solar": 0.043,
+      "Wind": 0.2119
     },
     "2026": {
-      "Bioenergy": 0.0003,
-      "Coal": 0.5706,
-      "Gas": 0.1301,
-      "Hydro": 0.0287,
-      "Nuclear": 0.0013,
-      "Other Fossil": 0.0255,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0436,
-      "Wind": 0.1994
+      "Bioenergy": 0,
+      "Coal": 0.6618,
+      "Gas": 0.1059,
+      "Hydro": 0.0147,
+      "Nuclear": 0,
+      "Other Fossil": 0.0176,
+      "Other Renewables": 0,
+      "Solar": 0.0324,
+      "Wind": 0.1676
     }
   },
   "MD": {
@@ -10699,14 +10699,14 @@
     },
     "2026": {
       "Bioenergy": 0.0006,
-      "Coal": 0.0027,
-      "Gas": 0.9217,
-      "Hydro": 0.0451,
-      "Nuclear": 0.0041,
+      "Coal": 0.0026,
+      "Gas": 0.9216,
+      "Hydro": 0.0452,
+      "Nuclear": 0.004,
       "Other Fossil": 0.0004,
       "Other Renewables": 0.0002,
-      "Solar": 0.0222,
-      "Wind": 0.0031
+      "Solar": 0.0224,
+      "Wind": 0.003
     }
   },
   "ME": {
@@ -10723,8 +10723,8 @@
     },
     "2020": {
       "Bioenergy": 0.0069,
-      "Coal": 0.4025,
-      "Gas": 0.0578,
+      "Coal": 0.4024,
+      "Gas": 0.0577,
       "Hydro": 0.3624,
       "Nuclear": 0.0514,
       "Other Fossil": 0.0048,
@@ -10771,7 +10771,7 @@
       "Gas": 0.0309,
       "Hydro": 0.4314,
       "Nuclear": 0.0287,
-      "Other Fossil": 0.0029,
+      "Other Fossil": 0.003,
       "Other Renewables": 0.0011,
       "Solar": 0.0341,
       "Wind": 0.0915
@@ -10779,24 +10779,24 @@
     "2025": {
       "Bioenergy": 0.0135,
       "Coal": 0.1778,
-      "Gas": 0.1093,
+      "Gas": 0.1092,
       "Hydro": 0.3703,
       "Nuclear": 0.0981,
-      "Other Fossil": 0.0098,
+      "Other Fossil": 0.01,
       "Other Renewables": 0.0039,
       "Solar": 0.0888,
       "Wind": 0.1285
     },
     "2026": {
-      "Bioenergy": 0,
-      "Coal": 0.313,
-      "Gas": 0,
-      "Hydro": 0.6184,
-      "Nuclear": 0,
-      "Other Fossil": 0,
-      "Other Renewables": 0,
-      "Solar": 0,
-      "Wind": 0.0686
+      "Bioenergy": 0.0015,
+      "Coal": 0.2837,
+      "Gas": 0.0095,
+      "Hydro": 0.5811,
+      "Nuclear": 0.0097,
+      "Other Fossil": 0.001,
+      "Other Renewables": 0.0004,
+      "Solar": 0.0263,
+      "Wind": 0.0869
     }
   },
   "MG": {
@@ -10893,7 +10893,7 @@
     "2019": {
       "Bioenergy": 0.0176,
       "Coal": 0.4987,
-      "Gas": 0.1869,
+      "Gas": 0.1868,
       "Hydro": 0.2008,
       "Nuclear": 0.0475,
       "Other Fossil": 0.0046,
@@ -10948,7 +10948,7 @@
     "2024": {
       "Bioenergy": 0.0191,
       "Coal": 0.3933,
-      "Gas": 0.233,
+      "Gas": 0.2329,
       "Hydro": 0.2409,
       "Nuclear": 0.0181,
       "Other Fossil": 0.0018,
@@ -10959,24 +10959,24 @@
     "2025": {
       "Bioenergy": 0.0069,
       "Coal": 0.3744,
-      "Gas": 0.2455,
+      "Gas": 0.2454,
       "Hydro": 0.1551,
       "Nuclear": 0.0425,
-      "Other Fossil": 0.0042,
+      "Other Fossil": 0.0043,
       "Other Renewables": 0.0017,
       "Solar": 0.1198,
       "Wind": 0.05
     },
     "2026": {
-      "Bioenergy": 0.006,
-      "Coal": 0.3835,
-      "Gas": 0.2453,
-      "Hydro": 0.1489,
-      "Nuclear": 0.0403,
+      "Bioenergy": 0.0061,
+      "Coal": 0.3826,
+      "Gas": 0.2441,
+      "Hydro": 0.1492,
+      "Nuclear": 0.04,
       "Other Fossil": 0.0043,
-      "Other Renewables": 0.0015,
-      "Solar": 0.1168,
-      "Wind": 0.0534
+      "Other Renewables": 0.0016,
+      "Solar": 0.1192,
+      "Wind": 0.0529
     }
   },
   "ML": {
@@ -11239,14 +11239,14 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Coal": 0.9179,
+      "Coal": 0.9206,
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0821
+      "Wind": 0.0794
     }
   },
   "MO": {
@@ -11254,7 +11254,7 @@
       "Bioenergy": 0.051,
       "Coal": 0.5013,
       "Gas": 0.1805,
-      "Hydro": 0.1186,
+      "Hydro": 0.1187,
       "Nuclear": 0.0458,
       "Other Fossil": 0.0387,
       "Other Renewables": 0.0033,
@@ -11265,7 +11265,7 @@
       "Bioenergy": 0.0526,
       "Coal": 0.4927,
       "Gas": 0.1777,
-      "Hydro": 0.1212,
+      "Hydro": 0.1213,
       "Nuclear": 0.0458,
       "Other Fossil": 0.0373,
       "Other Renewables": 0.0036,
@@ -11274,31 +11274,31 @@
     },
     "2021": {
       "Bioenergy": 0.0543,
-      "Coal": 0.4907,
+      "Coal": 0.4906,
       "Gas": 0.1724,
-      "Hydro": 0.1119,
+      "Hydro": 0.112,
       "Nuclear": 0.0458,
-      "Other Fossil": 0.0375,
+      "Other Fossil": 0.0376,
       "Other Renewables": 0.0035,
       "Solar": 0.0355,
       "Wind": 0.0483
     },
     "2022": {
       "Bioenergy": 0.0558,
-      "Coal": 0.48,
+      "Coal": 0.4799,
       "Gas": 0.1682,
       "Hydro": 0.1118,
       "Nuclear": 0.0456,
-      "Other Fossil": 0.0377,
+      "Other Fossil": 0.0378,
       "Other Renewables": 0.0036,
       "Solar": 0.0435,
       "Wind": 0.0538
     },
     "2023": {
-      "Bioenergy": 0.0565,
-      "Coal": 0.4826,
+      "Bioenergy": 0.0564,
+      "Coal": 0.4828,
       "Gas": 0.1643,
-      "Hydro": 0.0997,
+      "Hydro": 0.0998,
       "Nuclear": 0.0457,
       "Other Fossil": 0.0354,
       "Other Renewables": 0.0035,
@@ -11306,20 +11306,20 @@
       "Wind": 0.0597
     },
     "2024": {
-      "Bioenergy": 0.0558,
-      "Coal": 0.4678,
-      "Gas": 0.1617,
-      "Hydro": 0.1034,
-      "Nuclear": 0.045,
-      "Other Fossil": 0.0342,
+      "Bioenergy": 0.056,
+      "Coal": 0.4665,
+      "Gas": 0.1626,
+      "Hydro": 0.1035,
+      "Nuclear": 0.0449,
+      "Other Fossil": 0.0343,
       "Other Renewables": 0.0034,
       "Solar": 0.0661,
       "Wind": 0.0627
     },
     "2025": {
-      "Bioenergy": 0.0556,
-      "Coal": 0.444,
-      "Gas": 0.1585,
+      "Bioenergy": 0.0555,
+      "Coal": 0.4441,
+      "Gas": 0.1586,
       "Hydro": 0.1036,
       "Nuclear": 0.0451,
       "Other Fossil": 0.0341,
@@ -11328,15 +11328,15 @@
       "Wind": 0.0695
     },
     "2026": {
-      "Bioenergy": 0.0576,
-      "Coal": 0.4585,
-      "Gas": 0.1633,
-      "Hydro": 0.0744,
-      "Nuclear": 0.0427,
+      "Bioenergy": 0.0566,
+      "Coal": 0.4605,
+      "Gas": 0.1636,
+      "Hydro": 0.0771,
+      "Nuclear": 0.0428,
       "Other Fossil": 0.0339,
-      "Other Renewables": 0.0037,
-      "Solar": 0.0882,
-      "Wind": 0.0776
+      "Other Renewables": 0.0036,
+      "Solar": 0.089,
+      "Wind": 0.0728
     }
   },
   "MQ": {
@@ -11612,7 +11612,7 @@
   "MT": {
     "2019": {
       "Bioenergy": 0.005,
-      "Coal": 0.0305,
+      "Coal": 0.0304,
       "Gas": 0.8539,
       "Hydro": 0.0302,
       "Nuclear": 0.0414,
@@ -11648,7 +11648,7 @@
       "Coal": 0.0284,
       "Gas": 0.8159,
       "Hydro": 0.0268,
-      "Nuclear": 0.0338,
+      "Nuclear": 0.0337,
       "Other Fossil": 0.0276,
       "Other Renewables": 0.0014,
       "Solar": 0.0418,
@@ -11660,7 +11660,7 @@
       "Gas": 0.7653,
       "Hydro": 0.0266,
       "Nuclear": 0.031,
-      "Other Fossil": 0.0079,
+      "Other Fossil": 0.008,
       "Other Renewables": 0.0012,
       "Solar": 0.1213,
       "Wind": 0.0199
@@ -11669,34 +11669,34 @@
       "Bioenergy": 0.0063,
       "Coal": 0.0295,
       "Gas": 0.703,
-      "Hydro": 0.0408,
+      "Hydro": 0.0409,
       "Nuclear": 0.046,
-      "Other Fossil": 0.0069,
+      "Other Fossil": 0.007,
       "Other Renewables": 0.0018,
-      "Solar": 0.1371,
-      "Wind": 0.0283
+      "Solar": 0.1372,
+      "Wind": 0.0284
     },
     "2025": {
       "Bioenergy": 0.0066,
       "Coal": 0.0298,
-      "Gas": 0.6923,
+      "Gas": 0.6922,
       "Hydro": 0.0393,
       "Nuclear": 0.0481,
-      "Other Fossil": 0.0093,
+      "Other Fossil": 0.0094,
       "Other Renewables": 0.0019,
       "Solar": 0.1426,
       "Wind": 0.03
     },
     "2026": {
-      "Bioenergy": 0.0066,
-      "Coal": 0.03,
-      "Gas": 0.7123,
-      "Hydro": 0.0375,
-      "Nuclear": 0.0445,
-      "Other Fossil": 0.0619,
+      "Bioenergy": 0.0064,
+      "Coal": 0.0277,
+      "Gas": 0.7155,
+      "Hydro": 0.0363,
+      "Nuclear": 0.0424,
+      "Other Fossil": 0.0191,
       "Other Renewables": 0.0017,
-      "Solar": 0.0719,
-      "Wind": 0.0336
+      "Solar": 0.1194,
+      "Wind": 0.0315
     }
   },
   "MU": {
@@ -12048,15 +12048,15 @@
       "Wind": 0.0612
     },
     "2026": {
-      "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
+      "Bioenergy": 0.0005,
+      "Coal": 0.0653,
+      "Gas": 0.592,
+      "Hydro": 0.0798,
+      "Nuclear": 0.0389,
+      "Other Fossil": 0.0808,
+      "Other Renewables": 0.0096,
+      "Solar": 0.0564,
+      "Wind": 0.0766
     }
   },
   "MY": {
@@ -12590,8 +12590,8 @@
     "2026": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.6351,
-      "Hydro": 0.3649,
+      "Gas": 0.6325,
+      "Hydro": 0.3675,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -12678,15 +12678,15 @@
       "Wind": 0.1544
     },
     "2026": {
-      "Bioenergy": 0.1704,
-      "Coal": 0.0033,
-      "Gas": 0.0193,
-      "Hydro": 0.0854,
-      "Nuclear": 0.0013,
-      "Other Fossil": 0.3973,
+      "Bioenergy": 0.1703,
+      "Coal": 0.0031,
+      "Gas": 0.0197,
+      "Hydro": 0.0851,
+      "Nuclear": 0.0014,
+      "Other Fossil": 0.3975,
       "Other Renewables": 0.1561,
       "Solar": 0.0141,
-      "Wind": 0.1526
+      "Wind": 0.1528
     }
   },
   "NL": {
@@ -12768,15 +12768,15 @@
       "Wind": 0.2444
     },
     "2026": {
-      "Bioenergy": 0.0556,
-      "Coal": 0.0879,
-      "Gas": 0.3577,
+      "Bioenergy": 0.0522,
+      "Coal": 0.085,
+      "Gas": 0.3599,
       "Hydro": 0.0008,
-      "Nuclear": 0.0306,
-      "Other Fossil": 0.0204,
+      "Nuclear": 0.0231,
+      "Other Fossil": 0.02,
       "Other Renewables": 0.0136,
-      "Solar": 0.1527,
-      "Wind": 0.2805
+      "Solar": 0.1732,
+      "Wind": 0.2722
     }
   },
   "NO": {
@@ -12858,21 +12858,21 @@
       "Wind": 0.0863
     },
     "2026": {
-      "Bioenergy": 0.0011,
-      "Coal": 0.0048,
-      "Gas": 0.0158,
-      "Hydro": 0.853,
-      "Nuclear": 0.0071,
+      "Bioenergy": 0.0013,
+      "Coal": 0.0053,
+      "Gas": 0.0176,
+      "Hydro": 0.8457,
+      "Nuclear": 0.0085,
       "Other Fossil": 0.0027,
-      "Other Renewables": 0.0026,
-      "Solar": 0.0027,
-      "Wind": 0.1103
+      "Other Renewables": 0.0029,
+      "Solar": 0.0041,
+      "Wind": 0.1119
     }
   },
   "NP": {
     "2019": {
       "Bioenergy": 0.0032,
-      "Coal": 0.1222,
+      "Coal": 0.1221,
       "Gas": 0.0251,
       "Hydro": 0.8089,
       "Nuclear": 0.0112,
@@ -12883,10 +12883,10 @@
     },
     "2020": {
       "Bioenergy": 0.0036,
-      "Coal": 0.1201,
+      "Coal": 0.12,
       "Gas": 0.0245,
       "Hydro": 0.8095,
-      "Nuclear": 0.0112,
+      "Nuclear": 0.0111,
       "Other Fossil": 0.002,
       "Other Renewables": 0.0009,
       "Solar": 0.0177,
@@ -12900,12 +12900,12 @@
       "Nuclear": 0.0112,
       "Other Fossil": 0.002,
       "Other Renewables": 0.0009,
-      "Solar": 0.0189,
+      "Solar": 0.019,
       "Wind": 0.013
     },
     "2022": {
       "Bioenergy": 0.0044,
-      "Coal": 0.117,
+      "Coal": 0.1169,
       "Gas": 0.0221,
       "Hydro": 0.8072,
       "Nuclear": 0.0111,
@@ -12915,10 +12915,10 @@
       "Wind": 0.0144
     },
     "2023": {
-      "Bioenergy": 0.0046,
+      "Bioenergy": 0.0045,
       "Coal": 0.1176,
       "Gas": 0.0212,
-      "Hydro": 0.8042,
+      "Hydro": 0.8043,
       "Nuclear": 0.0111,
       "Other Fossil": 0.0015,
       "Other Renewables": 0.0009,
@@ -12927,14 +12927,14 @@
     },
     "2024": {
       "Bioenergy": 0.0044,
-      "Coal": 0.114,
-      "Gas": 0.0206,
-      "Hydro": 0.8051,
-      "Nuclear": 0.011,
+      "Coal": 0.1137,
+      "Gas": 0.0208,
+      "Hydro": 0.8052,
+      "Nuclear": 0.0109,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.0008,
       "Solar": 0.0264,
-      "Wind": 0.0166
+      "Wind": 0.0165
     },
     "2025": {
       "Bioenergy": 0.0043,
@@ -12948,15 +12948,15 @@
       "Wind": 0.0182
     },
     "2026": {
-      "Bioenergy": 0.0048,
-      "Coal": 0.1117,
+      "Bioenergy": 0.0046,
+      "Coal": 0.1122,
       "Gas": 0.021,
-      "Hydro": 0.7981,
+      "Hydro": 0.7987,
       "Nuclear": 0.0104,
-      "Other Fossil": 0.0012,
+      "Other Fossil": 0.0011,
       "Other Renewables": 0.0009,
-      "Solar": 0.0318,
-      "Wind": 0.0202
+      "Solar": 0.032,
+      "Wind": 0.019
     }
   },
   "NR": {
@@ -13219,14 +13219,14 @@
     },
     "2026": {
       "Bioenergy": 0.0032,
-      "Coal": 0.024,
-      "Gas": 0.036,
-      "Hydro": 0.608,
+      "Coal": 0.0162,
+      "Gas": 0.0453,
+      "Hydro": 0.599,
       "Nuclear": 0,
       "Other Fossil": 0,
-      "Other Renewables": 0.24,
+      "Other Renewables": 0.2433,
       "Solar": 0,
-      "Wind": 0.0888
+      "Wind": 0.0929
     }
   },
   "OM": {
@@ -13488,15 +13488,15 @@
       "Wind": 0.0642
     },
     "2026": {
-      "Bioenergy": 0.0108,
+      "Bioenergy": 0.0095,
       "Coal": 0,
-      "Gas": 0.2454,
-      "Hydro": 0.6022,
+      "Gas": 0.2674,
+      "Hydro": 0.6029,
       "Nuclear": 0,
-      "Other Fossil": 0.0423,
+      "Other Fossil": 0.0213,
       "Other Renewables": 0,
-      "Solar": 0.0456,
-      "Wind": 0.0536
+      "Solar": 0.0445,
+      "Wind": 0.0544
     }
   },
   "PF": {
@@ -13848,15 +13848,15 @@
       "Wind": 0.025
     },
     "2026": {
-      "Bioenergy": 0.0085,
-      "Coal": 0.1746,
-      "Gas": 0.2053,
-      "Hydro": 0.1303,
-      "Nuclear": 0.1814,
-      "Other Fossil": 0,
+      "Bioenergy": 0.0076,
+      "Coal": 0.2339,
+      "Gas": 0.2385,
+      "Hydro": 0.0543,
+      "Nuclear": 0.143,
+      "Other Fossil": 0.0206,
       "Other Renewables": 0,
-      "Solar": 0.2862,
-      "Wind": 0.0136
+      "Solar": 0.2836,
+      "Wind": 0.0183
     }
   },
   "PL": {
@@ -13932,21 +13932,21 @@
       "Gas": 0.1338,
       "Hydro": 0.0115,
       "Nuclear": 0.003,
-      "Other Fossil": 0.0516,
+      "Other Fossil": 0.0517,
       "Other Renewables": 0.0033,
       "Solar": 0.1215,
       "Wind": 0.1416
     },
     "2026": {
-      "Bioenergy": 0.0147,
-      "Coal": 0.5605,
-      "Gas": 0.1462,
-      "Hydro": 0.0102,
+      "Bioenergy": 0.0154,
+      "Coal": 0.5445,
+      "Gas": 0.1459,
+      "Hydro": 0.0099,
       "Nuclear": 0.0014,
-      "Other Fossil": 0.0499,
+      "Other Fossil": 0.0501,
       "Other Renewables": 0.0034,
-      "Solar": 0.0927,
-      "Wind": 0.1209
+      "Solar": 0.1034,
+      "Wind": 0.126
     }
   },
   "PM": {
@@ -14086,47 +14086,47 @@
     },
     "2023": {
       "Bioenergy": 0,
-      "Coal": 0.1555,
-      "Gas": 0.4343,
+      "Coal": 0.1525,
+      "Gas": 0.4381,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.3916,
+      "Other Fossil": 0.3905,
       "Other Renewables": 0,
-      "Solar": 0.0134,
-      "Wind": 0.0053
+      "Solar": 0.0138,
+      "Wind": 0.0052
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.1827,
-      "Gas": 0.4024,
-      "Hydro": 0,
+      "Coal": 0.1782,
+      "Gas": 0.4066,
+      "Hydro": 0.0024,
       "Nuclear": 0,
-      "Other Fossil": 0.3936,
+      "Other Fossil": 0.3889,
       "Other Renewables": 0,
-      "Solar": 0.0119,
-      "Wind": 0.0094
+      "Solar": 0.0147,
+      "Wind": 0.0092
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.1889,
-      "Gas": 0.4315,
+      "Coal": 0.1741,
+      "Gas": 0.4394,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.3531,
+      "Other Fossil": 0.3595,
       "Other Renewables": 0,
-      "Solar": 0.0142,
-      "Wind": 0.0123
+      "Solar": 0.0145,
+      "Wind": 0.0126
     },
     "2026": {
       "Bioenergy": 0,
-      "Coal": 0.24,
-      "Gas": 0.456,
+      "Coal": 0.1583,
+      "Gas": 0.4945,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.28,
+      "Other Fossil": 0.3275,
       "Other Renewables": 0,
-      "Solar": 0.016,
-      "Wind": 0.008
+      "Solar": 0.011,
+      "Wind": 0.0088
     }
   },
   "PS": {
@@ -14225,17 +14225,17 @@
       "Coal": 0.1182,
       "Gas": 0.3428,
       "Hydro": 0.1514,
-      "Nuclear": 0.0206,
+      "Nuclear": 0.0205,
       "Other Fossil": 0.0089,
       "Other Renewables": 0.0007,
       "Solar": 0.0292,
-      "Wind": 0.2723
+      "Wind": 0.2724
     },
     "2020": {
       "Bioenergy": 0.0676,
       "Coal": 0.052,
       "Gas": 0.3495,
-      "Hydro": 0.2237,
+      "Hydro": 0.2236,
       "Nuclear": 0.0134,
       "Other Fossil": 0.0062,
       "Other Renewables": 0.0005,
@@ -14245,68 +14245,68 @@
     "2021": {
       "Bioenergy": 0.0733,
       "Coal": 0.0331,
-      "Gas": 0.3264,
-      "Hydro": 0.2126,
-      "Nuclear": 0.0255,
+      "Gas": 0.3263,
+      "Hydro": 0.2127,
+      "Nuclear": 0.0256,
       "Other Fossil": 0.0073,
-      "Other Renewables": 0.0009,
+      "Other Renewables": 0.001,
       "Solar": 0.0494,
-      "Wind": 0.2715
+      "Wind": 0.2714
     },
     "2022": {
       "Bioenergy": 0.0701,
-      "Coal": 0.0311,
-      "Gas": 0.3698,
+      "Coal": 0.0312,
+      "Gas": 0.3696,
       "Hydro": 0.1336,
-      "Nuclear": 0.0376,
+      "Nuclear": 0.0377,
       "Other Fossil": 0.008,
       "Other Renewables": 0.0016,
       "Solar": 0.0749,
-      "Wind": 0.2734
+      "Wind": 0.2733
     },
     "2023": {
-      "Bioenergy": 0.0619,
-      "Coal": 0.028,
+      "Bioenergy": 0.0618,
+      "Coal": 0.0281,
       "Gas": 0.2402,
       "Hydro": 0.2267,
-      "Nuclear": 0.0409,
-      "Other Fossil": 0.0077,
+      "Nuclear": 0.041,
+      "Other Fossil": 0.0078,
       "Other Renewables": 0.0017,
       "Solar": 0.1186,
-      "Wind": 0.2743
+      "Wind": 0.2742
     },
     "2024": {
       "Bioenergy": 0.065,
-      "Coal": 0.0272,
+      "Coal": 0.0273,
       "Gas": 0.1409,
       "Hydro": 0.2643,
-      "Nuclear": 0.0428,
-      "Other Fossil": 0.0089,
+      "Nuclear": 0.0429,
+      "Other Fossil": 0.009,
       "Other Renewables": 0.0017,
       "Solar": 0.1564,
-      "Wind": 0.2927
+      "Wind": 0.2926
     },
     "2025": {
-      "Bioenergy": 0.0564,
-      "Coal": 0.0209,
-      "Gas": 0.1795,
-      "Hydro": 0.252,
-      "Nuclear": 0.0343,
+      "Bioenergy": 0.0565,
+      "Coal": 0.0208,
+      "Gas": 0.1794,
+      "Hydro": 0.2521,
+      "Nuclear": 0.0341,
       "Other Fossil": 0.0074,
       "Other Renewables": 0.0013,
-      "Solar": 0.1808,
-      "Wind": 0.2673
+      "Solar": 0.1809,
+      "Wind": 0.2674
     },
     "2026": {
-      "Bioenergy": 0.0494,
-      "Coal": 0.0084,
-      "Gas": 0.1895,
-      "Hydro": 0.3277,
-      "Nuclear": 0.0126,
-      "Other Fossil": 0.0057,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0847,
-      "Wind": 0.3215
+      "Bioenergy": 0.0519,
+      "Coal": 0.0121,
+      "Gas": 0.1904,
+      "Hydro": 0.2949,
+      "Nuclear": 0.0198,
+      "Other Fossil": 0.0064,
+      "Other Renewables": 0.0008,
+      "Solar": 0.122,
+      "Wind": 0.3018
     }
   },
   "PY": {
@@ -14629,7 +14629,7 @@
       "Coal": 0.1428,
       "Gas": 0.1684,
       "Hydro": 0.318,
-      "Nuclear": 0.1967,
+      "Nuclear": 0.1966,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
       "Solar": 0.0377,
@@ -14649,7 +14649,7 @@
     "2025": {
       "Bioenergy": 0.0105,
       "Coal": 0.1303,
-      "Gas": 0.1937,
+      "Gas": 0.1936,
       "Hydro": 0.2356,
       "Nuclear": 0.2008,
       "Other Fossil": 0.0016,
@@ -14658,15 +14658,15 @@
       "Wind": 0.1177
     },
     "2026": {
-      "Bioenergy": 0.0093,
-      "Coal": 0.1017,
-      "Gas": 0.2405,
-      "Hydro": 0.2716,
-      "Nuclear": 0.1951,
+      "Bioenergy": 0.0092,
+      "Coal": 0.1011,
+      "Gas": 0.2124,
+      "Hydro": 0.287,
+      "Nuclear": 0.2021,
       "Other Fossil": 0.0006,
       "Other Renewables": 0.0002,
-      "Solar": 0.0506,
-      "Wind": 0.1303
+      "Solar": 0.0542,
+      "Wind": 0.1331
     }
   },
   "RS": {
@@ -14748,15 +14748,15 @@
       "Wind": 0.0438
     },
     "2026": {
-      "Bioenergy": 0.0072,
-      "Coal": 0.5804,
-      "Gas": 0.0321,
-      "Hydro": 0.3118,
-      "Nuclear": 0.0016,
-      "Other Fossil": 0.0049,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0002,
-      "Wind": 0.0618
+      "Bioenergy": 0.0084,
+      "Coal": 0.5503,
+      "Gas": 0.0373,
+      "Hydro": 0.323,
+      "Nuclear": 0.0081,
+      "Other Fossil": 0.0056,
+      "Other Renewables": 0.0003,
+      "Solar": 0.0047,
+      "Wind": 0.0622
     }
   },
   "RU": {
@@ -14838,15 +14838,15 @@
       "Wind": 0.0037
     },
     "2026": {
-      "Bioenergy": 0.0008,
-      "Coal": 0.1912,
-      "Gas": 0.4824,
-      "Hydro": 0.1356,
-      "Nuclear": 0.1715,
-      "Other Fossil": 0.0141,
+      "Bioenergy": 0.0007,
+      "Coal": 0.1902,
+      "Gas": 0.4798,
+      "Hydro": 0.1437,
+      "Nuclear": 0.1666,
+      "Other Fossil": 0.014,
       "Other Renewables": 0,
-      "Solar": 0.0007,
-      "Wind": 0.0039
+      "Solar": 0.0011,
+      "Wind": 0.004
     }
   },
   "RW": {
@@ -15378,15 +15378,15 @@
       "Wind": 0.2396
     },
     "2026": {
-      "Bioenergy": 0.0562,
+      "Bioenergy": 0.0548,
       "Coal": 0,
-      "Gas": 0,
-      "Hydro": 0.4187,
-      "Nuclear": 0.2653,
+      "Gas": 0.0002,
+      "Hydro": 0.4233,
+      "Nuclear": 0.2664,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0065,
-      "Wind": 0.2533
+      "Solar": 0.0139,
+      "Wind": 0.2414
     }
   },
   "SG": {
@@ -15470,13 +15470,13 @@
     "2026": {
       "Bioenergy": 0.0001,
       "Coal": 0.0021,
-      "Gas": 0.9369,
-      "Hydro": 0.0003,
+      "Gas": 0.9348,
+      "Hydro": 0.0004,
       "Nuclear": 0.0002,
-      "Other Fossil": 0.0298,
+      "Other Fossil": 0.0278,
       "Other Renewables": 0,
-      "Solar": 0.0302,
-      "Wind": 0.0004
+      "Solar": 0.0342,
+      "Wind": 0.0003
     }
   },
   "SH": {
@@ -15644,19 +15644,19 @@
       "Nuclear": 0.3939,
       "Other Fossil": 0.0008,
       "Other Renewables": 0.0003,
-      "Solar": 0.1043,
+      "Solar": 0.1042,
       "Wind": 0.0057
     },
     "2026": {
-      "Bioenergy": 0.017,
-      "Coal": 0.1972,
-      "Gas": 0.1068,
-      "Hydro": 0.1877,
-      "Nuclear": 0.4083,
-      "Other Fossil": 0.0009,
+      "Bioenergy": 0.0177,
+      "Coal": 0.1697,
+      "Gas": 0.107,
+      "Hydro": 0.187,
+      "Nuclear": 0.4209,
+      "Other Fossil": 0.001,
       "Other Renewables": 0.0003,
-      "Solar": 0.0752,
-      "Wind": 0.0066
+      "Solar": 0.0894,
+      "Wind": 0.007
     }
   },
   "SK": {
@@ -15738,14 +15738,14 @@
       "Wind": 0
     },
     "2026": {
-      "Bioenergy": 0.0284,
-      "Coal": 0.0038,
-      "Gas": 0.1145,
-      "Hydro": 0.1123,
-      "Nuclear": 0.6681,
-      "Other Fossil": 0.0466,
-      "Other Renewables": 0.0142,
-      "Solar": 0.0121,
+      "Bioenergy": 0.0296,
+      "Coal": 0.0029,
+      "Gas": 0.1135,
+      "Hydro": 0.1109,
+      "Nuclear": 0.6661,
+      "Other Fossil": 0.0463,
+      "Other Renewables": 0.0148,
+      "Solar": 0.0158,
       "Wind": 0
     }
   },
@@ -16368,15 +16368,15 @@
       "Wind": 0.0193
     },
     "2026": {
-      "Bioenergy": 0.0005,
-      "Coal": 0.0006,
+      "Bioenergy": 0.0004,
+      "Coal": 0.0005,
       "Gas": 0.2747,
       "Hydro": 0.3065,
       "Nuclear": 0.0002,
-      "Other Fossil": 0.0864,
+      "Other Fossil": 0.0865,
       "Other Renewables": 0.1715,
       "Solar": 0.1442,
-      "Wind": 0.0154
+      "Wind": 0.0155
     }
   },
   "SY": {
@@ -16867,9 +16867,9 @@
       "Bioenergy": 0.0681,
       "Coal": 0.2531,
       "Gas": 0.5526,
-      "Hydro": 0.0522,
+      "Hydro": 0.0523,
       "Nuclear": 0.0082,
-      "Other Fossil": 0.0096,
+      "Other Fossil": 0.0097,
       "Other Renewables": 0.0006,
       "Solar": 0.0317,
       "Wind": 0.0237
@@ -16887,8 +16887,8 @@
     },
     "2024": {
       "Bioenergy": 0.0644,
-      "Coal": 0.2192,
-      "Gas": 0.6015,
+      "Coal": 0.219,
+      "Gas": 0.6016,
       "Hydro": 0.0455,
       "Nuclear": 0.0073,
       "Other Fossil": 0.0019,
@@ -16898,9 +16898,9 @@
     },
     "2025": {
       "Bioenergy": 0.0481,
-      "Coal": 0.2334,
+      "Coal": 0.2335,
       "Gas": 0.5632,
-      "Hydro": 0.0551,
+      "Hydro": 0.055,
       "Nuclear": 0.0085,
       "Other Fossil": 0.0015,
       "Other Renewables": 0.0006,
@@ -16908,23 +16908,23 @@
       "Wind": 0.0286
     },
     "2026": {
-      "Bioenergy": 0.0486,
-      "Coal": 0.1426,
-      "Gas": 0.6412,
-      "Hydro": 0.0621,
-      "Nuclear": 0.006,
+      "Bioenergy": 0.0451,
+      "Coal": 0.1488,
+      "Gas": 0.6337,
+      "Hydro": 0.0629,
+      "Nuclear": 0.0066,
       "Other Fossil": 0.0014,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0702,
-      "Wind": 0.0274
+      "Other Renewables": 0.0006,
+      "Solar": 0.0741,
+      "Wind": 0.0268
     }
   },
   "TJ": {
     "2019": {
       "Bioenergy": 0,
-      "Coal": 0.067,
+      "Coal": 0.0669,
       "Gas": 0.0141,
-      "Hydro": 0.9188,
+      "Hydro": 0.919,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -16933,9 +16933,9 @@
     },
     "2020": {
       "Bioenergy": 0,
-      "Coal": 0.0736,
-      "Gas": 0.0149,
-      "Hydro": 0.9116,
+      "Coal": 0.0732,
+      "Gas": 0.0148,
+      "Hydro": 0.912,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -16944,9 +16944,9 @@
     },
     "2021": {
       "Bioenergy": 0,
-      "Coal": 0.07,
-      "Gas": 0.0121,
-      "Hydro": 0.9179,
+      "Coal": 0.0703,
+      "Gas": 0.012,
+      "Hydro": 0.9176,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -16955,9 +16955,9 @@
     },
     "2022": {
       "Bioenergy": 0,
-      "Coal": 0.0631,
-      "Gas": 0.0142,
-      "Hydro": 0.9227,
+      "Coal": 0.0628,
+      "Gas": 0.0141,
+      "Hydro": 0.923,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -16966,8 +16966,8 @@
     },
     "2023": {
       "Bioenergy": 0,
-      "Coal": 0.0509,
-      "Gas": 0.0123,
+      "Coal": 0.0525,
+      "Gas": 0.0108,
       "Hydro": 0.9367,
       "Nuclear": 0,
       "Other Fossil": 0,
@@ -16977,9 +16977,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.0582,
-      "Gas": 0.0117,
-      "Hydro": 0.9298,
+      "Coal": 0.0556,
+      "Gas": 0.0105,
+      "Hydro": 0.9338,
       "Nuclear": 0.0001,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -16988,9 +16988,9 @@
     },
     "2025": {
       "Bioenergy": 0.0002,
-      "Coal": 0.0682,
+      "Coal": 0.0672,
       "Gas": 0.0142,
-      "Hydro": 0.9158,
+      "Hydro": 0.9168,
       "Nuclear": 0.0004,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -16998,15 +16998,15 @@
       "Wind": 0.0006
     },
     "2026": {
-      "Bioenergy": 0.0003,
-      "Coal": 0.1363,
-      "Gas": 0.0283,
-      "Hydro": 0.8325,
-      "Nuclear": 0.0005,
-      "Other Fossil": 0.0001,
+      "Bioenergy": 0,
+      "Coal": 0.1104,
+      "Gas": 0.025,
+      "Hydro": 0.8646,
+      "Nuclear": 0,
+      "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0011,
-      "Wind": 0.001
+      "Solar": 0,
+      "Wind": 0
     }
   },
   "TL": {
@@ -17628,15 +17628,15 @@
       "Wind": 0.0427
     },
     "2026": {
-      "Bioenergy": 0.0011,
-      "Coal": 0.3156,
-      "Gas": 0.5141,
-      "Hydro": 0.0114,
+      "Bioenergy": 0.0012,
+      "Coal": 0.318,
+      "Gas": 0.5114,
+      "Hydro": 0.0108,
       "Nuclear": 0,
-      "Other Fossil": 0.033,
+      "Other Fossil": 0.0311,
       "Other Renewables": 0,
-      "Solar": 0.0571,
-      "Wind": 0.0675
+      "Solar": 0.0612,
+      "Wind": 0.0663
     }
   },
   "TZ": {
@@ -17955,48 +17955,48 @@
       "Wind": 0.1012
     },
     "2023": {
-      "Bioenergy": 0.0112,
-      "Coal": 0.1588,
-      "Gas": 0.4239,
-      "Hydro": 0.0554,
-      "Nuclear": 0.1825,
+      "Bioenergy": 0.0111,
+      "Coal": 0.1586,
+      "Gas": 0.4244,
+      "Hydro": 0.0565,
+      "Nuclear": 0.1821,
       "Other Fossil": 0.0078,
-      "Other Renewables": 0.0044,
-      "Solar": 0.056,
-      "Wind": 0.1001
+      "Other Renewables": 0.0043,
+      "Solar": 0.0561,
+      "Wind": 0.099
     },
     "2024": {
       "Bioenergy": 0.0106,
-      "Coal": 0.1489,
-      "Gas": 0.4256,
-      "Hydro": 0.0535,
-      "Nuclear": 0.1782,
+      "Coal": 0.1485,
+      "Gas": 0.4258,
+      "Hydro": 0.0542,
+      "Nuclear": 0.178,
       "Other Fossil": 0.0069,
       "Other Renewables": 0.004,
-      "Solar": 0.0688,
-      "Wind": 0.1035
+      "Solar": 0.0691,
+      "Wind": 0.1029
     },
     "2025": {
       "Bioenergy": 0.0102,
-      "Coal": 0.1631,
-      "Gas": 0.4003,
-      "Hydro": 0.0533,
+      "Coal": 0.163,
+      "Gas": 0.3998,
+      "Hydro": 0.0537,
       "Nuclear": 0.1736,
       "Other Fossil": 0.007,
       "Other Renewables": 0.0039,
-      "Solar": 0.0857,
-      "Wind": 0.1028
+      "Solar": 0.086,
+      "Wind": 0.1027
     },
     "2026": {
-      "Bioenergy": 0.0106,
-      "Coal": 0.1458,
-      "Gas": 0.3586,
-      "Hydro": 0.0699,
-      "Nuclear": 0.1765,
-      "Other Fossil": 0.0141,
+      "Bioenergy": 0.0102,
+      "Coal": 0.1454,
+      "Gas": 0.3665,
+      "Hydro": 0.0684,
+      "Nuclear": 0.1754,
+      "Other Fossil": 0.0131,
       "Other Renewables": 0.0041,
-      "Solar": 0.0881,
-      "Wind": 0.1324
+      "Solar": 0.0888,
+      "Wind": 0.128
     }
   },
   "UY": {
@@ -18078,15 +18078,15 @@
       "Wind": 0.3332
     },
     "2026": {
-      "Bioenergy": 0.1508,
-      "Coal": 0.001,
-      "Gas": 0.0053,
-      "Hydro": 0.3584,
+      "Bioenergy": 0.1531,
+      "Coal": 0.0007,
+      "Gas": 0.0045,
+      "Hydro": 0.3838,
       "Nuclear": 0.0003,
-      "Other Fossil": 0.0823,
+      "Other Fossil": 0.0668,
       "Other Renewables": 0.0001,
-      "Solar": 0.0474,
-      "Wind": 0.3543
+      "Solar": 0.0455,
+      "Wind": 0.3452
     }
   },
   "UZ": {
@@ -18168,15 +18168,15 @@
       "Wind": 0.0016
     },
     "2026": {
-      "Bioenergy": 0.0005,
-      "Coal": 0.0697,
+      "Bioenergy": 0.0004,
+      "Coal": 0.0698,
       "Gas": 0.8122,
-      "Hydro": 0.1013,
+      "Hydro": 0.1014,
       "Nuclear": 0.001,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
       "Solar": 0.0023,
-      "Wind": 0.0018
+      "Wind": 0.0017
     }
   },
   "VC": {
@@ -18855,7 +18855,7 @@
       "Wind": 0.0626
     },
     "2023": {
-      "Bioenergy": 0.0038,
+      "Bioenergy": 0.0037,
       "Coal": 0.7779,
       "Gas": 0.0326,
       "Hydro": 0.0765,
@@ -18868,35 +18868,35 @@
     "2024": {
       "Bioenergy": 0.0034,
       "Coal": 0.8201,
-      "Gas": 0.0309,
+      "Gas": 0.0308,
       "Hydro": 0.0472,
-      "Nuclear": 0.025,
+      "Nuclear": 0.0249,
       "Other Fossil": 0.0025,
       "Other Renewables": 0.001,
       "Solar": 0.0052,
-      "Wind": 0.0648
+      "Wind": 0.0649
     },
     "2025": {
       "Bioenergy": 0.0064,
       "Coal": 0.7102,
-      "Gas": 0.0549,
+      "Gas": 0.0548,
       "Hydro": 0.0805,
       "Nuclear": 0.0456,
-      "Other Fossil": 0.0045,
+      "Other Fossil": 0.0046,
       "Other Renewables": 0.0018,
       "Solar": 0.0191,
       "Wind": 0.0768
     },
     "2026": {
-      "Bioenergy": 0.0059,
-      "Coal": 0.7314,
-      "Gas": 0.0493,
-      "Hydro": 0.079,
-      "Nuclear": 0.0398,
-      "Other Fossil": 0.0042,
+      "Bioenergy": 0.006,
+      "Coal": 0.7305,
+      "Gas": 0.0481,
+      "Hydro": 0.0793,
+      "Nuclear": 0.0396,
+      "Other Fossil": 0.0043,
       "Other Renewables": 0.0015,
-      "Solar": 0.0132,
-      "Wind": 0.0755
+      "Solar": 0.0156,
+      "Wind": 0.075
     }
   },
   "YE": {