@digital4better/data 1.3.43 → 1.3.45

package/data/mix/country-yearly-green.json

@@ -51,14 +51,14 @@
   },
   "AF": {
     "2019": {
-      "Bioenergy": 0.0319,
+      "Bioenergy": 0.0318,
       "Hydro": 0.7969,
       "Solar": 0.0873,
       "Wind": 0.084
     },
     "2020": {
       "Bioenergy": 0.0345,
-      "Hydro": 0.7796,
+      "Hydro": 0.7797,
       "Solar": 0.0959,
       "Wind": 0.0899
     },
@@ -75,28 +75,28 @@
       "Wind": 0.1196
     },
     "2023": {
-      "Bioenergy": 0.0412,
-      "Hydro": 0.6885,
+      "Bioenergy": 0.0409,
+      "Hydro": 0.6887,
       "Solar": 0.1388,
       "Wind": 0.1315
     },
     "2024": {
-      "Bioenergy": 0.038,
-      "Hydro": 0.6677,
-      "Solar": 0.1618,
-      "Wind": 0.1326
+      "Bioenergy": 0.0385,
+      "Hydro": 0.6675,
+      "Solar": 0.1617,
+      "Wind": 0.1324
     },
     "2025": {
-      "Bioenergy": 0.0356,
+      "Bioenergy": 0.0354,
       "Hydro": 0.6323,
-      "Solar": 0.1931,
-      "Wind": 0.139
+      "Solar": 0.1932,
+      "Wind": 0.1391
     },
     "2026": {
-      "Bioenergy": 0.041,
-      "Hydro": 0.5942,
-      "Solar": 0.2042,
-      "Wind": 0.1607
+      "Bioenergy": 0.039,
+      "Hydro": 0.6026,
+      "Solar": 0.2069,
+      "Wind": 0.1515
     }
   },
   "AG": {
@@ -159,7 +159,7 @@
     "2020": {
       "Bioenergy": 0.0116,
       "Hydro": 0.9278,
-      "Solar": 0.0185,
+      "Solar": 0.0186,
       "Wind": 0.042
     },
     "2021": {
@@ -182,7 +182,7 @@
     },
     "2024": {
       "Bioenergy": 0.0109,
-      "Hydro": 0.9063,
+      "Hydro": 0.9062,
       "Solar": 0.0331,
       "Wind": 0.0498
     },
@@ -193,59 +193,59 @@
       "Wind": 0.0494
     },
     "2026": {
-      "Bioenergy": 0.0113,
-      "Hydro": 0.9029,
-      "Solar": 0.0284,
-      "Wind": 0.0574
+      "Bioenergy": 0.0114,
+      "Hydro": 0.8995,
+      "Solar": 0.0329,
+      "Wind": 0.0562
     }
   },
   "AM": {
     "2019": {
       "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
+      "Hydro": 0.997,
+      "Solar": 0.003,
       "Wind": 0
     },
     "2020": {
       "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
+      "Hydro": 0.9699,
+      "Solar": 0.0301,
       "Wind": 0
     },
     "2021": {
       "Bioenergy": 0,
-      "Hydro": 0.9603,
-      "Solar": 0.0397,
+      "Hydro": 0.9406,
+      "Solar": 0.0594,
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.0006,
-      "Hydro": 0.8855,
-      "Solar": 0.1117,
-      "Wind": 0.0022
+      "Bioenergy": 0.0004,
+      "Hydro": 0.8716,
+      "Solar": 0.1266,
+      "Wind": 0.0015
     },
     "2023": {
-      "Bioenergy": 0.0008,
-      "Hydro": 0.8075,
-      "Solar": 0.1887,
-      "Wind": 0.003
+      "Bioenergy": 0.0005,
+      "Hydro": 0.7636,
+      "Solar": 0.2339,
+      "Wind": 0.0019
     },
     "2024": {
-      "Bioenergy": 0.0012,
-      "Hydro": 0.7837,
-      "Solar": 0.2106,
-      "Wind": 0.0044
+      "Bioenergy": 0.0008,
+      "Hydro": 0.7529,
+      "Solar": 0.2436,
+      "Wind": 0.0028
     },
     "2025": {
       "Bioenergy": 0.0003,
-      "Hydro": 0.7888,
-      "Solar": 0.2097,
-      "Wind": 0.0012
+      "Hydro": 0.7784,
+      "Solar": 0.2203,
+      "Wind": 0.0011
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.6665,
-      "Solar": 0.3335,
+      "Hydro": 0.6633,
+      "Solar": 0.3367,
       "Wind": 0
     }
   },
@@ -326,7 +326,7 @@
     },
     "2023": {
       "Bioenergy": 0.0219,
-      "Hydro": 0.685,
+      "Hydro": 0.6849,
       "Solar": 0.0563,
       "Wind": 0.2369
     },
