@digital4better/data 1.3.44 → 1.3.46

package/data/mix/country-yearly.json

@@ -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,9 +114,9 @@
     },
     "2021": {
       "Bioenergy": 0.0149,
-      "Coal": 0.4546,
+      "Coal": 0.4545,
       "Gas": 0.0856,
-      "Hydro": 0.2923,
+      "Hydro": 0.2924,
       "Nuclear": 0.0412,
       "Other Fossil": 0.0233,
       "Other Renewables": 0.0032,
@@ -127,7 +127,7 @@
       "Bioenergy": 0.0162,
       "Coal": 0.4449,
       "Gas": 0.0818,
-      "Hydro": 0.2922,
+      "Hydro": 0.2923,
       "Nuclear": 0.0411,
       "Other Fossil": 0.0234,
       "Other Renewables": 0.0032,
@@ -143,13 +143,13 @@
       "Other Fossil": 0.0212,
       "Other Renewables": 0.0032,
       "Solar": 0.0567,
-      "Wind": 0.0538
+      "Wind": 0.0537
     },
     "2024": {
       "Bioenergy": 0.0164,
-      "Coal": 0.4329,
+      "Coal": 0.4328,
       "Gas": 0.0769,
-      "Hydro": 0.2846,
+      "Hydro": 0.2847,
       "Nuclear": 0.0405,
       "Other Fossil": 0.0202,
       "Other Renewables": 0.003,
@@ -169,14 +169,14 @@
     },
     "2026": {
       "Bioenergy": 0.0169,
-      "Coal": 0.4273,
-      "Gas": 0.0775,
-      "Hydro": 0.2611,
-      "Nuclear": 0.039,
+      "Coal": 0.4274,
+      "Gas": 0.0777,
+      "Hydro": 0.261,
+      "Nuclear": 0.0386,
       "Other Fossil": 0.0199,
       "Other Renewables": 0.0033,
-      "Solar": 0.0894,
-      "Wind": 0.0655
+      "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,10 +339,10 @@
     "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
@@ -350,10 +350,10 @@
     "2026": {
       "Bioenergy": 0.0093,
       "Coal": 0.0402,
-      "Gas": 0.0744,
+      "Gas": 0.0745,
       "Hydro": 0.7332,
-      "Nuclear": 0.0614,
-      "Other Fossil": 0.0065,
+      "Nuclear": 0.0612,
+      "Other Fossil": 0.0066,
       "Other Renewables": 0.0024,
       "Solar": 0.0268,
       "Wind": 0.0458
@@ -363,89 +363,89 @@
     "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.4017,
-      "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
     }
   },
@@ -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,
@@ -801,8 +801,8 @@
       "Bioenergy": 0.032,
       "Coal": 0.0181,
       "Gas": 0.1914,
-      "Hydro": 0.4315,
-      "Nuclear": 0.0264,
+      "Hydro": 0.4314,
+      "Nuclear": 0.0263,
       "Other Fossil": 0.0169,
       "Other Renewables": 0.001,
       "Solar": 0.1331,
@@ -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": {
@@ -1283,10 +1283,10 @@
       "Wind": 0.004
     },
     "2021": {
-      "Bioenergy": 0.0017,
+      "Bioenergy": 0.0016,
       "Coal": 0.1121,
       "Gas": 0.6112,
-      "Hydro": 0.0196,
+      "Hydro": 0.0197,
       "Nuclear": 0.0046,
       "Other Fossil": 0.2391,
       "Other Renewables": 0.0004,
@@ -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,
@@ -1306,7 +1306,7 @@
     },
     "2023": {
       "Bioenergy": 0.002,
-      "Coal": 0.2427,
+      "Coal": 0.2426,
       "Gas": 0.5428,
       "Hydro": 0.0186,
       "Nuclear": 0.0049,
@@ -1317,8 +1317,8 @@
     },
     "2024": {
       "Bioenergy": 0.0025,
-      "Coal": 0.3478,
-      "Gas": 0.4714,
+      "Coal": 0.3477,
+      "Gas": 0.4713,
       "Hydro": 0.0247,
       "Nuclear": 0.0062,
       "Other Fossil": 0.1174,
@@ -1335,14 +1335,14 @@
       "Other Fossil": 0.1104,
       "Other Renewables": 0.0006,
       "Solar": 0.0292,
-      "Wind": 0.013
+      "Wind": 0.0131
     },
     "2026": {
       "Bioenergy": 0.004,
       "Coal": 0.4171,
-      "Gas": 0.4423,
+      "Gas": 0.4424,
       "Hydro": 0.0229,
-      "Nuclear": 0.0092,
+      "Nuclear": 0.009,
       "Other Fossil": 0.054,
       "Other Renewables": 0.0008,
       "Solar": 0.0339,
@@ -1430,10 +1430,10 @@
     "2026": {
       "Bioenergy": 0.0186,
       "Coal": 0.0327,
-      "Gas": 0.2229,
+      "Gas": 0.223,
       "Hydro": 0.0447,
-      "Nuclear": 0.2051,
-      "Other Fossil": 0.1211,
+      "Nuclear": 0.205,
+      "Other Fossil": 0.1212,
       "Other Renewables": 0.002,
       "Solar": 0.13,
       "Wind": 0.2228
@@ -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,
@@ -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": {
@@ -2690,13 +2690,13 @@
     "2026": {
       "Bioenergy": 0.1797,
       "Coal": 0.0153,
-      "Gas": 0.097,
-      "Hydro": 0.5151,
+      "Gas": 0.0969,
+      "Hydro": 0.5149,
       "Nuclear": 0.007,
-      "Other Fossil": 0.0985,
+      "Other Fossil": 0.099,
       "Other Renewables": 0.002,
-      "Solar": 0.0507,
-      "Wind": 0.0347
+      "Solar": 0.0506,
+      "Wind": 0.0346
     }
   },
   "CA": {
@@ -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,7 +3132,7 @@
       "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
@@ -3140,9 +3140,9 @@
     "2026": {
       "Bioenergy": 0.0059,
       "Coal": 0.0271,
-      "Gas": 0.0519,
-      "Hydro": 0.432,
-      "Nuclear": 0.2841,
+      "Gas": 0.052,
+      "Hydro": 0.4319,
+      "Nuclear": 0.284,
       "Other Fossil": 0.0521,
       "Other Renewables": 0.0015,
       "Solar": 0.1124,
@@ -3580,23 +3580,23 @@
       "Bioenergy": 0.0193,
       "Coal": 0.5559,
       "Gas": 0.0284,
-      "Hydro": 0.1272,
+      "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.02,
-      "Coal": 0.577,
-      "Gas": 0.0295,
-      "Hydro": 0.0975,
-      "Nuclear": 0.0447,
+      "Bioenergy": 0.0196,
+      "Coal": 0.5633,
+      "Gas": 0.0288,
+      "Hydro": 0.0989,
+      "Nuclear": 0.0451,
       "Other Fossil": 0.0016,
       "Other Renewables": 0,
-      "Solar": 0.1114,
-      "Wind": 0.1183
+      "Solar": 0.1205,
+      "Wind": 0.1223
     }
   },
   "CO": {
@@ -3771,7 +3771,7 @@
       "Bioenergy": 0.0098,
       "Coal": 0.0009,
       "Gas": 0.0058,
-      "Hydro": 0.6449,
+      "Hydro": 0.6448,
       "Nuclear": 0.0004,
       "Other Fossil": 0.0473,
       "Other Renewables": 0.1161,
@@ -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,18 +4381,18 @@
       "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.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
@@ -4400,9 +4400,9 @@
     "2026": {
       "Bioenergy": 0.1413,
       "Coal": 0.0673,
-      "Gas": 0.0636,
-      "Hydro": 0.0239,
-      "Nuclear": 0.0275,
+      "Gas": 0.0637,
+      "Hydro": 0.0238,
+      "Nuclear": 0.0274,
       "Other Fossil": 0.052,
       "Other Renewables": 0.0011,
       "Solar": 0.0899,
@@ -4758,22 +4758,22 @@
       "Wind": 0.0062
     },
     "2026": {
-      "Bioenergy": 0.0035,
+      "Bioenergy": 0.0018,
       "Coal": 0.0003,
-      "Gas": 0.0305,
-      "Hydro": 0.7028,
+      "Gas": 0.0301,
+      "Hydro": 0.677,
       "Nuclear": 0.0002,
-      "Other Fossil": 0.2577,
+      "Other Fossil": 0.286,
       "Other Renewables": 0,
       "Solar": 0.0009,
-      "Wind": 0.0041
+      "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,10 +4839,10 @@
     "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
@@ -4850,10 +4850,10 @@
     "2026": {
       "Bioenergy": 0.0706,
       "Coal": 0.0553,
-      "Gas": 0.1041,
-      "Hydro": 0.0703,
-      "Nuclear": 0.0831,
-      "Other Fossil": 0.283,
+      "Gas": 0.1042,
+      "Hydro": 0.0702,
+      "Nuclear": 0.0829,
+      "Other Fossil": 0.2832,
       "Other Renewables": 0.0032,
       "Solar": 0.1158,
       "Wind": 0.2145
@@ -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": {
@@ -5300,7 +5300,7 @@
     "2026": {
       "Bioenergy": 0.14,
       "Coal": 0.019,
-      "Gas": 0.0549,
+      "Gas": 0.055,
       "Hydro": 0.1406,
       "Nuclear": 0.3505,
       "Other Fossil": 0.0528,
@@ -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
@@ -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,
@@ -6010,7 +6010,7 @@
       "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,
@@ -6020,9 +6020,9 @@
     "2026": {
       "Bioenergy": 0.0053,
       "Coal": 0.1286,
-      "Gas": 0.2743,
+      "Gas": 0.2744,
       "Hydro": 0.5249,
-      "Nuclear": 0.0122,
+      "Nuclear": 0.0121,
       "Other Fossil": 0.0013,
       "Other Renewables": 0.001,
       "Solar": 0.0243,
@@ -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,
@@ -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,7 +7215,7 @@
       "Bioenergy": 0.0072,
       "Coal": 0.5715,
       "Gas": 0.3446,
-      "Hydro": 0.0355,
+      "Hydro": 0.0356,
       "Nuclear": 0.0134,
       "Other Fossil": 0.0061,
       "Other Renewables": 0.001,
@@ -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,
@@ -7257,9 +7257,9 @@
     },
     "2024": {
       "Bioenergy": 0.0082,
-      "Coal": 0.5639,
+      "Coal": 0.5638,
       "Gas": 0.3401,
-      "Hydro": 0.0303,
+      "Hydro": 0.0304,
       "Nuclear": 0.0132,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.001,
@@ -7280,13 +7280,13 @@
     "2026": {
       "Bioenergy": 0.0083,
       "Coal": 0.5621,
-      "Gas": 0.3403,
-      "Hydro": 0.0227,
-      "Nuclear": 0.0127,
+      "Gas": 0.3404,
+      "Hydro": 0.0226,
+      "Nuclear": 0.0126,
       "Other Fossil": 0.005,
       "Other Renewables": 0.0011,
-      "Solar": 0.0264,
-      "Wind": 0.0213
+      "Solar": 0.0265,
+      "Wind": 0.0214
     }
   },
   "HN": {
@@ -7373,7 +7373,7 @@
       "Gas": 0.0053,
       "Hydro": 0.2332,
       "Nuclear": 0.0004,
-      "Other Fossil": 0.4566,
+      "Other Fossil": 0.4567,
       "Other Renewables": 0.0276,
       "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,10 +7449,10 @@
     "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
@@ -7462,8 +7462,8 @@
       "Coal": 0.061,
       "Gas": 0.1959,
       "Hydro": 0.3877,
-      "Nuclear": 0.0373,
-      "Other Fossil": 0.0071,
+      "Nuclear": 0.0372,
+      "Other Fossil": 0.0072,
       "Other Renewables": 0.018,
       "Solar": 0.0505,
       "Wind": 0.2024
@@ -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,
@@ -7640,10 +7640,10 @@
     "2026": {
       "Bioenergy": 0.037,
       "Coal": 0.0629,
-      "Gas": 0.2435,
+      "Gas": 0.2436,
       "Hydro": 0.0455,
-      "Nuclear": 0.3716,
-      "Other Fossil": 0.0188,
+      "Nuclear": 0.3715,
+      "Other Fossil": 0.0189,
       "Other Renewables": 0.0043,
       "Solar": 0.167,
       "Wind": 0.0494
@@ -7798,9 +7798,9 @@
     "2024": {
       "Bioenergy": 0.0176,
       "Coal": 0.0487,
-      "Gas": 0.4456,
+      "Gas": 0.4455,
       "Hydro": 0.0499,
-      "Nuclear": 0.0322,
+      "Nuclear": 0.0321,
       "Other Fossil": 0.0258,
       "Other Renewables": 0.0013,
       "Solar": 0.0329,
@@ -7820,10 +7820,10 @@
     "2026": {
       "Bioenergy": 0.0185,
       "Coal": 0.0336,
-      "Gas": 0.3958,
+      "Gas": 0.3959,
       "Hydro": 0.0599,
-      "Nuclear": 0.0375,
-      "Other Fossil": 0.0219,
+      "Nuclear": 0.0374,
+      "Other Fossil": 0.022,
       "Other Renewables": 0.0015,
       "Solar": 0.0365,
       "Wind": 0.3949
@@ -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,10 +8349,10 @@
     "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
@@ -8360,7 +8360,7 @@
     "2026": {
       "Bioenergy": 0.0526,
       "Coal": 0.0287,
-      "Gas": 0.4431,
+      "Gas": 0.4432,
       "Hydro": 0.1442,
       "Nuclear": 0.0324,
       "Other Fossil": 0.0137,
@@ -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.002,
-      "Coal": 0.1232,
-      "Gas": 0.0176,
-      "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.0965,
-      "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.0016,
-      "Coal": 0.0979,
-      "Gas": 0.0157,
-      "Hydro": 0.8332,
-      "Nuclear": 0.0038,
-      "Other Fossil": 0.0334,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0077,
-      "Wind": 0.0063
+      "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,
@@ -8899,10 +8899,10 @@
     },
     "2026": {
       "Bioenergy": 0.0134,
-      "Coal": 0.4583,
-      "Gas": 0.0262,
+      "Coal": 0.4584,
+      "Gas": 0.0263,
       "Hydro": 0.3671,
-      "Nuclear": 0.0132,
+      "Nuclear": 0.0131,
       "Other Fossil": 0.0637,
       "Other Renewables": 0.0011,
       "Solar": 0.0348,
@@ -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,54 +10206,54 @@
     "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.0191,
       "Coal": 0.0386,
-      "Gas": 0.1636,
+      "Gas": 0.1637,
       "Hydro": 0.0703,
-      "Nuclear": 0.0559,
-      "Other Fossil": 0.0999,
+      "Nuclear": 0.0558,
+      "Other Fossil": 0.1,
       "Other Renewables": 0.0021,
       "Solar": 0.1058,
       "Wind": 0.4447
@@ -10262,7 +10262,7 @@
   "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,10 +10329,10 @@
     "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
@@ -10340,10 +10340,10 @@
     "2026": {
       "Bioenergy": 0.0514,
       "Coal": 0.0946,
-      "Gas": 0.1887,
-      "Hydro": 0.1454,
-      "Nuclear": 0.143,
-      "Other Fossil": 0.0389,
+      "Gas": 0.189,
+      "Hydro": 0.1453,
+      "Nuclear": 0.1426,
+      "Other Fossil": 0.0392,
       "Other Renewables": 0.0055,
       "Solar": 0.1177,
       "Wind": 0.2148
@@ -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,
@@ -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,10 +10779,10 @@
     "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
@@ -10792,7 +10792,7 @@
       "Coal": 0.2837,
       "Gas": 0.0095,
       "Hydro": 0.5811,
-      "Nuclear": 0.0098,
+      "Nuclear": 0.0097,
       "Other Fossil": 0.001,
       "Other Renewables": 0.0004,
       "Solar": 0.0263,
@@ -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,10 +10959,10 @@
     "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
@@ -10970,10 +10970,10 @@
     "2026": {
       "Bioenergy": 0.0061,
       "Coal": 0.3826,
-      "Gas": 0.244,
+      "Gas": 0.2441,
       "Hydro": 0.1492,
-      "Nuclear": 0.0401,
-      "Other Fossil": 0.0042,
+      "Nuclear": 0.04,
+      "Other Fossil": 0.0043,
       "Other Renewables": 0.0016,
       "Solar": 0.1192,
       "Wind": 0.0529
@@ -11239,14 +11239,14 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Coal": 0.9231,
+      "Coal": 0.9206,
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0769
+      "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,9 +11274,9 @@
     },
     "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.0376,
       "Other Renewables": 0.0035,
@@ -11285,7 +11285,7 @@
     },
     "2022": {
       "Bioenergy": 0.0558,
-      "Coal": 0.48,
+      "Coal": 0.4799,
       "Gas": 0.1682,
       "Hydro": 0.1118,
       "Nuclear": 0.0456,
@@ -11298,7 +11298,7 @@
       "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,
@@ -11307,9 +11307,9 @@
     },
     "2024": {
       "Bioenergy": 0.056,
-      "Coal": 0.4666,
+      "Coal": 0.4665,
       "Gas": 0.1626,
-      "Hydro": 0.1033,
+      "Hydro": 0.1035,
       "Nuclear": 0.0449,
       "Other Fossil": 0.0343,
       "Other Renewables": 0.0034,
@@ -11329,13 +11329,13 @@
     },
     "2026": {
       "Bioenergy": 0.0566,
-      "Coal": 0.4604,
-      "Gas": 0.1633,
-      "Hydro": 0.0773,
-      "Nuclear": 0.0433,
+      "Coal": 0.4605,
+      "Gas": 0.1636,
+      "Hydro": 0.0771,
+      "Nuclear": 0.0428,
       "Other Fossil": 0.0339,
       "Other Renewables": 0.0036,
-      "Solar": 0.0888,
+      "Solar": 0.089,
       "Wind": 0.0728
     }
   },
@@ -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,20 +11669,20 @@
       "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,
+      "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
@@ -11692,7 +11692,7 @@
       "Coal": 0.0277,
       "Gas": 0.7155,
       "Hydro": 0.0363,
-      "Nuclear": 0.0425,
+      "Nuclear": 0.0424,
       "Other Fossil": 0.0191,
       "Other Renewables": 0.0017,
       "Solar": 0.1194,
@@ -12048,15 +12048,15 @@
       "Wind": 0.0612
     },
     "2026": {
-      "Bioenergy": 0.0006,
-      "Coal": 0.0694,
-      "Gas": 0.582,
-      "Hydro": 0.0814,
-      "Nuclear": 0.0395,
-      "Other Fossil": 0.0798,
+      "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.0563,
-      "Wind": 0.0815
+      "Solar": 0.0564,
+      "Wind": 0.0766
     }
   },
   "MY": {
@@ -12683,7 +12683,7 @@
       "Gas": 0.0197,
       "Hydro": 0.0851,
       "Nuclear": 0.0014,
-      "Other Fossil": 0.3974,
+      "Other Fossil": 0.3975,
       "Other Renewables": 0.1561,
       "Solar": 0.0141,
       "Wind": 0.1528
@@ -12872,7 +12872,7 @@
   "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,
@@ -12916,9 +12916,9 @@
     },
     "2023": {
       "Bioenergy": 0.0045,
-      "Coal": 0.1177,
+      "Coal": 0.1176,
       "Gas": 0.0212,
-      "Hydro": 0.8042,
+      "Hydro": 0.8043,
       "Nuclear": 0.0111,
       "Other Fossil": 0.0015,
       "Other Renewables": 0.0009,
@@ -12929,8 +12929,8 @@
       "Bioenergy": 0.0044,
       "Coal": 0.1137,
       "Gas": 0.0208,
-      "Hydro": 0.8051,
-      "Nuclear": 0.011,
+      "Hydro": 0.8052,
+      "Nuclear": 0.0109,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.0008,
       "Solar": 0.0264,
@@ -12951,11 +12951,11 @@
       "Bioenergy": 0.0046,
       "Coal": 0.1122,
       "Gas": 0.021,
-      "Hydro": 0.7988,
-      "Nuclear": 0.0106,
+      "Hydro": 0.7987,
+      "Nuclear": 0.0104,
       "Other Fossil": 0.0011,
       "Other Renewables": 0.0009,
-      "Solar": 0.0319,
+      "Solar": 0.032,
       "Wind": 0.019
     }
   },
@@ -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": {
@@ -13932,7 +13932,7 @@
       "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
@@ -14239,7 +14239,7 @@
       "Nuclear": 0.0134,
       "Other Fossil": 0.0062,
       "Other Renewables": 0.0005,
-      "Solar": 0.0376,
+      "Solar": 0.0377,
       "Wind": 0.2495
     },
     "2021": {
@@ -14256,7 +14256,7 @@
     "2022": {
       "Bioenergy": 0.0701,
       "Coal": 0.0312,
-      "Gas": 0.3697,
+      "Gas": 0.3696,
       "Hydro": 0.1336,
       "Nuclear": 0.0377,
       "Other Fossil": 0.008,
@@ -14278,10 +14278,10 @@
     "2024": {
       "Bioenergy": 0.065,
       "Coal": 0.0273,
-      "Gas": 0.141,
-      "Hydro": 0.2642,
+      "Gas": 0.1409,
+      "Hydro": 0.2643,
       "Nuclear": 0.0429,
-      "Other Fossil": 0.0089,
+      "Other Fossil": 0.009,
       "Other Renewables": 0.0017,
       "Solar": 0.1564,
       "Wind": 0.2926
@@ -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,
@@ -15470,12 +15470,12 @@
     "2026": {
       "Bioenergy": 0.0001,
       "Coal": 0.0021,
-      "Gas": 0.9369,
+      "Gas": 0.9348,
       "Hydro": 0.0004,
       "Nuclear": 0.0002,
-      "Other Fossil": 0.0298,
+      "Other Fossil": 0.0278,
       "Other Renewables": 0,
-      "Solar": 0.0302,
+      "Solar": 0.0342,
       "Wind": 0.0003
     }
   },
@@ -15644,16 +15644,16 @@
       "Nuclear": 0.3939,
       "Other Fossil": 0.0008,
       "Other Renewables": 0.0003,
-      "Solar": 0.1043,
+      "Solar": 0.1042,
       "Wind": 0.0057
     },
     "2026": {
       "Bioenergy": 0.0177,
       "Coal": 0.1697,
       "Gas": 0.107,
-      "Hydro": 0.1871,
+      "Hydro": 0.187,
       "Nuclear": 0.4209,
-      "Other Fossil": 0.0009,
+      "Other Fossil": 0.001,
       "Other Renewables": 0.0003,
       "Solar": 0.0894,
       "Wind": 0.007
@@ -16867,7 +16867,7 @@
       "Bioenergy": 0.0681,
       "Coal": 0.2531,
       "Gas": 0.5526,
-      "Hydro": 0.0522,
+      "Hydro": 0.0523,
       "Nuclear": 0.0082,
       "Other Fossil": 0.0097,
       "Other Renewables": 0.0006,
@@ -16876,7 +16876,7 @@
     },
     "2023": {
       "Bioenergy": 0.0676,
-      "Coal": 0.2154,
+      "Coal": 0.2153,
       "Gas": 0.5993,
       "Hydro": 0.0466,
       "Nuclear": 0.0074,
@@ -16886,7 +16886,7 @@
       "Wind": 0.0263
     },
     "2024": {
-      "Bioenergy": 0.0645,
+      "Bioenergy": 0.0644,
       "Coal": 0.219,
       "Gas": 0.6016,
       "Hydro": 0.0455,
@@ -16900,7 +16900,7 @@
       "Bioenergy": 0.0481,
       "Coal": 0.2335,
       "Gas": 0.5632,
-      "Hydro": 0.0551,
+      "Hydro": 0.055,
       "Nuclear": 0.0085,
       "Other Fossil": 0.0015,
       "Other Renewables": 0.0006,
@@ -16911,8 +16911,8 @@
       "Bioenergy": 0.0451,
       "Coal": 0.1488,
       "Gas": 0.6337,
-      "Hydro": 0.063,
-      "Nuclear": 0.0067,
+      "Hydro": 0.0629,
+      "Nuclear": 0.0066,
       "Other Fossil": 0.0014,
       "Other Renewables": 0.0006,
       "Solar": 0.0741,
@@ -16922,9 +16922,9 @@
   "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.0002,
-      "Coal": 0.1363,
-      "Gas": 0.0283,
-      "Hydro": 0.8325,
-      "Nuclear": 0.0006,
-      "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.0009
+      "Solar": 0,
+      "Wind": 0
     }
   },
   "TL": {
@@ -17989,7 +17989,7 @@
     },
     "2026": {
       "Bioenergy": 0.0102,
-      "Coal": 0.1453,
+      "Coal": 0.1454,
       "Gas": 0.3665,
       "Hydro": 0.0684,
       "Nuclear": 0.1754,
@@ -18855,7 +18855,7 @@
       "Wind": 0.0626
     },
     "2023": {
-      "Bioenergy": 0.0038,
+      "Bioenergy": 0.0037,
       "Coal": 0.7779,
       "Gas": 0.0326,
       "Hydro": 0.0765,
@@ -18868,9 +18868,9 @@
     "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,
@@ -18879,10 +18879,10 @@
     "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
@@ -18890,10 +18890,10 @@
     "2026": {
       "Bioenergy": 0.006,
       "Coal": 0.7305,
-      "Gas": 0.048,
+      "Gas": 0.0481,
       "Hydro": 0.0793,
-      "Nuclear": 0.0397,
-      "Other Fossil": 0.0042,
+      "Nuclear": 0.0396,
+      "Other Fossil": 0.0043,
       "Other Renewables": 0.0015,
       "Solar": 0.0156,
       "Wind": 0.075