@@ -343,10 +343,10 @@
       "Wind": 0.3215
     },
     "2026": {
-      "Bioenergy": 0.0302,
-      "Hydro": 0.4645,
-      "Solar": 0.1434,
-      "Wind": 0.3619
+      "Bioenergy": 0.0295,
+      "Hydro": 0.4752,
+      "Solar": 0.132,
+      "Wind": 0.3633
     }
   },
   "AS": {
@@ -416,7 +416,7 @@
       "Bioenergy": 0.0331,
       "Hydro": 0.765,
       "Solar": 0.0507,
-      "Wind": 0.1512
+      "Wind": 0.1513
     },
     "2022": {
       "Bioenergy": 0.0538,
@@ -443,10 +443,10 @@
       "Wind": 0.1573
     },
     "2026": {
-      "Bioenergy": 0.0468,
-      "Hydro": 0.5757,
-      "Solar": 0.1598,
-      "Wind": 0.2177
+      "Bioenergy": 0.0429,
+      "Hydro": 0.5781,
+      "Solar": 0.1783,
+      "Wind": 0.2006
     }
   },
   "AU": {
@@ -493,10 +493,10 @@
       "Wind": 0.3676
     },
     "2026": {
-      "Bioenergy": 0.007,
-      "Hydro": 0.1102,
-      "Solar": 0.5578,
-      "Wind": 0.3251
+      "Bioenergy": 0.0062,
+      "Hydro": 0.1103,
+      "Solar": 0.5498,
+      "Wind": 0.3337
     }
   },
   "AW": {
@@ -552,51 +552,51 @@
   "AZ": {
     "2019": {
       "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
+      "Hydro": 0.9798,
+      "Solar": 0.0202,
       "Wind": 0
     },
     "2020": {
       "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
+      "Hydro": 0.9574,
+      "Solar": 0.0426,
       "Wind": 0
     },
     "2021": {
       "Bioenergy": 0,
-      "Hydro": 0.9692,
-      "Solar": 0.0308,
+      "Hydro": 0.9672,
+      "Solar": 0.0328,
       "Wind": 0
     },
     "2022": {
       "Bioenergy": 0,
-      "Hydro": 0.9634,
-      "Solar": 0.0366,
+      "Hydro": 0.9654,
+      "Solar": 0.0346,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.0011,
-      "Hydro": 0.9576,
-      "Solar": 0.038,
-      "Wind": 0.0032
+      "Bioenergy": 0.001,
+      "Hydro": 0.9579,
+      "Solar": 0.0382,
+      "Wind": 0.0029
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.9133,
-      "Solar": 0.0867,
+      "Hydro": 0.9254,
+      "Solar": 0.0746,
       "Wind": 0
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9554,
-      "Solar": 0.0446,
+      "Hydro": 0.9664,
+      "Solar": 0.0336,
       "Wind": 0
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.9562,
-      "Solar": 0.0438,
-      "Wind": 0
+      "Hydro": 0.7515,
+      "Solar": 0.0621,
+      "Wind": 0.1863
     }
   },
   "BA": {
@@ -644,9 +644,9 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.935,
-      "Solar": 0.0404,
-      "Wind": 0.0246
+      "Hydro": 0.9308,
+      "Solar": 0.0389,
+      "Wind": 0.0303
     }
   },
   "BB": {
@@ -702,51 +702,51 @@
   "BD": {
     "2019": {
       "Bioenergy": 0.0438,
-      "Hydro": 0.7412,
+      "Hydro": 0.7413,
       "Solar": 0.0981,
       "Wind": 0.1169
     },
     "2020": {
       "Bioenergy": 0.0467,
-      "Hydro": 0.7065,
+      "Hydro": 0.7066,
       "Solar": 0.1247,
       "Wind": 0.122
     },
     "2021": {
       "Bioenergy": 0.0505,
-      "Hydro": 0.6016,
+      "Hydro": 0.6017,
       "Solar": 0.1994,
-      "Wind": 0.1485
+      "Wind": 0.1484
     },
     "2022": {
       "Bioenergy": 0.0506,
       "Hydro": 0.5489,
-      "Solar": 0.2479,
-      "Wind": 0.1527
+      "Solar": 0.2478,
+      "Wind": 0.1526
     },
     "2023": {
-      "Bioenergy": 0.0487,
-      "Hydro": 0.4586,
-      "Solar": 0.3357,
+      "Bioenergy": 0.0483,
+      "Hydro": 0.4588,
+      "Solar": 0.3358,
       "Wind": 0.1571
     },
     "2024": {
-      "Bioenergy": 0.0438,
-      "Hydro": 0.4347,
-      "Solar": 0.3522,
-      "Wind": 0.1694
+      "Bioenergy": 0.0443,
+      "Hydro": 0.4346,
+      "Solar": 0.3519,
+      "Wind": 0.1692
     },
     "2025": {
-      "Bioenergy": 0.0444,
-      "Hydro": 0.3781,
-      "Solar": 0.3991,
-      "Wind": 0.1785
+      "Bioenergy": 0.0442,
+      "Hydro": 0.378,
+      "Solar": 0.3992,
+      "Wind": 0.1786
     },
     "2026": {
-      "Bioenergy": 0.0533,
-      "Hydro": 0.273,
-      "Solar": 0.4461,
-      "Wind": 0.2275
+      "Bioenergy": 0.0516,
+      "Hydro": 0.298,
+      "Solar": 0.4422,
+      "Wind": 0.2083
     }
   },
   "BE": {
@@ -790,13 +790,13 @@
       "Bioenergy": 0.0419,
       "Hydro": 0.081,
       "Solar": 0.3874,
-      "Wind": 0.4896
+      "Wind": 0.4897
     },
     "2026": {
-      "Bioenergy": 0.0359,
-      "Hydro": 0.0989,
-      "Solar": 0.2821,
-      "Wind": 0.583
+      "Bioenergy": 0.0446,
+      "Hydro": 0.1075,
+      "Solar": 0.3125,
+      "Wind": 0.5354
     }
   },
   "BF": {
@@ -893,10 +893,10 @@
       "Wind": 0.1298
     },
     "2026": {
-      "Bioenergy": 0.013,
-      "Hydro": 0.4537,
-      "Solar": 0.3896,
-      "Wind": 0.1436
+      "Bioenergy": 0.0132,
+      "Hydro": 0.4508,
+      "Solar": 0.3976,
+      "Wind": 0.1385
     }
   },
   "BH": {
@@ -1194,9 +1194,9 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.8739,
-      "Solar": 0.0946,
-      "Wind": 0.0314
+      "Hydro": 0.876,
+      "Solar": 0.0931,
+      "Wind": 0.0309
     }
   },
   "BR": {
@@ -1243,10 +1243,10 @@
       "Wind": 0.1727
     },
     "2026": {
-      "Bioenergy": 0.0615,
-      "Hydro": 0.678,
-      "Solar": 0.1473,
-      "Wind": 0.1132
+      "Bioenergy": 0.0624,
+      "Hydro": 0.671,
+      "Solar": 0.1459,
+      "Wind": 0.1207
     }
   },
   "BS": {
@@ -1401,52 +1401,52 @@
   },
   "BY": {
     "2019": {
-      "Bioenergy": 0.1403,
-      "Hydro": 0.4247,
-      "Solar": 0.2242,
-      "Wind": 0.2108
+      "Bioenergy": 0.0742,
+      "Hydro": 0.4601,
+      "Solar": 0.2303,
+      "Wind": 0.2355
     },
     "2020": {
-      "Bioenergy": 0.2286,
-      "Hydro": 0.4047,
-      "Solar": 0.152,
-      "Wind": 0.2147
+      "Bioenergy": 0.1133,
+      "Hydro": 0.4711,
+      "Solar": 0.1994,
+      "Wind": 0.2162
     },
     "2021": {
-      "Bioenergy": 0.2408,
-      "Hydro": 0.4051,
-      "Solar": 0.1865,
-      "Wind": 0.1675
+      "Bioenergy": 0.1307,
+      "Hydro": 0.4482,
+      "Solar": 0.213,
+      "Wind": 0.2081
     },
     "2022": {
-      "Bioenergy": 0.2433,
-      "Hydro": 0.3739,
-      "Solar": 0.2126,
-      "Wind": 0.1701
+      "Bioenergy": 0.1131,
+      "Hydro": 0.4361,
+      "Solar": 0.2447,
+      "Wind": 0.2061
     },
     "2023": {
-      "Bioenergy": 0.4119,
-      "Hydro": 0.3102,
-      "Solar": 0.1262,
-      "Wind": 0.1517
+      "Bioenergy": 0.2204,
+      "Hydro": 0.3895,
+      "Solar": 0.1996,
+      "Wind": 0.1905
     },
     "2024": {
-      "Bioenergy": 0.2914,
-      "Hydro": 0.3668,
-      "Solar": 0.1915,
-      "Wind": 0.1502
+      "Bioenergy": 0.1842,
+      "Hydro": 0.3986,
+      "Solar": 0.2321,
+      "Wind": 0.1851
     },
     "2025": {
-      "Bioenergy": 0.1539,
-      "Hydro": 0.4671,
-      "Solar": 0.1629,
-      "Wind": 0.216
+      "Bioenergy": 0.1377,
+      "Hydro": 0.4809,
+      "Solar": 0.1545,
+      "Wind": 0.227
     },
     "2026": {
-      "Bioenergy": 0.1383,
-      "Hydro": 0.4725,
-      "Solar": 0.1665,
-      "Wind": 0.2227
+      "Bioenergy": 0.2596,
+      "Hydro": 0.3125,
+      "Solar": 0.1555,
+      "Wind": 0.2725
     }
   },
   "BZ": {
@@ -1481,36 +1481,36 @@
       "Wind": 0.0476
     },
     "2024": {
-      "Bioenergy": 0.2383,
+      "Bioenergy": 0.2384,
       "Hydro": 0.6572,
       "Solar": 0.0533,
       "Wind": 0.0511
     },
     "2025": {
-      "Bioenergy": 0.2362,
-      "Hydro": 0.6489,
+      "Bioenergy": 0.2361,
+      "Hydro": 0.649,
       "Solar": 0.0599,
       "Wind": 0.055
     },
     "2026": {
-      "Bioenergy": 0.2306,
-      "Hydro": 0.661,
-      "Solar": 0.0652,
-      "Wind": 0.0432
+      "Bioenergy": 0.2304,
+      "Hydro": 0.6603,
+      "Solar": 0.0649,
+      "Wind": 0.0444
     }
   },
   "CA": {
     "2019": {
-      "Bioenergy": 0.0253,
-      "Hydro": 0.8913,
-      "Solar": 0.0058,
-      "Wind": 0.0776
+      "Bioenergy": 0.0267,
+      "Hydro": 0.8901,
+      "Solar": 0.0057,
+      "Wind": 0.0775
     },
     "2020": {
-      "Bioenergy": 0.0222,
-      "Hydro": 0.8877,
+      "Bioenergy": 0.0237,
+      "Hydro": 0.8863,
       "Solar": 0.0059,
-      "Wind": 0.0843
+      "Wind": 0.0841
     },
     "2021": {
       "Bioenergy": 0.0252,
@@ -1519,34 +1519,34 @@
       "Wind": 0.0849
     },
     "2022": {
-      "Bioenergy": 0.0221,
-      "Hydro": 0.8825,
+      "Bioenergy": 0.0208,
+      "Hydro": 0.8837,
       "Solar": 0.0071,
-      "Wind": 0.0883
+      "Wind": 0.0884
     },
     "2023": {
-      "Bioenergy": 0.024,
-      "Hydro": 0.8686,
-      "Solar": 0.0112,
-      "Wind": 0.0961
+      "Bioenergy": 0.0214,
+      "Hydro": 0.8709,
+      "Solar": 0.0113,
+      "Wind": 0.0964
     },
     "2024": {
-      "Bioenergy": 0.026,
-      "Hydro": 0.8463,
+      "Bioenergy": 0.024,
+      "Hydro": 0.848,
       "Solar": 0.0133,
-      "Wind": 0.1145
+      "Wind": 0.1147
     },
     "2025": {
-      "Bioenergy": 0.0272,
-      "Hydro": 0.8343,
+      "Bioenergy": 0.0251,
+      "Hydro": 0.836,
       "Solar": 0.015,
-      "Wind": 0.1236
+      "Wind": 0.1238
     },
     "2026": {
-      "Bioenergy": 0.0269,
-      "Hydro": 0.8395,
-      "Solar": 0.0043,
-      "Wind": 0.1293
+      "Bioenergy": 0.0247,
+      "Hydro": 0.8518,
+      "Solar": 0.0078,
+      "Wind": 0.1156
     }
   },
   "CD": {
@@ -1743,10 +1743,10 @@
       "Wind": 0.0225
     },
     "2026": {
-      "Bioenergy": 0.0123,
-      "Hydro": 0.7418,
-      "Solar": 0.1787,
-      "Wind": 0.0672
+      "Bioenergy": 0.0101,
+      "Hydro": 0.7404,
+      "Solar": 0.1927,
+      "Wind": 0.0569
     }
   },
   "CI": {
@@ -1893,10 +1893,10 @@
       "Wind": 0.2186
     },
     "2026": {
-      "Bioenergy": 0.0327,
-      "Hydro": 0.305,
-      "Solar": 0.4583,
-      "Wind": 0.2039
+      "Bioenergy": 0.0336,
+      "Hydro": 0.3066,
+      "Solar": 0.4465,
+      "Wind": 0.2132
     }
   },
   "CM": {
@@ -1975,28 +1975,28 @@
       "Wind": 0.2958
     },
     "2023": {
-      "Bioenergy": 0.0691,
-      "Hydro": 0.4094,
-      "Solar": 0.2072,
-      "Wind": 0.3143
+      "Bioenergy": 0.0685,
+      "Hydro": 0.4097,
+      "Solar": 0.2074,
+      "Wind": 0.3145
     },
     "2024": {
-      "Bioenergy": 0.06,
-      "Hydro": 0.3874,
-      "Solar": 0.2525,
-      "Wind": 0.3001
+      "Bioenergy": 0.0612,
+      "Hydro": 0.3869,
+      "Solar": 0.2521,
+      "Wind": 0.2997
     },
     "2025": {
-      "Bioenergy": 0.053,
-      "Hydro": 0.3457,
-      "Solar": 0.3059,
-      "Wind": 0.2954
+      "Bioenergy": 0.0525,
+      "Hydro": 0.3456,
+      "Solar": 0.3062,
+      "Wind": 0.2957
     },
     "2026": {
-      "Bioenergy": 0.0575,
-      "Hydro": 0.2681,
-      "Solar": 0.3412,
-      "Wind": 0.3331
+      "Bioenergy": 0.0541,
+      "Hydro": 0.2737,
+      "Solar": 0.3336,
+      "Wind": 0.3386
     }
   },
   "CO": {
@@ -2093,10 +2093,10 @@
       "Wind": 0.1331
     },
     "2026": {
-      "Bioenergy": 0.0121,
-      "Hydro": 0.7667,
-      "Solar": 0.0036,
-      "Wind": 0.2176
+      "Bioenergy": 0.0118,
+      "Hydro": 0.7775,
+      "Solar": 0.0028,
+      "Wind": 0.2079
     }
   },
   "CU": {
@@ -2245,8 +2245,8 @@
     "2026": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.7271,
-      "Wind": 0.2729
+      "Solar": 0.6808,
+      "Wind": 0.3192
     }
   },
   "CZ": {
@@ -2293,10 +2293,10 @@
       "Wind": 0.0648
     },
     "2026": {
-      "Bioenergy": 0.3203,
-      "Hydro": 0.1855,
-      "Solar": 0.408,
-      "Wind": 0.0862
+      "Bioenergy": 0.3026,
+      "Hydro": 0.1694,
+      "Solar": 0.4447,
+      "Wind": 0.0833
     }
   },
   "DE": {
@@ -2343,10 +2343,10 @@
       "Wind": 0.4668
     },
     "2026": {
-      "Bioenergy": 0.1457,
-      "Hydro": 0.0473,
-      "Solar": 0.2564,
-      "Wind": 0.5507
+      "Bioenergy": 0.1431,
+      "Hydro": 0.0478,
+      "Solar": 0.283,
+      "Wind": 0.5261
     }
   },
   "DJ": {
@@ -2408,9 +2408,9 @@
     },
     "2020": {
       "Bioenergy": 0.1395,
-      "Hydro": 0.0601,
+      "Hydro": 0.0602,
       "Solar": 0.069,
-      "Wind": 0.7314
+      "Wind": 0.7313
     },
     "2021": {
       "Bioenergy": 0.2081,
@@ -2443,10 +2443,10 @@
       "Wind": 0.6659
     },
     "2026": {
-      "Bioenergy": 0.1882,
-      "Hydro": 0.0282,
-      "Solar": 0.0915,
-      "Wind": 0.692
+      "Bioenergy": 0.1792,
+      "Hydro": 0.0302,
+      "Solar": 0.114,
+      "Wind": 0.6765
     }
   },
   "DM": {
@@ -2643,10 +2643,10 @@
       "Wind": 0.0082
     },
     "2026": {
-      "Bioenergy": 0.0067,
-      "Hydro": 0.9783,
-      "Solar": 0.0055,
-      "Wind": 0.0095
+      "Bioenergy": 0.0026,
+      "Hydro": 0.9906,
+      "Solar": 0.0012,
+      "Wind": 0.0056
     }
   },
   "EE": {
@@ -2657,28 +2657,28 @@
       "Wind": 0.4508
     },
     "2020": {
-      "Bioenergy": 0.2352,
-      "Hydro": 0.23,
-      "Solar": 0.0867,
-      "Wind": 0.4481
+      "Bioenergy": 0.2351,
+      "Hydro": 0.2301,
+      "Solar": 0.0868,
+      "Wind": 0.448
     },
     "2021": {
       "Bioenergy": 0.2228,
-      "Hydro": 0.1848,
+      "Hydro": 0.1849,
       "Solar": 0.1681,
       "Wind": 0.4243
     },
     "2022": {
       "Bioenergy": 0.328,
-      "Hydro": 0.0687,
+      "Hydro": 0.0688,
       "Solar": 0.2532,
       "Wind": 0.35
     },
     "2023": {
       "Bioenergy": 0.1794,
-      "Hydro": 0.169,
+      "Hydro": 0.1691,
       "Solar": 0.2792,
-      "Wind": 0.3724
+      "Wind": 0.3723
     },
     "2024": {
       "Bioenergy": 0.1394,
@@ -2693,10 +2693,10 @@
       "Wind": 0.4217
     },
     "2026": {
-      "Bioenergy": 0.1562,
-      "Hydro": 0.1526,
-      "Solar": 0.2259,
-      "Wind": 0.4652
+      "Bioenergy": 0.1498,
+      "Hydro": 0.1491,
+      "Solar": 0.2458,
+      "Wind": 0.4553
     }
   },
   "EG": {
@@ -2801,14 +2801,14 @@
   },
   "ES": {
     "2019": {
-      "Bioenergy": 0.0316,
-      "Hydro": 0.2826,
-      "Solar": 0.1486,
-      "Wind": 0.5372
+      "Bioenergy": 0.0315,
+      "Hydro": 0.2821,
+      "Solar": 0.1488,
+      "Wind": 0.5377
     },
     "2020": {
       "Bioenergy": 0.0355,
-      "Hydro": 0.3079,
+      "Hydro": 0.308,
       "Solar": 0.1792,
       "Wind": 0.4773
     },
@@ -2816,37 +2816,37 @@
       "Bioenergy": 0.0347,
       "Hydro": 0.2729,
       "Solar": 0.2096,
-      "Wind": 0.4827
+      "Wind": 0.4828
     },
     "2022": {
       "Bioenergy": 0.0345,
-      "Hydro": 0.1877,
-      "Solar": 0.2729,
-      "Wind": 0.5049
+      "Hydro": 0.1876,
+      "Solar": 0.2732,
+      "Wind": 0.5047
     },
     "2023": {
       "Bioenergy": 0.0234,
-      "Hydro": 0.1837,
-      "Solar": 0.3319,
+      "Hydro": 0.1836,
+      "Solar": 0.332,
       "Wind": 0.4611
     },
     "2024": {
       "Bioenergy": 0.0232,
-      "Hydro": 0.2149,
-      "Solar": 0.364,
-      "Wind": 0.3979
+      "Hydro": 0.2148,
+      "Solar": 0.3643,
+      "Wind": 0.3977
     },
     "2025": {
       "Bioenergy": 0.0249,
       "Hydro": 0.2038,
-      "Solar": 0.3963,
-      "Wind": 0.375
+      "Solar": 0.3965,
+      "Wind": 0.3748
     },
     "2026": {
-      "Bioenergy": 0.0213,
-      "Hydro": 0.2754,
-      "Solar": 0.2627,
-      "Wind": 0.4405
+      "Bioenergy": 0.0214,
+      "Hydro": 0.2568,
+      "Solar": 0.2884,
+      "Wind": 0.4335
     }
   },
   "ET": {
@@ -2909,17 +2909,17 @@
     "2020": {
       "Bioenergy": 0.268,
       "Hydro": 0.4816,
-      "Solar": 0.0226,
+      "Solar": 0.0227,
       "Wind": 0.2277
     },
     "2021": {
-      "Bioenergy": 0.2968,
+      "Bioenergy": 0.2967,
       "Hydro": 0.4471,
       "Solar": 0.0256,
       "Wind": 0.2305
     },
     "2022": {
-      "Bioenergy": 0.303,
+      "Bioenergy": 0.3029,
       "Hydro": 0.3719,
       "Solar": 0.0241,
       "Wind": 0.301
@@ -2943,10 +2943,10 @@
       "Wind": 0.474
     },
     "2026": {
-      "Bioenergy": 0.2409,
-      "Hydro": 0.2805,
-      "Solar": 0.0146,
-      "Wind": 0.464
+      "Bioenergy": 0.2701,
+      "Hydro": 0.2713,
+      "Solar": 0.024,
+      "Wind": 0.4345
     }
   },
   "FJ": {
@@ -3116,7 +3116,7 @@
       "Bioenergy": 0.0293,
       "Hydro": 0.5192,
       "Solar": 0.122,
-      "Wind": 0.3296
+      "Wind": 0.3295
     },
     "2022": {
       "Bioenergy": 0.0381,
@@ -3138,15 +3138,15 @@
     },
     "2025": {
       "Bioenergy": 0.0203,
-      "Hydro": 0.39,
+      "Hydro": 0.3899,
       "Solar": 0.2245,
       "Wind": 0.3653
     },
     "2026": {
-      "Bioenergy": 0.0227,
-      "Hydro": 0.4117,
-      "Solar": 0.1606,
-      "Wind": 0.405
+      "Bioenergy": 0.0235,
+      "Hydro": 0.3996,
+      "Solar": 0.1763,
+      "Wind": 0.4007
     }
   },
   "GA": {
@@ -3204,7 +3204,7 @@
       "Bioenergy": 0.1779,
       "Hydro": 0.0713,
       "Solar": 0.1231,
-      "Wind": 0.6278
+      "Wind": 0.6277
     },
     "2020": {
       "Bioenergy": 0.1635,
@@ -3214,7 +3214,7 @@
     },
     "2021": {
       "Bioenergy": 0.1908,
-      "Hydro": 0.0728,
+      "Hydro": 0.0729,
       "Solar": 0.1187,
       "Wind": 0.6177
     },
@@ -3243,10 +3243,10 @@
       "Wind": 0.6345
     },
     "2026": {
-      "Bioenergy": 0.1308,
-      "Hydro": 0.0533,
-      "Solar": 0.0915,
-      "Wind": 0.7245
+      "Bioenergy": 0.1325,
+      "Hydro": 0.0522,
+      "Solar": 0.1114,
+      "Wind": 0.7038
     }
   },
   "GD": {
@@ -3331,22 +3331,22 @@
       "Wind": 0.0173
     },
     "2024": {
-      "Bioenergy": 0.0021,
-      "Hydro": 0.973,
+      "Bioenergy": 0.0022,
+      "Hydro": 0.9729,
       "Solar": 0.0068,
       "Wind": 0.0181
     },
     "2025": {
       "Bioenergy": 0.003,
-      "Hydro": 0.9632,
+      "Hydro": 0.9633,
       "Solar": 0.0122,
       "Wind": 0.0215
     },
     "2026": {
-      "Bioenergy": 0.0107,
-      "Hydro": 0.8865,
-      "Solar": 0.0475,
-      "Wind": 0.0553
+      "Bioenergy": 0.0091,
+      "Hydro": 0.9009,
+      "Solar": 0.0417,
+      "Wind": 0.0483
     }
   },
   "GF": {
@@ -3751,7 +3751,7 @@
   },
   "GR": {
     "2019": {
-      "Bioenergy": 0.0179,
+      "Bioenergy": 0.0178,
       "Hydro": 0.2968,
       "Solar": 0.253,
       "Wind": 0.4323
@@ -3794,9 +3794,9 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.2511,
-      "Solar": 0.3014,
-      "Wind": 0.4475
+      "Hydro": 0.2282,
+      "Solar": 0.3275,
+      "Wind": 0.4443
     }
   },
   "GT": {
@@ -4002,51 +4002,51 @@
   "HK": {
     "2019": {
       "Bioenergy": 0.1127,
-      "Hydro": 0.5827,
-      "Solar": 0.1331,
-      "Wind": 0.1715
+      "Hydro": 0.5829,
+      "Solar": 0.133,
+      "Wind": 0.1714
     },
     "2020": {
       "Bioenergy": 0.1133,
-      "Hydro": 0.5609,
-      "Solar": 0.1476,
-      "Wind": 0.1782
+      "Hydro": 0.5611,
+      "Solar": 0.1475,
+      "Wind": 0.1781
     },
     "2021": {
       "Bioenergy": 0.1173,
-      "Hydro": 0.5015,
+      "Hydro": 0.5016,
       "Solar": 0.1649,
-      "Wind": 0.2163
+      "Wind": 0.2162
     },
     "2022": {
       "Bioenergy": 0.1164,
-      "Hydro": 0.4695,
+      "Hydro": 0.4696,
       "Solar": 0.1879,
-      "Wind": 0.2261
+      "Wind": 0.226
     },
     "2023": {
-      "Bioenergy": 0.1176,
-      "Hydro": 0.4128,
-      "Solar": 0.2226,
-      "Wind": 0.247
+      "Bioenergy": 0.1171,
+      "Hydro": 0.4132,
+      "Solar": 0.2227,
+      "Wind": 0.2471
     },
     "2024": {
-      "Bioenergy": 0.106,
-      "Hydro": 0.3958,
-      "Solar": 0.258,
-      "Wind": 0.2402
+      "Bioenergy": 0.1068,
+      "Hydro": 0.3957,
+      "Solar": 0.2577,
+      "Wind": 0.2398
     },
     "2025": {
-      "Bioenergy": 0.0955,
+      "Bioenergy": 0.0952,
       "Hydro": 0.3597,
-      "Solar": 0.3034,
-      "Wind": 0.2414
+      "Solar": 0.3036,
+      "Wind": 0.2415
     },
     "2026": {
-      "Bioenergy": 0.1088,
-      "Hydro": 0.2746,
-      "Solar": 0.3302,
-      "Wind": 0.2864
+      "Bioenergy": 0.1059,
+      "Hydro": 0.2871,
+      "Solar": 0.336,
+      "Wind": 0.2711
     }
   },
   "HN": {
@@ -4094,9 +4094,9 @@
     },
     "2026": {
       "Bioenergy": 0.1776,
-      "Hydro": 0.4622,
+      "Hydro": 0.4621,
       "Solar": 0.2077,
-      "Wind": 0.1525
+      "Wind": 0.1526
     }
   },
   "HR": {
@@ -4110,18 +4110,18 @@
       "Bioenergy": 0.0708,
       "Hydro": 0.6457,
       "Solar": 0.034,
-      "Wind": 0.2496
+      "Wind": 0.2495
     },
     "2021": {
       "Bioenergy": 0.0687,
-      "Hydro": 0.6666,
+      "Hydro": 0.6665,
       "Solar": 0.0298,
       "Wind": 0.235
     },
     "2022": {
       "Bioenergy": 0.0846,
       "Hydro": 0.5614,
-      "Solar": 0.0515,
+      "Solar": 0.0516,
       "Wind": 0.3024
     },
     "2023": {
@@ -4143,10 +4143,10 @@
       "Wind": 0.3183
     },
     "2026": {
-      "Bioenergy": 0.0576,
-      "Hydro": 0.5889,
-      "Solar": 0.0639,
-      "Wind": 0.2895
+      "Bioenergy": 0.059,
+      "Hydro": 0.5696,
+      "Solar": 0.0742,
+      "Wind": 0.2973
     }
   },
   "HT": {
@@ -4201,13 +4201,13 @@
   },
   "HU": {
     "2019": {
-      "Bioenergy": 0.1794,
+      "Bioenergy": 0.1793,
       "Hydro": 0.3178,
       "Solar": 0.2484,
       "Wind": 0.2544
     },
     "2020": {
-      "Bioenergy": 0.161,
+      "Bioenergy": 0.1609,
       "Hydro": 0.2781,
       "Solar": 0.3364,
       "Wind": 0.2245
@@ -4215,18 +4215,18 @@
     "2021": {
       "Bioenergy": 0.1476,
       "Hydro": 0.2316,
-      "Solar": 0.4304,
+      "Solar": 0.4303,
       "Wind": 0.1905
     },
     "2022": {
-      "Bioenergy": 0.1387,
+      "Bioenergy": 0.1386,
       "Hydro": 0.1869,
       "Solar": 0.4905,
       "Wind": 0.184
     },
     "2023": {
-      "Bioenergy": 0.0846,
-      "Hydro": 0.1679,
+      "Bioenergy": 0.0845,
+      "Hydro": 0.168,
       "Solar": 0.5816,
       "Wind": 0.1659
     },
@@ -4243,10 +4243,10 @@
       "Wind": 0.1027
     },
     "2026": {
-      "Bioenergy": 0.1229,
-      "Hydro": 0.1648,
-      "Solar": 0.5332,
-      "Wind": 0.179
+      "Bioenergy": 0.1237,
+      "Hydro": 0.1521,
+      "Solar": 0.5589,
+      "Wind": 0.1653
     }
   },
   "ID": {
@@ -4294,14 +4294,14 @@
     },
     "2026": {
       "Bioenergy": 0.3547,
-      "Hydro": 0.6187,
+      "Hydro": 0.6189,
       "Solar": 0.0085,
-      "Wind": 0.0182
+      "Wind": 0.0179
     }
   },
   "IE": {
     "2019": {
-      "Bioenergy": 0.009,
+      "Bioenergy": 0.0089,
       "Hydro": 0.1265,
       "Solar": 0.0097,
       "Wind": 0.8549
@@ -4310,7 +4310,7 @@
       "Bioenergy": 0.0081,
       "Hydro": 0.1174,
       "Solar": 0.0102,
-      "Wind": 0.8644
+      "Wind": 0.8643
     },
     "2021": {
       "Bioenergy": 0.0088,
@@ -4322,7 +4322,7 @@
       "Bioenergy": 0.007,
       "Hydro": 0.0874,
       "Solar": 0.0119,
-      "Wind": 0.8938
+      "Wind": 0.8937
     },
     "2023": {
       "Bioenergy": 0.008,
@@ -4331,10 +4331,10 @@
       "Wind": 0.8335
     },
     "2024": {
-      "Bioenergy": 0.0394,
-      "Hydro": 0.1117,
-      "Solar": 0.0748,
-      "Wind": 0.7741
+      "Bioenergy": 0.0395,
+      "Hydro": 0.1118,
+      "Solar": 0.0736,
+      "Wind": 0.7751
     },
     "2025": {
       "Bioenergy": 0.0407,
@@ -4343,10 +4343,10 @@
       "Wind": 0.745
     },
     "2026": {
-      "Bioenergy": 0.037,
-      "Hydro": 0.1232,
-      "Solar": 0.048,
-      "Wind": 0.7918
+      "Bioenergy": 0.0362,
+      "Hydro": 0.1174,
+      "Solar": 0.0716,
+      "Wind": 0.7748
     }
   },
   "IL": {
@@ -4443,10 +4443,10 @@
       "Wind": 0.2074
     },
     "2026": {
-      "Bioenergy": 0.0536,
-      "Hydro": 0.222,
-      "Solar": 0.5638,
-      "Wind": 0.1606
+      "Bioenergy": 0.0427,
+      "Hydro": 0.2357,
+      "Solar": 0.5714,
+      "Wind": 0.1503
     }
   },
   "IQ": {
@@ -4643,10 +4643,10 @@
       "Wind": 0.1952
     },
     "2026": {
-      "Bioenergy": 0.1291,
-      "Hydro": 0.2683,
-      "Solar": 0.3172,
-      "Wind": 0.2854
+      "Bioenergy": 0.1135,
+      "Hydro": 0.3109,
+      "Solar": 0.3196,
+      "Wind": 0.256
     }
   },
   "JM": {
@@ -4793,10 +4793,10 @@
       "Wind": 0.0518
     },
     "2026": {
-      "Bioenergy": 0.334,
-      "Hydro": 0.2139,
-      "Solar": 0.3683,
-      "Wind": 0.0838
+      "Bioenergy": 0.3245,
+      "Hydro": 0.2169,
+      "Solar": 0.3737,
+      "Wind": 0.085
     }
   },
   "KE": {
@@ -4843,10 +4843,10 @@
       "Wind": 0.3025
     },
     "2026": {
-      "Bioenergy": 0.0696,
-      "Hydro": 0.4933,
-      "Solar": 0.0885,
-      "Wind": 0.3486
+      "Bioenergy": 0.0798,
+      "Hydro": 0.5376,
+      "Solar": 0.0868,
+      "Wind": 0.2959
     }
   },
   "KG": {
@@ -4870,47 +4870,47 @@
     },
     "2022": {
       "Bioenergy": 0.0021,
-      "Hydro": 0.986,
+      "Hydro": 0.9859,
       "Solar": 0.005,
       "Wind": 0.007
     },
     "2023": {
       "Bioenergy": 0.002,
-      "Hydro": 0.9874,
+      "Hydro": 0.9873,
       "Solar": 0.0045,
       "Wind": 0.0062
     },
     "2024": {
-      "Bioenergy": 0.0023,
-      "Hydro": 0.9817,
-      "Solar": 0.0079,
-      "Wind": 0.008
+      "Bioenergy": 0.004,
+      "Hydro": 0.9691,
+      "Solar": 0.0131,
+      "Wind": 0.0138
     },
     "2025": {
-      "Bioenergy": 0.0018,
-      "Hydro": 0.9823,
-      "Solar": 0.0088,
-      "Wind": 0.0071
+      "Bioenergy": 0.0039,
+      "Hydro": 0.9617,
+      "Solar": 0.0191,
+      "Wind": 0.0153
     },
     "2026": {
-      "Bioenergy": 0.002,
-      "Hydro": 0.981,
-      "Solar": 0.009,
-      "Wind": 0.0079
+      "Bioenergy": 0,
+      "Hydro": 1,
+      "Solar": 0,
+      "Wind": 0
     }
   },
   "KH": {
     "2019": {
       "Bioenergy": 0.0281,
       "Hydro": 0.9092,
-      "Solar": 0.0372,
+      "Solar": 0.0373,
       "Wind": 0.0255
     },
     "2020": {
       "Bioenergy": 0.0289,
       "Hydro": 0.9028,
       "Solar": 0.0404,
-      "Wind": 0.0279
+      "Wind": 0.0278
     },
     "2021": {
       "Bioenergy": 0.03,
@@ -4925,28 +4925,28 @@
       "Wind": 0.0383
     },
     "2023": {
-      "Bioenergy": 0.0312,
-      "Hydro": 0.8712,
+      "Bioenergy": 0.0311,
+      "Hydro": 0.8713,
       "Solar": 0.0552,
       "Wind": 0.0424
     },
     "2024": {
-      "Bioenergy": 0.0303,
-      "Hydro": 0.8618,
+      "Bioenergy": 0.0304,
+      "Hydro": 0.8617,
       "Solar": 0.064,
       "Wind": 0.0439
     },
     "2025": {
-      "Bioenergy": 0.0296,
+      "Bioenergy": 0.0295,
       "Hydro": 0.8461,
-      "Solar": 0.0765,
+      "Solar": 0.0766,
       "Wind": 0.0478
     },
     "2026": {
-      "Bioenergy": 0.0313,
-      "Hydro": 0.8358,
-      "Solar": 0.0789,
-      "Wind": 0.054
+      "Bioenergy": 0.0306,
+      "Hydro": 0.839,
+      "Solar": 0.0796,
+      "Wind": 0.0508
     }
   },
   "KI": {
@@ -5193,10 +5193,10 @@
       "Wind": 0.064
     },
     "2026": {
-      "Bioenergy": 0.2155,
-      "Hydro": 0.0433,
-      "Solar": 0.6456,
-      "Wind": 0.0957
+      "Bioenergy": 0.1937,
+      "Hydro": 0.0417,
+      "Solar": 0.6934,
+      "Wind": 0.0712
     }
   },
   "KW": {
@@ -5654,13 +5654,13 @@
       "Bioenergy": 0.1292,
       "Hydro": 0.3687,
       "Solar": 0.0689,
-      "Wind": 0.4333
+      "Wind": 0.4332
     },
     "2020": {
       "Bioenergy": 0.1267,
-      "Hydro": 0.3374,
-      "Solar": 0.0716,
-      "Wind": 0.4643
+      "Hydro": 0.3375,
+      "Solar": 0.0717,
+      "Wind": 0.4642
     },
     "2021": {
       "Bioenergy": 0.13,
@@ -5669,21 +5669,21 @@
       "Wind": 0.4169
     },
     "2022": {
-      "Bioenergy": 0.1124,
+      "Bioenergy": 0.1123,
       "Hydro": 0.3107,
       "Solar": 0.1404,
-      "Wind": 0.4366
+      "Wind": 0.4365
     },
     "2023": {
       "Bioenergy": 0.0721,
-      "Hydro": 0.2524,
+      "Hydro": 0.2525,
       "Solar": 0.1683,
       "Wind": 0.5071
     },
     "2024": {
       "Bioenergy": 0.0513,
       "Hydro": 0.1846,
-      "Solar": 0.2359,
+      "Solar": 0.236,
       "Wind": 0.5281
     },
     "2025": {
@@ -5693,27 +5693,27 @@
       "Wind": 0.5861
     },
     "2026": {
-      "Bioenergy": 0.0325,
-      "Hydro": 0.1284,
-      "Solar": 0.1612,
-      "Wind": 0.6779
+      "Bioenergy": 0.0298,
+      "Hydro": 0.1098,
+      "Solar": 0.1654,
+      "Wind": 0.695
     }
   },
   "LU": {
     "2019": {
       "Bioenergy": 0.1488,
       "Hydro": 0.388,
-      "Solar": 0.1302,
-      "Wind": 0.333
+      "Solar": 0.1303,
+      "Wind": 0.3329
     },
     "2020": {
-      "Bioenergy": 0.1645,
-      "Hydro": 0.3506,
-      "Solar": 0.1319,
-      "Wind": 0.353
+      "Bioenergy": 0.1644,
+      "Hydro": 0.3507,
+      "Solar": 0.132,
+      "Wind": 0.3529
     },
     "2021": {
-      "Bioenergy": 0.1846,
+      "Bioenergy": 0.1845,
       "Hydro": 0.3445,
       "Solar": 0.1525,
       "Wind": 0.3185
@@ -5722,19 +5722,19 @@
       "Bioenergy": 0.187,
       "Hydro": 0.2889,
       "Solar": 0.196,
-      "Wind": 0.3282
+      "Wind": 0.3281
     },
     "2023": {
-      "Bioenergy": 0.1102,
-      "Hydro": 0.2888,
+      "Bioenergy": 0.1101,
+      "Hydro": 0.2889,
       "Solar": 0.2006,
       "Wind": 0.4004
     },
     "2024": {
       "Bioenergy": 0.1377,
       "Hydro": 0.2933,
-      "Solar": 0.2196,
-      "Wind": 0.3494
+      "Solar": 0.2197,
+      "Wind": 0.3493
     },
     "2025": {
       "Bioenergy": 0.1295,
@@ -5743,10 +5743,10 @@
       "Wind": 0.3486
     },
     "2026": {
-      "Bioenergy": 0.0982,
-      "Hydro": 0.2822,
-      "Solar": 0.1917,
-      "Wind": 0.4278
+      "Bioenergy": 0.0971,
+      "Hydro": 0.2746,
+      "Solar": 0.2224,
+      "Wind": 0.406
     }
   },
   "LV": {
@@ -5782,7 +5782,7 @@
     },
     "2024": {
       "Bioenergy": 0.0896,
-      "Hydro": 0.679,
+      "Hydro": 0.6789,
       "Solar": 0.1239,
       "Wind": 0.1075
     },
@@ -5793,10 +5793,10 @@
       "Wind": 0.0794
     },
     "2026": {
-      "Bioenergy": 0.0771,
-      "Hydro": 0.7833,
-      "Solar": 0.0991,
-      "Wind": 0.0404
+      "Bioenergy": 0.0733,
+      "Hydro": 0.7611,
+      "Solar": 0.1124,
+      "Wind": 0.0533
     }
   },
   "LY": {
@@ -5852,51 +5852,51 @@
   "MA": {
     "2019": {
       "Bioenergy": 0,
-      "Hydro": 0.2127,
-      "Solar": 0.2025,
-      "Wind": 0.5848
+      "Hydro": 0.2113,
+      "Solar": 0.2037,
+      "Wind": 0.5851
     },
     "2020": {
-      "Bioenergy": 0.0001,
-      "Hydro": 0.1829,
-      "Solar": 0.2052,
-      "Wind": 0.6117
+      "Bioenergy": 0,
+      "Hydro": 0.1776,
+      "Solar": 0.2063,
+      "Wind": 0.6161
     },
     "2021": {
-      "Bioenergy": 0.0001,
-      "Hydro": 0.1501,
-      "Solar": 0.2216,
-      "Wind": 0.6282
+      "Bioenergy": 0,
+      "Hydro": 0.1481,
+      "Solar": 0.2221,
+      "Wind": 0.6298
     },
     "2022": {
-      "Bioenergy": 0.0007,
-      "Hydro": 0.1198,
-      "Solar": 0.1932,
-      "Wind": 0.6864
+      "Bioenergy": 0,
+      "Hydro": 0.0922,
+      "Solar": 0.1982,
+      "Wind": 0.7096
     },
     "2023": {
-      "Bioenergy": 0.0007,
-      "Hydro": 0.0868,
-      "Solar": 0.229,
-      "Wind": 0.6836
+      "Bioenergy": 0,
+      "Hydro": 0.058,
+      "Solar": 0.2355,
+      "Wind": 0.7065
     },
     "2024": {
-      "Bioenergy": 0.0007,
-      "Hydro": 0.0908,
-      "Solar": 0.138,
-      "Wind": 0.7704
+      "Bioenergy": 0,
+      "Hydro": 0.0589,
+      "Solar": 0.1412,
+      "Wind": 0.7999
     },
     "2025": {
-      "Bioenergy": 0.001,
-      "Hydro": 0.1106,
-      "Solar": 0.148,
-      "Wind": 0.7405
+      "Bioenergy": 0,
+      "Hydro": 0.0689,
+      "Solar": 0.157,
+      "Wind": 0.7742
     },
     "2026": {
-      "Bioenergy": 0.0011,
-      "Hydro": 0.1055,
-      "Solar": 0.1603,
-      "Wind": 0.7332
+      "Bioenergy": 0,
+      "Hydro": 0.0685,
+      "Solar": 0.1509,
+      "Wind": 0.7806
     }
   },
   "MD": {
@@ -5908,8 +5908,8 @@
     },
     "2020": {
       "Bioenergy": 0.0131,
-      "Hydro": 0.9175,
-      "Solar": 0.0098,
+      "Hydro": 0.9174,
+      "Solar": 0.0099,
       "Wind": 0.0596
     },
     "2021": {
@@ -5920,8 +5920,8 @@
     },
     "2022": {
       "Bioenergy": 0.0474,
-      "Hydro": 0.698,
-      "Solar": 0.0777,
+      "Hydro": 0.6979,
+      "Solar": 0.0778,
       "Wind": 0.1769
     },
     "2023": {
@@ -5943,23 +5943,23 @@
       "Wind": 0.0372
     },
     "2026": {
-      "Bioenergy": 0.0085,
-      "Hydro": 0.6357,
-      "Solar": 0.3127,
-      "Wind": 0.0431
+      "Bioenergy": 0.0086,
+      "Hydro": 0.634,
+      "Solar": 0.3151,
+      "Wind": 0.0423
     }
   },
   "ME": {
     "2019": {
       "Bioenergy": 0.0142,
-      "Hydro": 0.7941,
+      "Hydro": 0.794,
       "Solar": 0.0196,
       "Wind": 0.1722
     },
     "2020": {
       "Bioenergy": 0.0143,
       "Hydro": 0.7525,
-      "Solar": 0.0174,
+      "Solar": 0.0175,
       "Wind": 0.2158
     },
     "2021": {
@@ -5970,7 +5970,7 @@
     },
     "2022": {
       "Bioenergy": 0.0017,
-      "Hydro": 0.7949,
+      "Hydro": 0.7948,
       "Solar": 0.0025,
       "Wind": 0.201
     },
@@ -5982,8 +5982,8 @@
     },
     "2024": {
       "Bioenergy": 0.0068,
-      "Hydro": 0.7692,
-      "Solar": 0.0608,
+      "Hydro": 0.7691,
+      "Solar": 0.0609,
       "Wind": 0.1632
     },
     "2025": {
@@ -5993,10 +5993,10 @@
       "Wind": 0.2137
     },
     "2026": {
-      "Bioenergy": 0,
-      "Hydro": 0.9002,
-      "Solar": 0,
-      "Wind": 0.0998
+      "Bioenergy": 0.0022,
+      "Hydro": 0.8352,
+      "Solar": 0.0378,
+      "Wind": 0.1249
     }
   },
   "MG": {
@@ -6052,26 +6052,26 @@
   "MK": {
     "2019": {
       "Bioenergy": 0.0676,
-      "Hydro": 0.7703,
+      "Hydro": 0.7702,
       "Solar": 0.0191,
       "Wind": 0.1431
     },
     "2020": {
       "Bioenergy": 0.0715,
-      "Hydro": 0.7503,
-      "Solar": 0.0263,
+      "Hydro": 0.7502,
+      "Solar": 0.0264,
       "Wind": 0.1519
     },
     "2021": {
       "Bioenergy": 0.0647,
-      "Hydro": 0.7683,
+      "Hydro": 0.7682,
       "Solar": 0.0305,
       "Wind": 0.1365
     },
     "2022": {
       "Bioenergy": 0.0421,
       "Hydro": 0.7824,
-      "Solar": 0.0424,
+      "Solar": 0.0425,
       "Wind": 0.133
     },
     "2023": {
@@ -6082,7 +6082,7 @@
     },
     "2024": {
       "Bioenergy": 0.0541,
-      "Hydro": 0.6824,
+      "Hydro": 0.6823,
       "Solar": 0.1422,
       "Wind": 0.1214
     },
@@ -6093,10 +6093,10 @@
       "Wind": 0.1506
     },
     "2026": {
-      "Bioenergy": 0.0184,
-      "Hydro": 0.458,
-      "Solar": 0.3593,
-      "Wind": 0.1643
+      "Bioenergy": 0.0186,
+      "Hydro": 0.4557,
+      "Solar": 0.3641,
+      "Wind": 0.1616
     }
   },
   "ML": {
@@ -6251,52 +6251,52 @@
   },
   "MO": {
     "2019": {
-      "Bioenergy": 0.2216,
-      "Hydro": 0.5148,
+      "Bioenergy": 0.2214,
+      "Hydro": 0.515,
       "Solar": 0.112,
-      "Wind": 0.1516
+      "Wind": 0.1515
     },
     "2020": {
-      "Bioenergy": 0.2165,
-      "Hydro": 0.499,
+      "Bioenergy": 0.2164,
+      "Hydro": 0.4991,
       "Solar": 0.126,
       "Wind": 0.1585
     },
     "2021": {
       "Bioenergy": 0.2171,
-      "Hydro": 0.4477,
+      "Hydro": 0.4478,
       "Solar": 0.1421,
-      "Wind": 0.1931
+      "Wind": 0.193
     },
     "2022": {
       "Bioenergy": 0.2107,
-      "Hydro": 0.422,
+      "Hydro": 0.4221,
       "Solar": 0.1641,
       "Wind": 0.2032
     },
     "2023": {
-      "Bioenergy": 0.2105,
-      "Hydro": 0.3716,
-      "Solar": 0.1956,
-      "Wind": 0.2223
+      "Bioenergy": 0.2101,
+      "Hydro": 0.3719,
+      "Solar": 0.1957,
+      "Wind": 0.2224
     },
     "2024": {
-      "Bioenergy": 0.1937,
+      "Bioenergy": 0.1943,
       "Hydro": 0.3589,
-      "Solar": 0.2295,
-      "Wind": 0.2178
+      "Solar": 0.2293,
+      "Wind": 0.2175
     },
     "2025": {
-      "Bioenergy": 0.1766,
-      "Hydro": 0.3291,
-      "Solar": 0.2735,
-      "Wind": 0.2208
+      "Bioenergy": 0.1764,
+      "Hydro": 0.329,
+      "Solar": 0.2736,
+      "Wind": 0.2209
     },
     "2026": {
-      "Bioenergy": 0.1934,
-      "Hydro": 0.2499,
-      "Solar": 0.2961,
-      "Wind": 0.2606
+      "Bioenergy": 0.1914,
+      "Hydro": 0.261,
+      "Solar": 0.3012,
+      "Wind": 0.2465
     }
   },
   "MQ": {
@@ -6451,19 +6451,19 @@
   },
   "MT": {
     "2019": {
-      "Bioenergy": 0.0874,
-      "Hydro": 0.5244,
+      "Bioenergy": 0.0873,
+      "Hydro": 0.5245,
       "Solar": 0.1019,
       "Wind": 0.2863
     },
     "2020": {
       "Bioenergy": 0.0848,
       "Hydro": 0.5133,
-      "Solar": 0.1022,
-      "Wind": 0.2997
+      "Solar": 0.1023,
+      "Wind": 0.2996
     },
     "2021": {
-      "Bioenergy": 0.09,
+      "Bioenergy": 0.0899,
       "Hydro": 0.4985,
       "Solar": 0.1113,
       "Wind": 0.3002
@@ -6493,10 +6493,10 @@
       "Wind": 0.1372
     },
     "2026": {
-      "Bioenergy": 0.0442,
-      "Hydro": 0.2508,
-      "Solar": 0.4806,
-      "Wind": 0.2244
+      "Bioenergy": 0.0332,
+      "Hydro": 0.1874,
+      "Solar": 0.6166,
+      "Wind": 0.1628
     }
   },
   "MU": {
@@ -6693,10 +6693,10 @@
       "Wind": 0.3092
     },
     "2026": {
-      "Bioenergy": 0.0021,
-      "Hydro": 0.3654,
-      "Solar": 0.239,
-      "Wind": 0.3935
+      "Bioenergy": 0.0025,
+      "Hydro": 0.374,
+      "Solar": 0.2645,
+      "Wind": 0.359
     }
   },
   "MY": {
@@ -7043,10 +7043,10 @@
       "Wind": 0.3668
     },
     "2026": {
-      "Bioenergy": 0.4033,
-      "Hydro": 0.2022,
-      "Solar": 0.0335,
-      "Wind": 0.3611
+      "Bioenergy": 0.4034,
+      "Hydro": 0.2015,
+      "Solar": 0.0333,
+      "Wind": 0.3618
     }
   },
   "NL": {
@@ -7093,10 +7093,10 @@
       "Wind": 0.4685
     },
     "2026": {
-      "Bioenergy": 0.1136,
+      "Bioenergy": 0.1047,
       "Hydro": 0.0017,
-      "Solar": 0.3119,
-      "Wind": 0.5728
+      "Solar": 0.3474,
+      "Wind": 0.5461
     }
   },
   "NO": {
@@ -7143,15 +7143,15 @@
       "Wind": 0.0873
     },
     "2026": {
-      "Bioenergy": 0.0011,
-      "Hydro": 0.882,
-      "Solar": 0.0028,
-      "Wind": 0.1141
+      "Bioenergy": 0.0014,
+      "Hydro": 0.8781,
+      "Solar": 0.0043,
+      "Wind": 0.1162
     }
   },
   "NP": {
     "2019": {
-      "Bioenergy": 0.0039,
+      "Bioenergy": 0.0038,
       "Hydro": 0.9647,
       "Solar": 0.0198,
       "Wind": 0.0117
@@ -7166,7 +7166,7 @@
       "Bioenergy": 0.0048,
       "Hydro": 0.9573,
       "Solar": 0.0225,
-      "Wind": 0.0155
+      "Wind": 0.0154
     },
     "2022": {
       "Bioenergy": 0.0052,
@@ -7175,28 +7175,28 @@
       "Wind": 0.017
     },
     "2023": {
-      "Bioenergy": 0.0054,
+      "Bioenergy": 0.0053,
       "Hydro": 0.9488,
       "Solar": 0.0272,
       "Wind": 0.0186
     },
     "2024": {
-      "Bioenergy": 0.0051,
-      "Hydro": 0.9445,
+      "Bioenergy": 0.0052,
+      "Hydro": 0.9444,
       "Solar": 0.031,
       "Wind": 0.0194
     },
     "2025": {
-      "Bioenergy": 0.0051,
-      "Hydro": 0.9373,
+      "Bioenergy": 0.005,
+      "Hydro": 0.9374,
       "Solar": 0.0364,
       "Wind": 0.0212
     },
     "2026": {
-      "Bioenergy": 0.0056,
-      "Hydro": 0.9336,
-      "Solar": 0.0372,
-      "Wind": 0.0236
+      "Bioenergy": 0.0054,
+      "Hydro": 0.935,
+      "Solar": 0.0374,
+      "Wind": 0.0223
     }
   },
   "NR": {
@@ -7343,10 +7343,10 @@
       "Wind": 0.1373
     },
     "2026": {
-      "Bioenergy": 0.0045,
-      "Hydro": 0.8687,
+      "Bioenergy": 0.0046,
+      "Hydro": 0.8617,
       "Solar": 0,
-      "Wind": 0.1268
+      "Wind": 0.1337
     }
   },
   "OM": {
@@ -7493,10 +7493,10 @@
       "Wind": 0.1003
     },
     "2026": {
-      "Bioenergy": 0.0152,
-      "Hydro": 0.8455,
-      "Solar": 0.0641,
-      "Wind": 0.0753
+      "Bioenergy": 0.0133,
+      "Hydro": 0.8476,
+      "Solar": 0.0626,
+      "Wind": 0.0765
     }
   },
   "PF": {
@@ -7688,28 +7688,28 @@
     },
     "2025": {
       "Bioenergy": 0.0081,
-      "Hydro": 0.4909,
-      "Solar": 0.4509,
+      "Hydro": 0.4908,
+      "Solar": 0.451,
       "Wind": 0.0501
     },
     "2026": {
-      "Bioenergy": 0.0194,
-      "Hydro": 0.2971,
-      "Solar": 0.6525,
-      "Wind": 0.031
+      "Bioenergy": 0.0209,
+      "Hydro": 0.1493,
+      "Solar": 0.7795,
+      "Wind": 0.0503
     }
   },
   "PL": {
     "2019": {
       "Bioenergy": 0.1057,
       "Hydro": 0.1471,
-      "Solar": 0.0477,
-      "Wind": 0.6995
+      "Solar": 0.0478,
+      "Wind": 0.6994
     },
     "2020": {
       "Bioenergy": 0.0962,
       "Hydro": 0.1562,
-      "Solar": 0.1029,
+      "Solar": 0.103,
       "Wind": 0.6446
     },
     "2021": {
@@ -7743,10 +7743,10 @@
       "Wind": 0.4835
     },
     "2026": {
-      "Bioenergy": 0.0618,
-      "Hydro": 0.0428,
-      "Solar": 0.3886,
-      "Wind": 0.5068
+      "Bioenergy": 0.0606,
+      "Hydro": 0.0387,
+      "Solar": 0.4061,
+      "Wind": 0.4947
     }
   },
   "PM": {
@@ -7827,14 +7827,14 @@
     "2023": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.7188,
-      "Wind": 0.2812
+      "Solar": 0.7271,
+      "Wind": 0.2729
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 0.5591,
-      "Wind": 0.4409
+      "Hydro": 0.093,
+      "Solar": 0.5585,
+      "Wind": 0.3484
     },
     "2025": {
       "Bioenergy": 0,
@@ -7845,8 +7845,8 @@
     "2026": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.6667,
-      "Wind": 0.3333
+      "Solar": 0.5555,
+      "Wind": 0.4445
     }
   },
   "PS": {
@@ -7904,7 +7904,7 @@
       "Bioenergy": 0.1097,
       "Hydro": 0.2976,
       "Solar": 0.0575,
-      "Wind": 0.5352
+      "Wind": 0.5353
     },
     "2020": {
       "Bioenergy": 0.1169,
@@ -7913,40 +7913,40 @@
       "Wind": 0.4313
     },
     "2021": {
-      "Bioenergy": 0.1208,
-      "Hydro": 0.3504,
+      "Bioenergy": 0.1207,
+      "Hydro": 0.3505,
       "Solar": 0.0815,
-      "Wind": 0.4474
+      "Wind": 0.4473
     },
     "2022": {
       "Bioenergy": 0.127,
-      "Hydro": 0.242,
-      "Solar": 0.1356,
-      "Wind": 0.4954
+      "Hydro": 0.2421,
+      "Solar": 0.1357,
+      "Wind": 0.4952
     },
     "2023": {
-      "Bioenergy": 0.0908,
+      "Bioenergy": 0.0907,
       "Hydro": 0.3327,
       "Solar": 0.1741,
-      "Wind": 0.4025
+      "Wind": 0.4024
     },
     "2024": {
       "Bioenergy": 0.0835,
-      "Hydro": 0.3395,
+      "Hydro": 0.3396,
       "Solar": 0.201,
       "Wind": 0.376
     },
     "2025": {
       "Bioenergy": 0.0746,
       "Hydro": 0.333,
-      "Solar": 0.239,
+      "Solar": 0.2391,
       "Wind": 0.3533
     },
     "2026": {
-      "Bioenergy": 0.063,
-      "Hydro": 0.4184,
-      "Solar": 0.1081,
-      "Wind": 0.4104
+      "Bioenergy": 0.0673,
+      "Hydro": 0.3827,
+      "Solar": 0.1583,
+      "Wind": 0.3917
     }
   },
   "PY": {
@@ -8133,7 +8133,7 @@
     "2024": {
       "Bioenergy": 0.0205,
       "Hydro": 0.559,
-      "Solar": 0.1667,
+      "Solar": 0.1668,
       "Wind": 0.2537
     },
     "2025": {
@@ -8143,10 +8143,10 @@
       "Wind": 0.2488
     },
     "2026": {
-      "Bioenergy": 0.0202,
-      "Hydro": 0.5881,
-      "Solar": 0.1095,
-      "Wind": 0.2822
+      "Bioenergy": 0.019,
+      "Hydro": 0.5936,
+      "Solar": 0.1121,
+      "Wind": 0.2754
     }
   },
   "RS": {
@@ -8193,10 +8193,10 @@
       "Wind": 0.1477
     },
     "2026": {
-      "Bioenergy": 0.019,
-      "Hydro": 0.8183,
-      "Solar": 0.0006,
-      "Wind": 0.1621
+      "Bioenergy": 0.021,
+      "Hydro": 0.8109,
+      "Solar": 0.0119,
+      "Wind": 0.1562
     }
   },
   "RU": {
@@ -8243,10 +8243,10 @@
       "Wind": 0.0212
     },
     "2026": {
-      "Bioenergy": 0.0055,
-      "Hydro": 0.9622,
-      "Solar": 0.0047,
-      "Wind": 0.0276
+      "Bioenergy": 0.0048,
+      "Hydro": 0.9608,
+      "Solar": 0.0077,
+      "Wind": 0.0267
     }
   },
   "RW": {
@@ -8543,10 +8543,10 @@
       "Wind": 0.3314
     },
     "2026": {
-      "Bioenergy": 0.0765,
-      "Hydro": 0.5699,
-      "Solar": 0.0089,
-      "Wind": 0.3447
+      "Bioenergy": 0.0747,
+      "Hydro": 0.5772,
+      "Solar": 0.019,
+      "Wind": 0.3291
     }
   },
   "SG": {
@@ -8575,7 +8575,7 @@
       "Wind": 0.0131
     },
     "2023": {
-      "Bioenergy": 0.002,
+      "Bioenergy": 0.0019,
       "Hydro": 0.0077,
       "Solar": 0.9843,
       "Wind": 0.0061
@@ -8588,15 +8588,15 @@
     },
     "2025": {
       "Bioenergy": 0.0032,
-      "Hydro": 0.0191,
+      "Hydro": 0.019,
       "Solar": 0.9649,
       "Wind": 0.0128
     },
     "2026": {
-      "Bioenergy": 0.003,
-      "Hydro": 0.0111,
-      "Solar": 0.9743,
-      "Wind": 0.0116
+      "Bioenergy": 0.0025,
+      "Hydro": 0.0103,
+      "Solar": 0.9776,
+      "Wind": 0.0097
     }
   },
   "SH": {
@@ -8693,10 +8693,10 @@
       "Wind": 0.0146
     },
     "2026": {
-      "Bioenergy": 0.0592,
-      "Hydro": 0.6552,
-      "Solar": 0.2626,
-      "Wind": 0.0229
+      "Bioenergy": 0.0587,
+      "Hydro": 0.6211,
+      "Solar": 0.2969,
+      "Wind": 0.0233
     }
   },
   "SK": {
@@ -8743,9 +8743,9 @@
       "Wind": 0
     },
     "2026": {
-      "Bioenergy": 0.1857,
-      "Hydro": 0.7349,
-      "Solar": 0.0794,
+      "Bioenergy": 0.1893,
+      "Hydro": 0.7094,
+      "Solar": 0.1013,
       "Wind": 0
     }
   },
@@ -9093,7 +9093,7 @@
       "Wind": 0.0416
     },
     "2026": {
-      "Bioenergy": 0.001,
+      "Bioenergy": 0.0009,
       "Hydro": 0.6569,
       "Solar": 0.309,
       "Wind": 0.0331
@@ -9351,8 +9351,8 @@
   },
   "TH": {
     "2019": {
-      "Bioenergy": 0.3922,
-      "Hydro": 0.2901,
+      "Bioenergy": 0.3921,
+      "Hydro": 0.2902,
       "Solar": 0.1794,
       "Wind": 0.1383
     },
@@ -9363,40 +9363,40 @@
       "Wind": 0.1403
     },
     "2021": {
-      "Bioenergy": 0.4044,
+      "Bioenergy": 0.4043,
       "Hydro": 0.2576,
       "Solar": 0.1631,
-      "Wind": 0.175
+      "Wind": 0.1749
     },
     "2022": {
       "Bioenergy": 0.3874,
-      "Hydro": 0.2973,
+      "Hydro": 0.2974,
       "Solar": 0.1802,
       "Wind": 0.135
     },
     "2023": {
-      "Bioenergy": 0.3922,
-      "Hydro": 0.2705,
+      "Bioenergy": 0.3921,
+      "Hydro": 0.2706,
       "Solar": 0.1848,
       "Wind": 0.1525
     },
     "2024": {
-      "Bioenergy": 0.3799,
+      "Bioenergy": 0.38,
       "Hydro": 0.2683,
-      "Solar": 0.2031,
-      "Wind": 0.1488
+      "Solar": 0.203,
+      "Wind": 0.1487
     },
     "2025": {
-      "Bioenergy": 0.2494,
+      "Bioenergy": 0.2493,
       "Hydro": 0.2855,
-      "Solar": 0.3169,
+      "Solar": 0.317,
       "Wind": 0.1482
     },
     "2026": {
-      "Bioenergy": 0.2332,
-      "Hydro": 0.2982,
-      "Solar": 0.3371,
-      "Wind": 0.1315
+      "Bioenergy": 0.2157,
+      "Hydro": 0.3013,
+      "Solar": 0.3547,
+      "Wind": 0.1283
     }
   },
   "TJ": {
@@ -9443,10 +9443,10 @@
       "Wind": 0.0007
     },
     "2026": {
-      "Bioenergy": 0.0003,
-      "Hydro": 0.9972,
-      "Solar": 0.0013,
-      "Wind": 0.0012
+      "Bioenergy": 0,
+      "Hydro": 1,
+      "Solar": 0,
+      "Wind": 0
     }
   },
   "TL": {
@@ -9793,10 +9793,10 @@
       "Wind": 0.3597
     },
     "2026": {
-      "Bioenergy": 0.0079,
-      "Hydro": 0.083,
-      "Solar": 0.4167,
-      "Wind": 0.4923
+      "Bioenergy": 0.0088,
+      "Hydro": 0.0771,
+      "Solar": 0.4387,
+      "Wind": 0.4753
     }
   },
   "TZ": {
@@ -9971,32 +9971,32 @@
     "2022": {
       "Bioenergy": 0.055,
       "Hydro": 0.267,
-      "Solar": 0.2174,
+      "Solar": 0.2175,
       "Wind": 0.4605
     },
     "2023": {
-      "Bioenergy": 0.0502,
-      "Hydro": 0.2488,
-      "Solar": 0.2516,
-      "Wind": 0.4495
+      "Bioenergy": 0.0498,
+      "Hydro": 0.2538,
+      "Solar": 0.252,
+      "Wind": 0.4444
     },
     "2024": {
-      "Bioenergy": 0.0447,
-      "Hydro": 0.2265,
-      "Solar": 0.2911,
-      "Wind": 0.4378
+      "Bioenergy": 0.0446,
+      "Hydro": 0.2288,
+      "Solar": 0.2921,
+      "Wind": 0.4345
     },
     "2025": {
-      "Bioenergy": 0.0405,
-      "Hydro": 0.2116,
-      "Solar": 0.3402,
-      "Wind": 0.4077
+      "Bioenergy": 0.0404,
+      "Hydro": 0.2126,
+      "Solar": 0.3404,
+      "Wind": 0.4066
     },
     "2026": {
-      "Bioenergy": 0.0352,
-      "Hydro": 0.2322,
-      "Solar": 0.2927,
-      "Wind": 0.4399
+      "Bioenergy": 0.0347,
+      "Hydro": 0.2316,
+      "Solar": 0.3005,
+      "Wind": 0.4333
     }
   },
   "UY": {
@@ -10043,10 +10043,10 @@
       "Wind": 0.344
     },
     "2026": {
-      "Bioenergy": 0.1656,
-      "Hydro": 0.3934,
-      "Solar": 0.0521,
-      "Wind": 0.3889
+      "Bioenergy": 0.165,
+      "Hydro": 0.4138,
+      "Solar": 0.049,
+      "Wind": 0.3722
     }
   },
   "UZ": {
@@ -10081,22 +10081,22 @@
       "Wind": 0.0134
     },
     "2024": {
-      "Bioenergy": 0.004,
+      "Bioenergy": 0.0041,
       "Hydro": 0.9653,
       "Solar": 0.0166,
       "Wind": 0.014
     },
     "2025": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.9596,
+      "Bioenergy": 0.0039,
+      "Hydro": 0.9597,
       "Solar": 0.021,
       "Wind": 0.0154
     },
     "2026": {
-      "Bioenergy": 0.0044,
-      "Hydro": 0.9568,
-      "Solar": 0.0215,
-      "Wind": 0.0173
+      "Bioenergy": 0.0042,
+      "Hydro": 0.9579,
+      "Solar": 0.0217,
+      "Wind": 0.0162
     }
   },
   "VC": {
@@ -10471,8 +10471,8 @@
     "2022": {
       "Bioenergy": 0.0226,
       "Hydro": 0.405,
-      "Solar": 0.0155,
-      "Wind": 0.5569
+      "Solar": 0.0156,
+      "Wind": 0.5568
     },
     "2023": {
       "Bioenergy": 0.0235,
@@ -10484,7 +10484,7 @@
       "Bioenergy": 0.0281,
       "Hydro": 0.3913,
       "Solar": 0.0433,
-      "Wind": 0.5374
+      "Wind": 0.5373
     },
     "2025": {
       "Bioenergy": 0.035,
@@ -10493,10 +10493,10 @@
       "Wind": 0.4201
     },
     "2026": {
-      "Bioenergy": 0.0341,
-      "Hydro": 0.455,
-      "Solar": 0.0762,
-      "Wind": 0.4347
+      "Bioenergy": 0.0342,
+      "Hydro": 0.4508,
+      "Solar": 0.0888,
+      "Wind": 0.4262
     }
   },
   "YE": {