@digital4better/data 1.3.22 → 1.3.24

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

@@ -81,10 +81,10 @@
       "Wind": 0.1331
     },
     "2025": {
-      "Bioenergy": 0.0351,
-      "Hydro": 0.6323,
-      "Solar": 0.1975,
-      "Wind": 0.1351
+      "Bioenergy": 0.0345,
+      "Hydro": 0.6376,
+      "Solar": 0.1955,
+      "Wind": 0.1324
     }
   },
   "AG": {
@@ -134,15 +134,15 @@
   "AL": {
     "2019": {
       "Bioenergy": 0.0112,
-      "Hydro": 0.9358,
+      "Hydro": 0.9357,
       "Solar": 0.0159,
       "Wind": 0.0371
     },
     "2020": {
-      "Bioenergy": 0.0116,
-      "Hydro": 0.9278,
+      "Bioenergy": 0.0117,
+      "Hydro": 0.9277,
       "Solar": 0.0185,
-      "Wind": 0.042
+      "Wind": 0.0421
     },
     "2021": {
       "Bioenergy": 0.012,
@@ -164,15 +164,15 @@
     },
     "2024": {
       "Bioenergy": 0.0109,
-      "Hydro": 0.9062,
+      "Hydro": 0.9063,
       "Solar": 0.0331,
       "Wind": 0.0498
     },
     "2025": {
       "Bioenergy": 0.0107,
-      "Hydro": 0.8981,
-      "Solar": 0.0452,
-      "Wind": 0.0461
+      "Hydro": 0.898,
+      "Solar": 0.0438,
+      "Wind": 0.0475
     }
   },
   "AM": {
@@ -213,10 +213,10 @@
       "Wind": 0.0045
     },
     "2025": {
-      "Bioenergy": 0.0012,
-      "Hydro": 0.7623,
-      "Solar": 0.2324,
-      "Wind": 0.0041
+      "Bioenergy": 0.0013,
+      "Hydro": 0.7613,
+      "Solar": 0.2329,
+      "Wind": 0.0045
     }
   },
   "AO": {
@@ -301,10 +301,10 @@
       "Wind": 0.2828
     },
     "2025": {
-      "Bioenergy": 0.0283,
-      "Hydro": 0.5643,
-      "Solar": 0.0837,
-      "Wind": 0.3237
+      "Bioenergy": 0.0277,
+      "Hydro": 0.5641,
+      "Solar": 0.0864,
+      "Wind": 0.3219
     }
   },
   "AS": {
@@ -367,8 +367,8 @@
     "2021": {
       "Bioenergy": 0.0331,
       "Hydro": 0.765,
-      "Solar": 0.0506,
-      "Wind": 0.1512
+      "Solar": 0.0507,
+      "Wind": 0.1513
     },
     "2022": {
       "Bioenergy": 0.0538,
@@ -389,10 +389,10 @@
       "Wind": 0.1511
     },
     "2025": {
-      "Bioenergy": 0.0321,
-      "Hydro": 0.6383,
-      "Solar": 0.1869,
-      "Wind": 0.1427
+      "Bioenergy": 0.0312,
+      "Hydro": 0.6484,
+      "Solar": 0.1831,
+      "Wind": 0.1374
     }
   },
   "AU": {
@@ -433,10 +433,10 @@
       "Wind": 0.3444
     },
     "2025": {
-      "Bioenergy": 0.0041,
-      "Hydro": 0.1322,
-      "Solar": 0.4806,
-      "Wind": 0.3831
+      "Bioenergy": 0.0046,
+      "Hydro": 0.1303,
+      "Solar": 0.4863,
+      "Wind": 0.3788
     }
   },
   "AW": {
@@ -522,8 +522,8 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9629,
-      "Solar": 0.0371,
+      "Hydro": 0.9671,
+      "Solar": 0.0329,
       "Wind": 0
     }
   },
@@ -566,9 +566,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.8325,
-      "Solar": 0.131,
-      "Wind": 0.0365
+      "Hydro": 0.829,
+      "Solar": 0.1317,
+      "Wind": 0.0393
     }
   },
   "BB": {
@@ -648,15 +648,15 @@
     },
     "2024": {
       "Bioenergy": 0.0502,
-      "Hydro": 0.4308,
+      "Hydro": 0.4307,
       "Solar": 0.3423,
-      "Wind": 0.1767
+      "Wind": 0.1768
     },
     "2025": {
-      "Bioenergy": 0.0454,
-      "Hydro": 0.3731,
-      "Solar": 0.4067,
-      "Wind": 0.1748
+      "Bioenergy": 0.0439,
+      "Hydro": 0.3905,
+      "Solar": 0.3973,
+      "Wind": 0.1683
     }
   },
   "BE": {
@@ -688,19 +688,19 @@
       "Bioenergy": 0.0431,
       "Hydro": 0.0393,
       "Solar": 0.3079,
-      "Wind": 0.6096
+      "Wind": 0.6097
     },
     "2024": {
       "Bioenergy": 0.0374,
-      "Hydro": 0.0802,
+      "Hydro": 0.0803,
       "Solar": 0.3398,
-      "Wind": 0.5426
+      "Wind": 0.5425
     },
     "2025": {
-      "Bioenergy": 0.0402,
-      "Hydro": 0.0784,
-      "Solar": 0.4636,
-      "Wind": 0.4177
+      "Bioenergy": 0.0427,
+      "Hydro": 0.0813,
+      "Solar": 0.4479,
+      "Wind": 0.4282
     }
   },
   "BF": {
@@ -774,7 +774,7 @@
     },
     "2023": {
       "Bioenergy": 0.0234,
-      "Hydro": 0.3932,
+      "Hydro": 0.3931,
       "Solar": 0.3897,
       "Wind": 0.1937
     },
@@ -785,10 +785,10 @@
       "Wind": 0.1609
     },
     "2025": {
-      "Bioenergy": 0.0111,
-      "Hydro": 0.2366,
-      "Solar": 0.6455,
-      "Wind": 0.1068
+      "Bioenergy": 0.0114,
+      "Hydro": 0.2343,
+      "Solar": 0.6429,
+      "Wind": 0.1114
     }
   },
   "BH": {
@@ -1049,10 +1049,10 @@
       "Wind": 0.1289
     },
     "2025": {
-      "Bioenergy": 0.025,
-      "Hydro": 0.8281,
-      "Solar": 0.0813,
-      "Wind": 0.0656
+      "Bioenergy": 0.0343,
+      "Hydro": 0.8143,
+      "Solar": 0.0828,
+      "Wind": 0.0685
     }
   },
   "BR": {
@@ -1093,10 +1093,10 @@
       "Wind": 0.1724
     },
     "2025": {
-      "Bioenergy": 0.012,
-      "Hydro": 0.6648,
-      "Solar": 0.1394,
-      "Wind": 0.1838
+      "Bioenergy": 0.0114,
+      "Hydro": 0.6571,
+      "Solar": 0.1426,
+      "Wind": 0.1889
     }
   },
   "BS": {
@@ -1234,19 +1234,19 @@
   "BY": {
     "2019": {
       "Bioenergy": 0.1403,
-      "Hydro": 0.4247,
+      "Hydro": 0.4246,
       "Solar": 0.2242,
       "Wind": 0.2108
     },
     "2020": {
       "Bioenergy": 0.2286,
-      "Hydro": 0.4048,
-      "Solar": 0.1519,
+      "Hydro": 0.4047,
+      "Solar": 0.152,
       "Wind": 0.2147
     },
     "2021": {
       "Bioenergy": 0.2408,
-      "Hydro": 0.4052,
+      "Hydro": 0.4051,
       "Solar": 0.1865,
       "Wind": 0.1675
     },
@@ -1269,10 +1269,10 @@
       "Wind": 0.1512
     },
     "2025": {
-      "Bioenergy": 0.3747,
-      "Hydro": 0.3434,
-      "Solar": 0.1433,
-      "Wind": 0.1386
+      "Bioenergy": 0.3725,
+      "Hydro": 0.3445,
+      "Solar": 0.1466,
+      "Wind": 0.1364
     }
   },
   "BZ": {
@@ -1313,10 +1313,10 @@
       "Wind": 0.0539
     },
     "2025": {
-      "Bioenergy": 0.2224,
-      "Hydro": 0.662,
-      "Solar": 0.0589,
-      "Wind": 0.0567
+      "Bioenergy": 0.222,
+      "Hydro": 0.6604,
+      "Solar": 0.0597,
+      "Wind": 0.0578
     }
   },
   "CA": {
@@ -1357,10 +1357,10 @@
       "Wind": 0.1145
     },
     "2025": {
-      "Bioenergy": 0.0262,
-      "Hydro": 0.8438,
-      "Solar": 0.0171,
-      "Wind": 0.1129
+      "Bioenergy": 0.0271,
+      "Hydro": 0.843,
+      "Solar": 0.018,
+      "Wind": 0.1119
     }
   },
   "CD": {
@@ -1516,7 +1516,7 @@
     },
     "2022": {
       "Bioenergy": 0.005,
-      "Hydro": 0.8641,
+      "Hydro": 0.864,
       "Solar": 0.1051,
       "Wind": 0.0258
     },
@@ -1533,10 +1533,10 @@
       "Wind": 0.0069
     },
     "2025": {
-      "Bioenergy": 0.002,
-      "Hydro": 0.7895,
-      "Solar": 0.1966,
-      "Wind": 0.012
+      "Bioenergy": 0.0023,
+      "Hydro": 0.788,
+      "Solar": 0.1958,
+      "Wind": 0.014
     }
   },
   "CI": {
@@ -1665,10 +1665,10 @@
       "Wind": 0.1887
     },
     "2025": {
-      "Bioenergy": 0.0398,
-      "Hydro": 0.3866,
-      "Solar": 0.3501,
-      "Wind": 0.2234
+      "Bioenergy": 0.0383,
+      "Hydro": 0.3857,
+      "Solar": 0.3545,
+      "Wind": 0.2216
     }
   },
   "CM": {
@@ -1748,15 +1748,15 @@
     },
     "2024": {
       "Bioenergy": 0.06,
-      "Hydro": 0.3876,
+      "Hydro": 0.3875,
       "Solar": 0.2524,
-      "Wind": 0.3
+      "Wind": 0.3001
     },
     "2025": {
-      "Bioenergy": 0.0536,
-      "Hydro": 0.3436,
-      "Solar": 0.3227,
-      "Wind": 0.2801
+      "Bioenergy": 0.0519,
+      "Hydro": 0.3596,
+      "Solar": 0.315,
+      "Wind": 0.2736
     }
   },
   "CO": {
@@ -1798,8 +1798,8 @@
     },
     "2025": {
       "Bioenergy": 0.0001,
-      "Hydro": 0.938,
-      "Solar": 0.0586,
+      "Hydro": 0.9381,
+      "Solar": 0.0585,
       "Wind": 0.0033
     }
   },
@@ -1841,10 +1841,10 @@
       "Wind": 0.1275
     },
     "2025": {
-      "Bioenergy": 0.0047,
-      "Hydro": 0.8552,
-      "Solar": 0.0012,
-      "Wind": 0.1389
+      "Bioenergy": 0.0042,
+      "Hydro": 0.8666,
+      "Solar": 0.0011,
+      "Wind": 0.1281
     }
   },
   "CU": {
@@ -1975,8 +1975,8 @@
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.8823,
-      "Wind": 0.1177
+      "Solar": 0.8816,
+      "Wind": 0.1184
     }
   },
   "CZ": {
@@ -2017,10 +2017,10 @@
       "Wind": 0.0743
     },
     "2025": {
-      "Bioenergy": 0.2661,
-      "Hydro": 0.1567,
-      "Solar": 0.5253,
-      "Wind": 0.0519
+      "Bioenergy": 0.2713,
+      "Hydro": 0.1594,
+      "Solar": 0.5141,
+      "Wind": 0.0552
     }
   },
   "DE": {
@@ -2034,7 +2034,7 @@
       "Bioenergy": 0.1783,
       "Hydro": 0.0802,
       "Solar": 0.2067,
-      "Wind": 0.5347
+      "Wind": 0.5348
     },
     "2021": {
       "Bioenergy": 0.1856,
@@ -2061,10 +2061,10 @@
       "Wind": 0.4899
     },
     "2025": {
-      "Bioenergy": 0.142,
-      "Hydro": 0.0785,
-      "Solar": 0.3673,
-      "Wind": 0.4122
+      "Bioenergy": 0.1411,
+      "Hydro": 0.076,
+      "Solar": 0.3466,
+      "Wind": 0.4364
     }
   },
   "DJ": {
@@ -2120,15 +2120,15 @@
     },
     "2020": {
       "Bioenergy": 0.1395,
-      "Hydro": 0.0602,
-      "Solar": 0.0689,
-      "Wind": 0.7313
+      "Hydro": 0.0601,
+      "Solar": 0.069,
+      "Wind": 0.7314
     },
     "2021": {
       "Bioenergy": 0.2081,
-      "Hydro": 0.0366,
+      "Hydro": 0.0365,
       "Solar": 0.0695,
-      "Wind": 0.6857
+      "Wind": 0.6858
     },
     "2022": {
       "Bioenergy": 0.1599,
@@ -2138,7 +2138,7 @@
     },
     "2023": {
       "Bioenergy": 0.1389,
-      "Hydro": 0.0233,
+      "Hydro": 0.0232,
       "Solar": 0.1203,
       "Wind": 0.7176
     },
@@ -2149,10 +2149,10 @@
       "Wind": 0.7017
     },
     "2025": {
-      "Bioenergy": 0.1146,
-      "Hydro": 0.0453,
-      "Solar": 0.2102,
-      "Wind": 0.63
+      "Bioenergy": 0.1162,
+      "Hydro": 0.0431,
+      "Solar": 0.1986,
+      "Wind": 0.642
     }
   },
   "DM": {
@@ -2237,10 +2237,10 @@
       "Wind": 0.2476
     },
     "2025": {
-      "Bioenergy": 0.0453,
-      "Hydro": 0.3174,
-      "Solar": 0.3501,
-      "Wind": 0.2872
+      "Bioenergy": 0.0449,
+      "Hydro": 0.2899,
+      "Solar": 0.4203,
+      "Wind": 0.245
     }
   },
   "DZ": {
@@ -2325,54 +2325,54 @@
       "Wind": 0.0148
     },
     "2025": {
-      "Bioenergy": 0.0003,
-      "Hydro": 0.9888,
-      "Solar": 0.0029,
-      "Wind": 0.008
+      "Bioenergy": 0.0129,
+      "Hydro": 0.9773,
+      "Solar": 0.0013,
+      "Wind": 0.0084
     }
   },
   "EE": {
     "2019": {
-      "Bioenergy": 0.315,
-      "Hydro": 0.1969,
-      "Solar": 0.0375,
-      "Wind": 0.4507
+      "Bioenergy": 0.3151,
+      "Hydro": 0.1966,
+      "Solar": 0.0374,
+      "Wind": 0.4509
     },
     "2020": {
-      "Bioenergy": 0.2351,
-      "Hydro": 0.2305,
-      "Solar": 0.0866,
-      "Wind": 0.4478
+      "Bioenergy": 0.2352,
+      "Hydro": 0.23,
+      "Solar": 0.0867,
+      "Wind": 0.4481
     },
     "2021": {
-      "Bioenergy": 0.2227,
-      "Hydro": 0.1852,
-      "Solar": 0.168,
-      "Wind": 0.4241
+      "Bioenergy": 0.2228,
+      "Hydro": 0.1848,
+      "Solar": 0.1681,
+      "Wind": 0.4243
     },
     "2022": {
       "Bioenergy": 0.328,
-      "Hydro": 0.0688,
+      "Hydro": 0.0687,
       "Solar": 0.2532,
       "Wind": 0.35
     },
     "2023": {
       "Bioenergy": 0.1794,
-      "Hydro": 0.1692,
-      "Solar": 0.2791,
-      "Wind": 0.3723
+      "Hydro": 0.169,
+      "Solar": 0.2792,
+      "Wind": 0.3724
     },
     "2024": {
       "Bioenergy": 0.1394,
-      "Hydro": 0.1362,
+      "Hydro": 0.1363,
       "Solar": 0.3069,
       "Wind": 0.4175
     },
     "2025": {
-      "Bioenergy": 0.1202,
-      "Hydro": 0.1094,
-      "Solar": 0.3915,
-      "Wind": 0.3788
+      "Bioenergy": 0.1208,
+      "Hydro": 0.1128,
+      "Solar": 0.3807,
+      "Wind": 0.3857
     }
   },
   "EG": {
@@ -2414,9 +2414,9 @@
     },
     "2025": {
       "Bioenergy": 0.0036,
-      "Hydro": 0.5034,
-      "Solar": 0.2471,
-      "Wind": 0.2458
+      "Hydro": 0.504,
+      "Solar": 0.2476,
+      "Wind": 0.2448
     }
   },
   "ER": {
@@ -2472,7 +2472,7 @@
     },
     "2020": {
       "Bioenergy": 0.0355,
-      "Hydro": 0.308,
+      "Hydro": 0.3079,
       "Solar": 0.1792,
       "Wind": 0.4773
     },
@@ -2501,10 +2501,10 @@
       "Wind": 0.3979
     },
     "2025": {
-      "Bioenergy": 0.024,
-      "Hydro": 0.2098,
-      "Solar": 0.4229,
-      "Wind": 0.3433
+      "Bioenergy": 0.0245,
+      "Hydro": 0.2045,
+      "Solar": 0.4239,
+      "Wind": 0.3471
     }
   },
   "ET": {
@@ -2554,25 +2554,25 @@
   "FI": {
     "2019": {
       "Bioenergy": 0.3457,
-      "Hydro": 0.4293,
+      "Hydro": 0.4292,
       "Solar": 0.0209,
-      "Wind": 0.2041
+      "Wind": 0.2042
     },
     "2020": {
       "Bioenergy": 0.268,
-      "Hydro": 0.4817,
+      "Hydro": 0.4816,
       "Solar": 0.0226,
       "Wind": 0.2277
     },
     "2021": {
-      "Bioenergy": 0.2967,
-      "Hydro": 0.4472,
+      "Bioenergy": 0.2968,
+      "Hydro": 0.4471,
       "Solar": 0.0256,
-      "Wind": 0.2304
+      "Wind": 0.2305
     },
     "2022": {
-      "Bioenergy": 0.3029,
-      "Hydro": 0.372,
+      "Bioenergy": 0.303,
+      "Hydro": 0.3719,
       "Solar": 0.0241,
       "Wind": 0.301
     },
@@ -2589,10 +2589,10 @@
       "Wind": 0.4323
     },
     "2025": {
-      "Bioenergy": 0.2023,
-      "Hydro": 0.3026,
-      "Solar": 0.0508,
-      "Wind": 0.4442
+      "Bioenergy": 0.1974,
+      "Hydro": 0.2914,
+      "Solar": 0.0463,
+      "Wind": 0.4648
     }
   },
   "FJ": {
@@ -2744,7 +2744,7 @@
       "Bioenergy": 0.0293,
       "Hydro": 0.5192,
       "Solar": 0.122,
-      "Wind": 0.3295
+      "Wind": 0.3296
     },
     "2022": {
       "Bioenergy": 0.0381,
@@ -2765,10 +2765,10 @@
       "Wind": 0.3414
     },
     "2025": {
-      "Bioenergy": 0.0208,
-      "Hydro": 0.391,
-      "Solar": 0.2559,
-      "Wind": 0.3323
+      "Bioenergy": 0.0203,
+      "Hydro": 0.3831,
+      "Solar": 0.2556,
+      "Wind": 0.341
     }
   },
   "GA": {
@@ -2820,19 +2820,19 @@
       "Bioenergy": 0.1779,
       "Hydro": 0.0713,
       "Solar": 0.1231,
-      "Wind": 0.6277
+      "Wind": 0.6278
     },
     "2020": {
       "Bioenergy": 0.1635,
-      "Hydro": 0.0676,
+      "Hydro": 0.0675,
       "Solar": 0.1122,
-      "Wind": 0.6567
+      "Wind": 0.6568
     },
     "2021": {
       "Bioenergy": 0.1908,
-      "Hydro": 0.0729,
+      "Hydro": 0.0728,
       "Solar": 0.1187,
-      "Wind": 0.6176
+      "Wind": 0.6177
     },
     "2022": {
       "Bioenergy": 0.138,
@@ -2853,10 +2853,10 @@
       "Wind": 0.6476
     },
     "2025": {
-      "Bioenergy": 0.1535,
-      "Hydro": 0.0604,
-      "Solar": 0.1881,
-      "Wind": 0.598
+      "Bioenergy": 0.1511,
+      "Hydro": 0.0597,
+      "Solar": 0.1774,
+      "Wind": 0.6119
     }
   },
   "GD": {
@@ -2941,10 +2941,10 @@
       "Wind": 0.0182
     },
     "2025": {
-      "Bioenergy": 0.0029,
-      "Hydro": 0.9645,
-      "Solar": 0.0118,
-      "Wind": 0.0208
+      "Bioenergy": 0.0026,
+      "Hydro": 0.967,
+      "Solar": 0.0103,
+      "Wind": 0.0201
     }
   },
   "GF": {
@@ -3302,19 +3302,19 @@
   "GR": {
     "2019": {
       "Bioenergy": 0.0179,
-      "Hydro": 0.2969,
+      "Hydro": 0.2967,
       "Solar": 0.253,
-      "Wind": 0.4323
+      "Wind": 0.4324
     },
     "2020": {
       "Bioenergy": 0.0152,
-      "Hydro": 0.2394,
+      "Hydro": 0.2392,
       "Solar": 0.2536,
-      "Wind": 0.4919
+      "Wind": 0.492
     },
     "2021": {
       "Bioenergy": 0.0062,
-      "Hydro": 0.2725,
+      "Hydro": 0.2724,
       "Solar": 0.2386,
       "Wind": 0.4828
     },
@@ -3338,9 +3338,9 @@
     },
     "2025": {
       "Bioenergy": 0.0008,
-      "Hydro": 0.0918,
-      "Solar": 0.535,
-      "Wind": 0.3724
+      "Hydro": 0.0933,
+      "Solar": 0.5302,
+      "Wind": 0.3757
     }
   },
   "GT": {
@@ -3552,15 +3552,15 @@
     },
     "2024": {
       "Bioenergy": 0.1057,
-      "Hydro": 0.3953,
+      "Hydro": 0.3952,
       "Solar": 0.2578,
-      "Wind": 0.2412
+      "Wind": 0.2413
     },
     "2025": {
-      "Bioenergy": 0.0951,
-      "Hydro": 0.3578,
-      "Solar": 0.3119,
-      "Wind": 0.2352
+      "Bioenergy": 0.0931,
+      "Hydro": 0.3714,
+      "Solar": 0.3066,
+      "Wind": 0.2289
     }
   },
   "HN": {
@@ -3602,39 +3602,39 @@
     },
     "2025": {
       "Bioenergy": 0.2442,
-      "Hydro": 0.4242,
+      "Hydro": 0.4241,
       "Solar": 0.1904,
-      "Wind": 0.1412
+      "Wind": 0.1413
     }
   },
   "HR": {
     "2019": {
       "Bioenergy": 0.065,
-      "Hydro": 0.6851,
+      "Hydro": 0.685,
       "Solar": 0.0331,
-      "Wind": 0.2168
+      "Wind": 0.2169
     },
     "2020": {
       "Bioenergy": 0.0708,
-      "Hydro": 0.6458,
+      "Hydro": 0.6457,
       "Solar": 0.0339,
-      "Wind": 0.2495
+      "Wind": 0.2496
     },
     "2021": {
       "Bioenergy": 0.0687,
-      "Hydro": 0.6666,
+      "Hydro": 0.6665,
       "Solar": 0.0297,
       "Wind": 0.235
     },
     "2022": {
       "Bioenergy": 0.0846,
-      "Hydro": 0.5615,
+      "Hydro": 0.5614,
       "Solar": 0.0515,
-      "Wind": 0.3024
+      "Wind": 0.3025
     },
     "2023": {
       "Bioenergy": 0.0596,
-      "Hydro": 0.6403,
+      "Hydro": 0.6402,
       "Solar": 0.0515,
       "Wind": 0.2487
     },
@@ -3645,10 +3645,10 @@
       "Wind": 0.2748
     },
     "2025": {
-      "Bioenergy": 0.0608,
-      "Hydro": 0.4652,
-      "Solar": 0.178,
-      "Wind": 0.296
+      "Bioenergy": 0.062,
+      "Hydro": 0.4517,
+      "Solar": 0.1717,
+      "Wind": 0.3146
     }
   },
   "HT": {
@@ -3697,46 +3697,46 @@
   },
   "HU": {
     "2019": {
-      "Bioenergy": 0.1793,
-      "Hydro": 0.3181,
-      "Solar": 0.2482,
-      "Wind": 0.2543
+      "Bioenergy": 0.1794,
+      "Hydro": 0.3177,
+      "Solar": 0.2483,
+      "Wind": 0.2545
     },
     "2020": {
-      "Bioenergy": 0.1609,
-      "Hydro": 0.2785,
-      "Solar": 0.3362,
-      "Wind": 0.2244
+      "Bioenergy": 0.161,
+      "Hydro": 0.278,
+      "Solar": 0.3364,
+      "Wind": 0.2246
     },
     "2021": {
       "Bioenergy": 0.1476,
-      "Hydro": 0.2319,
-      "Solar": 0.4301,
-      "Wind": 0.1904
+      "Hydro": 0.2316,
+      "Solar": 0.4303,
+      "Wind": 0.1905
     },
     "2022": {
-      "Bioenergy": 0.1386,
-      "Hydro": 0.1871,
-      "Solar": 0.4903,
-      "Wind": 0.1839
+      "Bioenergy": 0.1387,
+      "Hydro": 0.1869,
+      "Solar": 0.4905,
+      "Wind": 0.184
     },
     "2023": {
       "Bioenergy": 0.0846,
-      "Hydro": 0.168,
-      "Solar": 0.5815,
+      "Hydro": 0.1679,
+      "Solar": 0.5816,
       "Wind": 0.1659
     },
     "2024": {
       "Bioenergy": 0.0803,
-      "Hydro": 0.1387,
+      "Hydro": 0.1388,
       "Solar": 0.6443,
       "Wind": 0.1367
     },
     "2025": {
-      "Bioenergy": 0.09,
-      "Hydro": 0.0834,
-      "Solar": 0.7422,
-      "Wind": 0.0844
+      "Bioenergy": 0.0938,
+      "Hydro": 0.0792,
+      "Solar": 0.7434,
+      "Wind": 0.0837
     }
   },
   "ID": {
@@ -3777,54 +3777,54 @@
       "Wind": 0.0173
     },
     "2025": {
-      "Bioenergy": 0.3543,
-      "Hydro": 0.6197,
+      "Bioenergy": 0.3542,
+      "Hydro": 0.6199,
       "Solar": 0.0084,
-      "Wind": 0.0176
+      "Wind": 0.0175
     }
   },
   "IE": {
     "2019": {
       "Bioenergy": 0.024,
-      "Hydro": 0.1225,
+      "Hydro": 0.1224,
       "Solar": 0.0091,
-      "Wind": 0.8444
+      "Wind": 0.8445
     },
     "2020": {
       "Bioenergy": 0.0186,
-      "Hydro": 0.1146,
+      "Hydro": 0.1145,
       "Solar": 0.0097,
       "Wind": 0.8572
     },
     "2021": {
       "Bioenergy": 0.0187,
-      "Hydro": 0.1122,
+      "Hydro": 0.1121,
       "Solar": 0.0122,
-      "Wind": 0.8568
+      "Wind": 0.8569
     },
     "2022": {
       "Bioenergy": 0.016,
-      "Hydro": 0.087,
+      "Hydro": 0.0869,
       "Solar": 0.0115,
-      "Wind": 0.8855
+      "Wind": 0.8856
     },
     "2023": {
       "Bioenergy": 0.016,
       "Hydro": 0.1116,
       "Solar": 0.0451,
-      "Wind": 0.8273
+      "Wind": 0.8274
     },
     "2024": {
       "Bioenergy": 0.0179,
-      "Hydro": 0.1138,
+      "Hydro": 0.1139,
       "Solar": 0.0757,
-      "Wind": 0.7927
+      "Wind": 0.7926
     },
     "2025": {
-      "Bioenergy": 0.0199,
-      "Hydro": 0.1051,
-      "Solar": 0.1414,
-      "Wind": 0.7336
+      "Bioenergy": 0.0196,
+      "Hydro": 0.1053,
+      "Solar": 0.1295,
+      "Wind": 0.7455
     }
   },
   "IL": {
@@ -3909,10 +3909,10 @@
       "Wind": 0.212
     },
     "2025": {
-      "Bioenergy": 0.0264,
-      "Hydro": 0.3879,
-      "Solar": 0.3363,
-      "Wind": 0.2495
+      "Bioenergy": 0.0243,
+      "Hydro": 0.4,
+      "Solar": 0.3346,
+      "Wind": 0.2412
     }
   },
   "IQ": {
@@ -3998,7 +3998,7 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9994,
+      "Hydro": 0.9993,
       "Solar": 0.0005,
       "Wind": 0.0001
     }
@@ -4049,46 +4049,46 @@
   },
   "IT": {
     "2019": {
-      "Bioenergy": 0.1572,
-      "Hydro": 0.4458,
-      "Solar": 0.2024,
-      "Wind": 0.1946
+      "Bioenergy": 0.1597,
+      "Hydro": 0.4372,
+      "Solar": 0.2055,
+      "Wind": 0.1976
     },
     "2020": {
-      "Bioenergy": 0.1563,
-      "Hydro": 0.4498,
-      "Solar": 0.2105,
-      "Wind": 0.1834
+      "Bioenergy": 0.1594,
+      "Hydro": 0.439,
+      "Solar": 0.2146,
+      "Wind": 0.187
     },
     "2021": {
-      "Bioenergy": 0.1508,
-      "Hydro": 0.4363,
-      "Solar": 0.2123,
-      "Wind": 0.2005
+      "Bioenergy": 0.1533,
+      "Hydro": 0.4271,
+      "Solar": 0.2159,
+      "Wind": 0.2037
     },
     "2022": {
-      "Bioenergy": 0.1593,
-      "Hydro": 0.3356,
-      "Solar": 0.2749,
-      "Wind": 0.2303
+      "Bioenergy": 0.1614,
+      "Hydro": 0.3268,
+      "Solar": 0.2785,
+      "Wind": 0.2333
     },
     "2023": {
-      "Bioenergy": 0.1284,
-      "Hydro": 0.3773,
-      "Solar": 0.2618,
-      "Wind": 0.2325
+      "Bioenergy": 0.1294,
+      "Hydro": 0.3721,
+      "Solar": 0.264,
+      "Wind": 0.2344
     },
     "2024": {
-      "Bioenergy": 0.1129,
-      "Hydro": 0.4207,
-      "Solar": 0.2696,
-      "Wind": 0.1968
+      "Bioenergy": 0.1125,
+      "Hydro": 0.4227,
+      "Solar": 0.2687,
+      "Wind": 0.1961
     },
     "2025": {
-      "Bioenergy": 0.095,
-      "Hydro": 0.3635,
-      "Solar": 0.3637,
-      "Wind": 0.1779
+      "Bioenergy": 0.0973,
+      "Hydro": 0.3535,
+      "Solar": 0.3623,
+      "Wind": 0.1868
     }
   },
   "JM": {
@@ -4217,10 +4217,10 @@
       "Wind": 0.0718
     },
     "2025": {
-      "Bioenergy": 0.1997,
-      "Hydro": 0.2499,
-      "Solar": 0.4784,
-      "Wind": 0.072
+      "Bioenergy": 0.2121,
+      "Hydro": 0.2519,
+      "Solar": 0.4654,
+      "Wind": 0.0706
     }
   },
   "KE": {
@@ -4261,10 +4261,10 @@
       "Wind": 0.2855
     },
     "2025": {
-      "Bioenergy": 0.0557,
-      "Hydro": 0.5789,
-      "Solar": 0.0679,
-      "Wind": 0.2975
+      "Bioenergy": 0.0566,
+      "Hydro": 0.5823,
+      "Solar": 0.068,
+      "Wind": 0.2931
     }
   },
   "KG": {
@@ -4306,9 +4306,9 @@
     },
     "2025": {
       "Bioenergy": 0.0018,
-      "Hydro": 0.9823,
+      "Hydro": 0.9824,
       "Solar": 0.009,
-      "Wind": 0.0069
+      "Wind": 0.0068
     }
   },
   "KH": {
@@ -4349,10 +4349,10 @@
       "Wind": 0.0421
     },
     "2025": {
-      "Bioenergy": 0.0299,
-      "Hydro": 0.846,
-      "Solar": 0.0799,
-      "Wind": 0.0442
+      "Bioenergy": 0.0297,
+      "Hydro": 0.8471,
+      "Solar": 0.0796,
+      "Wind": 0.0436
     }
   },
   "KI": {
@@ -4569,10 +4569,10 @@
       "Wind": 0.0639
     },
     "2025": {
-      "Bioenergy": 0.196,
-      "Hydro": 0.0565,
-      "Solar": 0.6898,
-      "Wind": 0.0577
+      "Bioenergy": 0.2027,
+      "Hydro": 0.0581,
+      "Solar": 0.6854,
+      "Wind": 0.0538
     }
   },
   "KW": {
@@ -4702,9 +4702,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.6186,
-      "Solar": 0.1285,
-      "Wind": 0.2528
+      "Hydro": 0.6061,
+      "Solar": 0.1304,
+      "Wind": 0.2635
     }
   },
   "LA": {
@@ -4973,121 +4973,121 @@
   },
   "LT": {
     "2019": {
-      "Bioenergy": 0.1292,
-      "Hydro": 0.3689,
+      "Bioenergy": 0.1293,
+      "Hydro": 0.3686,
       "Solar": 0.0688,
-      "Wind": 0.4331
+      "Wind": 0.4334
     },
     "2020": {
-      "Bioenergy": 0.1267,
-      "Hydro": 0.3378,
-      "Solar": 0.0715,
-      "Wind": 0.464
+      "Bioenergy": 0.1268,
+      "Hydro": 0.3373,
+      "Solar": 0.0716,
+      "Wind": 0.4643
     },
     "2021": {
       "Bioenergy": 0.13,
-      "Hydro": 0.3635,
-      "Solar": 0.0899,
-      "Wind": 0.4166
+      "Hydro": 0.3631,
+      "Solar": 0.09,
+      "Wind": 0.4169
     },
     "2022": {
-      "Bioenergy": 0.1123,
-      "Hydro": 0.311,
-      "Solar": 0.1403,
-      "Wind": 0.4364
+      "Bioenergy": 0.1124,
+      "Hydro": 0.3107,
+      "Solar": 0.1404,
+      "Wind": 0.4366
     },
     "2023": {
       "Bioenergy": 0.0721,
-      "Hydro": 0.2526,
+      "Hydro": 0.2524,
       "Solar": 0.1683,
-      "Wind": 0.507
+      "Wind": 0.5071
     },
     "2024": {
       "Bioenergy": 0.0513,
-      "Hydro": 0.1845,
+      "Hydro": 0.1846,
       "Solar": 0.236,
       "Wind": 0.5282
     },
     "2025": {
-      "Bioenergy": 0.0323,
+      "Bioenergy": 0.0322,
       "Hydro": 0.1088,
-      "Solar": 0.3205,
-      "Wind": 0.5384
+      "Solar": 0.3093,
+      "Wind": 0.5497
     }
   },
   "LU": {
     "2019": {
       "Bioenergy": 0.1488,
-      "Hydro": 0.3883,
-      "Solar": 0.1301,
-      "Wind": 0.3328
+      "Hydro": 0.3879,
+      "Solar": 0.1302,
+      "Wind": 0.3331
     },
     "2020": {
-      "Bioenergy": 0.1644,
-      "Hydro": 0.3511,
-      "Solar": 0.1318,
-      "Wind": 0.3528
+      "Bioenergy": 0.1645,
+      "Hydro": 0.3505,
+      "Solar": 0.1319,
+      "Wind": 0.3531
     },
     "2021": {
-      "Bioenergy": 0.1845,
-      "Hydro": 0.3449,
-      "Solar": 0.1523,
-      "Wind": 0.3183
+      "Bioenergy": 0.1846,
+      "Hydro": 0.3445,
+      "Solar": 0.1525,
+      "Wind": 0.3185
     },
     "2022": {
       "Bioenergy": 0.187,
-      "Hydro": 0.2892,
-      "Solar": 0.1958,
-      "Wind": 0.328
+      "Hydro": 0.2888,
+      "Solar": 0.1959,
+      "Wind": 0.3282
     },
     "2023": {
       "Bioenergy": 0.1102,
-      "Hydro": 0.289,
-      "Solar": 0.2005,
-      "Wind": 0.4003
+      "Hydro": 0.2888,
+      "Solar": 0.2006,
+      "Wind": 0.4004
     },
     "2024": {
       "Bioenergy": 0.1376,
-      "Hydro": 0.2931,
+      "Hydro": 0.2932,
       "Solar": 0.2198,
       "Wind": 0.3494
     },
     "2025": {
-      "Bioenergy": 0.1275,
-      "Hydro": 0.2318,
-      "Solar": 0.3274,
-      "Wind": 0.3133
+      "Bioenergy": 0.1287,
+      "Hydro": 0.2305,
+      "Solar": 0.3163,
+      "Wind": 0.3245
     }
   },
   "LV": {
     "2019": {
       "Bioenergy": 0.1956,
-      "Hydro": 0.7135,
+      "Hydro": 0.7134,
       "Solar": 0.0129,
       "Wind": 0.078
     },
     "2020": {
       "Bioenergy": 0.1522,
-      "Hydro": 0.7502,
+      "Hydro": 0.7501,
       "Solar": 0.0186,
       "Wind": 0.0791
     },
     "2021": {
       "Bioenergy": 0.147,
-      "Hydro": 0.7509,
+      "Hydro": 0.7508,
       "Solar": 0.024,
       "Wind": 0.0782
     },
     "2022": {
       "Bioenergy": 0.1007,
-      "Hydro": 0.7507,
+      "Hydro": 0.7506,
       "Solar": 0.0407,
       "Wind": 0.108
     },
     "2023": {
       "Bioenergy": 0.0582,
       "Hydro": 0.7752,
-      "Solar": 0.0656,
+      "Solar": 0.0657,
       "Wind": 0.1009
     },
     "2024": {
@@ -5097,10 +5097,10 @@
       "Wind": 0.1076
     },
     "2025": {
-      "Bioenergy": 0.0811,
-      "Hydro": 0.6501,
-      "Solar": 0.2024,
-      "Wind": 0.0664
+      "Bioenergy": 0.0829,
+      "Hydro": 0.6412,
+      "Solar": 0.1996,
+      "Wind": 0.0763
     }
   },
   "LY": {
@@ -5180,41 +5180,41 @@
     },
     "2024": {
       "Bioenergy": 0.0008,
-      "Hydro": 0.091,
-      "Solar": 0.1381,
-      "Wind": 0.7701
+      "Hydro": 0.0908,
+      "Solar": 0.1379,
+      "Wind": 0.7705
     },
     "2025": {
-      "Bioenergy": 0.0007,
-      "Hydro": 0.1248,
-      "Solar": 0.1246,
-      "Wind": 0.7499
+      "Bioenergy": 0.001,
+      "Hydro": 0.1151,
+      "Solar": 0.1395,
+      "Wind": 0.7444
     }
   },
   "MD": {
     "2019": {
-      "Bioenergy": 0.0835,
-      "Hydro": 0.7097,
+      "Bioenergy": 0.0836,
+      "Hydro": 0.7095,
       "Solar": 0.0348,
-      "Wind": 0.172
+      "Wind": 0.1721
     },
     "2020": {
-      "Bioenergy": 0.0131,
-      "Hydro": 0.9175,
+      "Bioenergy": 0.0132,
+      "Hydro": 0.9174,
       "Solar": 0.0098,
-      "Wind": 0.0595
+      "Wind": 0.0596
     },
     "2021": {
       "Bioenergy": 0.014,
-      "Hydro": 0.9154,
+      "Hydro": 0.9153,
       "Solar": 0.027,
       "Wind": 0.0436
     },
     "2022": {
       "Bioenergy": 0.0474,
-      "Hydro": 0.6981,
+      "Hydro": 0.6979,
       "Solar": 0.0777,
-      "Wind": 0.1768
+      "Wind": 0.177
     },
     "2023": {
       "Bioenergy": 0.0113,
@@ -5229,36 +5229,36 @@
       "Wind": 0.1777
     },
     "2025": {
-      "Bioenergy": 0.0081,
-      "Hydro": 0.6334,
-      "Solar": 0.3238,
-      "Wind": 0.0347
+      "Bioenergy": 0.008,
+      "Hydro": 0.6331,
+      "Solar": 0.323,
+      "Wind": 0.0358
     }
   },
   "ME": {
     "2019": {
       "Bioenergy": 0.0142,
-      "Hydro": 0.7941,
-      "Solar": 0.0196,
+      "Hydro": 0.794,
+      "Solar": 0.0195,
       "Wind": 0.1722
     },
     "2020": {
       "Bioenergy": 0.0143,
-      "Hydro": 0.7526,
+      "Hydro": 0.7525,
       "Solar": 0.0174,
-      "Wind": 0.2157
+      "Wind": 0.2158
     },
     "2021": {
       "Bioenergy": 0.0075,
       "Hydro": 0.8138,
       "Solar": 0.0153,
-      "Wind": 0.1634
+      "Wind": 0.1635
     },
     "2022": {
       "Bioenergy": 0.0017,
       "Hydro": 0.7949,
       "Solar": 0.0025,
-      "Wind": 0.2009
+      "Wind": 0.201
     },
     "2023": {
       "Bioenergy": 0.0013,
@@ -5268,15 +5268,15 @@
     },
     "2024": {
       "Bioenergy": 0.0068,
-      "Hydro": 0.7722,
+      "Hydro": 0.7723,
       "Solar": 0.0571,
       "Wind": 0.1638
     },
     "2025": {
-      "Bioenergy": 0.0235,
-      "Hydro": 0.5921,
-      "Solar": 0.1702,
-      "Wind": 0.2143
+      "Bioenergy": 0.0242,
+      "Hydro": 0.5852,
+      "Solar": 0.166,
+      "Wind": 0.2245
     }
   },
   "MG": {
@@ -5326,25 +5326,25 @@
   "MK": {
     "2019": {
       "Bioenergy": 0.0676,
-      "Hydro": 0.7703,
+      "Hydro": 0.7702,
       "Solar": 0.0191,
-      "Wind": 0.1431
+      "Wind": 0.1432
     },
     "2020": {
       "Bioenergy": 0.0715,
-      "Hydro": 0.7504,
+      "Hydro": 0.7502,
       "Solar": 0.0263,
-      "Wind": 0.1519
+      "Wind": 0.152
     },
     "2021": {
       "Bioenergy": 0.0647,
-      "Hydro": 0.7684,
+      "Hydro": 0.7682,
       "Solar": 0.0305,
       "Wind": 0.1365
     },
     "2022": {
       "Bioenergy": 0.0421,
-      "Hydro": 0.7825,
+      "Hydro": 0.7824,
       "Solar": 0.0424,
       "Wind": 0.133
     },
@@ -5361,10 +5361,10 @@
       "Wind": 0.1213
     },
     "2025": {
-      "Bioenergy": 0.0277,
-      "Hydro": 0.6095,
-      "Solar": 0.1755,
-      "Wind": 0.1873
+      "Bioenergy": 0.0272,
+      "Hydro": 0.608,
+      "Solar": 0.1737,
+      "Wind": 0.191
     }
   },
   "ML": {
@@ -5532,15 +5532,15 @@
     },
     "2024": {
       "Bioenergy": 0.1934,
-      "Hydro": 0.3585,
+      "Hydro": 0.3584,
       "Solar": 0.2294,
-      "Wind": 0.2187
+      "Wind": 0.2188
     },
     "2025": {
-      "Bioenergy": 0.1767,
-      "Hydro": 0.3272,
-      "Solar": 0.2811,
-      "Wind": 0.2151
+      "Bioenergy": 0.1737,
+      "Hydro": 0.34,
+      "Solar": 0.2767,
+      "Wind": 0.2096
     }
   },
   "MQ": {
@@ -5677,46 +5677,46 @@
   },
   "MT": {
     "2019": {
-      "Bioenergy": 0.0874,
-      "Hydro": 0.5246,
+      "Bioenergy": 0.0875,
+      "Hydro": 0.5243,
       "Solar": 0.1018,
-      "Wind": 0.2862
+      "Wind": 0.2865
     },
     "2020": {
-      "Bioenergy": 0.0848,
-      "Hydro": 0.5137,
-      "Solar": 0.102,
-      "Wind": 0.2994
+      "Bioenergy": 0.085,
+      "Hydro": 0.5131,
+      "Solar": 0.1021,
+      "Wind": 0.2998
     },
     "2021": {
       "Bioenergy": 0.09,
-      "Hydro": 0.4989,
-      "Solar": 0.111,
-      "Wind": 0.3001
+      "Hydro": 0.4984,
+      "Solar": 0.1112,
+      "Wind": 0.3003
     },
     "2022": {
       "Bioenergy": 0.0563,
-      "Hydro": 0.2886,
-      "Solar": 0.4504,
-      "Wind": 0.2047
+      "Hydro": 0.2883,
+      "Solar": 0.4506,
+      "Wind": 0.2048
     },
     "2023": {
       "Bioenergy": 0.0247,
-      "Hydro": 0.1547,
-      "Solar": 0.7048,
+      "Hydro": 0.1545,
+      "Solar": 0.7049,
       "Wind": 0.1158
     },
     "2024": {
-      "Bioenergy": 0.0297,
+      "Bioenergy": 0.0296,
       "Hydro": 0.192,
       "Solar": 0.645,
       "Wind": 0.1333
     },
     "2025": {
-      "Bioenergy": 0.0273,
-      "Hydro": 0.1658,
-      "Solar": 0.6885,
-      "Wind": 0.1184
+      "Bioenergy": 0.0292,
+      "Hydro": 0.1743,
+      "Solar": 0.665,
+      "Wind": 0.1316
     }
   },
   "MU": {
@@ -5889,10 +5889,10 @@
       "Wind": 0.3199
     },
     "2025": {
-      "Bioenergy": 0.0011,
-      "Hydro": 0.3807,
-      "Solar": 0.2954,
-      "Wind": 0.3227
+      "Bioenergy": 0.001,
+      "Hydro": 0.4199,
+      "Solar": 0.2843,
+      "Wind": 0.2948
     }
   },
   "MY": {
@@ -5933,10 +5933,10 @@
       "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0.1089,
-      "Hydro": 0.8095,
-      "Solar": 0.0817,
-      "Wind": 0
+      "Bioenergy": 0.109,
+      "Hydro": 0.8091,
+      "Solar": 0.0818,
+      "Wind": 0.0001
     }
   },
   "MZ": {
@@ -6197,10 +6197,10 @@
       "Wind": 0.3676
     },
     "2025": {
-      "Bioenergy": 0.4014,
-      "Hydro": 0.1993,
-      "Solar": 0.0309,
-      "Wind": 0.3683
+      "Bioenergy": 0.4012,
+      "Hydro": 0.1989,
+      "Solar": 0.0312,
+      "Wind": 0.3686
     }
   },
   "NL": {
@@ -6218,8 +6218,8 @@
     },
     "2021": {
       "Bioenergy": 0.2575,
-      "Hydro": 0.0154,
-      "Solar": 0.2973,
+      "Hydro": 0.0153,
+      "Solar": 0.2974,
       "Wind": 0.4298
     },
     "2022": {
@@ -6241,10 +6241,10 @@
       "Wind": 0.5115
     },
     "2025": {
-      "Bioenergy": 0.0876,
+      "Bioenergy": 0.0882,
       "Hydro": 0.0005,
-      "Solar": 0.5124,
-      "Wind": 0.3995
+      "Solar": 0.4897,
+      "Wind": 0.4216
     }
   },
   "NO": {
@@ -6286,9 +6286,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.918,
+      "Hydro": 0.9137,
       "Solar": 0,
-      "Wind": 0.082
+      "Wind": 0.0863
     }
   },
   "NP": {
@@ -6325,14 +6325,14 @@
     "2024": {
       "Bioenergy": 0.0051,
       "Hydro": 0.9444,
-      "Solar": 0.031,
+      "Solar": 0.0309,
       "Wind": 0.0195
     },
     "2025": {
-      "Bioenergy": 0.005,
-      "Hydro": 0.9375,
+      "Bioenergy": 0.0049,
+      "Hydro": 0.9379,
       "Solar": 0.0369,
-      "Wind": 0.0206
+      "Wind": 0.0203
     }
   },
   "NR": {
@@ -6462,9 +6462,9 @@
     },
     "2025": {
       "Bioenergy": 0.0005,
-      "Hydro": 0.8739,
+      "Hydro": 0.8587,
       "Solar": 0,
-      "Wind": 0.1256
+      "Wind": 0.1409
     }
   },
   "OM": {
@@ -6593,10 +6593,10 @@
       "Wind": 0.1075
     },
     "2025": {
-      "Bioenergy": 0.0092,
-      "Hydro": 0.8506,
-      "Solar": 0.0433,
-      "Wind": 0.0969
+      "Bioenergy": 0.0103,
+      "Hydro": 0.8406,
+      "Solar": 0.0485,
+      "Wind": 0.1005
     }
   },
   "PF": {
@@ -6725,10 +6725,10 @@
       "Wind": 0.0721
     },
     "2025": {
-      "Bioenergy": 0.0615,
-      "Hydro": 0.6537,
-      "Solar": 0.235,
-      "Wind": 0.0499
+      "Bioenergy": 0.0589,
+      "Hydro": 0.6629,
+      "Solar": 0.2314,
+      "Wind": 0.0468
     }
   },
   "PK": {
@@ -6769,28 +6769,28 @@
       "Wind": 0.0556
     },
     "2025": {
-      "Bioenergy": 0.0074,
-      "Hydro": 0.5427,
-      "Solar": 0.3886,
+      "Bioenergy": 0.0071,
+      "Hydro": 0.5575,
+      "Solar": 0.3741,
       "Wind": 0.0613
     }
   },
   "PL": {
     "2019": {
       "Bioenergy": 0.1057,
-      "Hydro": 0.1472,
+      "Hydro": 0.1471,
       "Solar": 0.0477,
-      "Wind": 0.6994
+      "Wind": 0.6995
     },
     "2020": {
       "Bioenergy": 0.0962,
-      "Hydro": 0.1564,
+      "Hydro": 0.1562,
       "Solar": 0.1029,
-      "Wind": 0.6445
+      "Wind": 0.6446
     },
     "2021": {
       "Bioenergy": 0.081,
-      "Hydro": 0.0976,
+      "Hydro": 0.0975,
       "Solar": 0.1924,
       "Wind": 0.629
     },
@@ -6813,10 +6813,10 @@
       "Wind": 0.5178
     },
     "2025": {
-      "Bioenergy": 0.0592,
-      "Hydro": 0.0358,
-      "Solar": 0.4714,
-      "Wind": 0.4335
+      "Bioenergy": 0.0596,
+      "Hydro": 0.0353,
+      "Solar": 0.4541,
+      "Wind": 0.4509
     }
   },
   "PM": {
@@ -6903,8 +6903,8 @@
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.4857,
-      "Wind": 0.5143
+      "Solar": 0.4872,
+      "Wind": 0.5128
     }
   },
   "PS": {
@@ -6954,7 +6954,7 @@
   "PT": {
     "2019": {
       "Bioenergy": 0.1097,
-      "Hydro": 0.2977,
+      "Hydro": 0.2976,
       "Solar": 0.0575,
       "Wind": 0.5352
     },
@@ -6974,7 +6974,7 @@
       "Bioenergy": 0.127,
       "Hydro": 0.242,
       "Solar": 0.1356,
-      "Wind": 0.4953
+      "Wind": 0.4954
     },
     "2023": {
       "Bioenergy": 0.0908,
@@ -6989,10 +6989,10 @@
       "Wind": 0.376
     },
     "2025": {
-      "Bioenergy": 0.0734,
-      "Hydro": 0.3395,
-      "Solar": 0.2498,
-      "Wind": 0.3373
+      "Bioenergy": 0.0755,
+      "Hydro": 0.3303,
+      "Solar": 0.2521,
+      "Wind": 0.3421
     }
   },
   "PY": {
@@ -7132,7 +7132,7 @@
       "Bioenergy": 0.0196,
       "Hydro": 0.6439,
       "Solar": 0.0576,
-      "Wind": 0.2789
+      "Wind": 0.279
     },
     "2020": {
       "Bioenergy": 0.0231,
@@ -7165,10 +7165,10 @@
       "Wind": 0.2537
     },
     "2025": {
-      "Bioenergy": 0.0215,
-      "Hydro": 0.4773,
-      "Solar": 0.2687,
-      "Wind": 0.2324
+      "Bioenergy": 0.0223,
+      "Hydro": 0.4794,
+      "Solar": 0.2539,
+      "Wind": 0.2443
     }
   },
   "RS": {
@@ -7192,7 +7192,7 @@
     },
     "2022": {
       "Bioenergy": 0.0318,
-      "Hydro": 0.8242,
+      "Hydro": 0.8241,
       "Solar": 0.0178,
       "Wind": 0.1262
     },
@@ -7209,10 +7209,10 @@
       "Wind": 0.1091
     },
     "2025": {
-      "Bioenergy": 0.0327,
-      "Hydro": 0.8166,
-      "Solar": 0.0109,
-      "Wind": 0.1398
+      "Bioenergy": 0.0345,
+      "Hydro": 0.8033,
+      "Solar": 0.0133,
+      "Wind": 0.1489
     }
   },
   "RU": {
@@ -7253,10 +7253,10 @@
       "Wind": 0.0243
     },
     "2025": {
-      "Bioenergy": 0.0039,
-      "Hydro": 0.9625,
-      "Solar": 0.0128,
-      "Wind": 0.0208
+      "Bioenergy": 0.0038,
+      "Hydro": 0.9624,
+      "Solar": 0.0127,
+      "Wind": 0.0211
     }
   },
   "RW": {
@@ -7517,10 +7517,10 @@
       "Wind": 0.3508
     },
     "2025": {
-      "Bioenergy": 0.0471,
-      "Hydro": 0.5757,
-      "Solar": 0.0502,
-      "Wind": 0.327
+      "Bioenergy": 0.0464,
+      "Hydro": 0.572,
+      "Solar": 0.049,
+      "Wind": 0.3325
     }
   },
   "SG": {
@@ -7561,10 +7561,10 @@
       "Wind": 0.0013
     },
     "2025": {
-      "Bioenergy": 0.0031,
-      "Hydro": 0.0182,
-      "Solar": 0.9667,
-      "Wind": 0.012
+      "Bioenergy": 0.003,
+      "Hydro": 0.0188,
+      "Solar": 0.9665,
+      "Wind": 0.0117
     }
   },
   "SH": {
@@ -7620,7 +7620,7 @@
     },
     "2020": {
       "Bioenergy": 0.0253,
-      "Hydro": 0.9034,
+      "Hydro": 0.9033,
       "Solar": 0.0602,
       "Wind": 0.0112
     },
@@ -7628,7 +7628,7 @@
       "Bioenergy": 0.0157,
       "Hydro": 0.9036,
       "Solar": 0.0678,
-      "Wind": 0.0129
+      "Wind": 0.013
     },
     "2022": {
       "Bioenergy": 0.0302,
@@ -7649,10 +7649,10 @@
       "Wind": 0.0053
     },
     "2025": {
-      "Bioenergy": 0.0236,
-      "Hydro": 0.6663,
-      "Solar": 0.3066,
-      "Wind": 0.0035
+      "Bioenergy": 0.0268,
+      "Hydro": 0.639,
+      "Solar": 0.3184,
+      "Wind": 0.0158
     }
   },
   "SK": {
@@ -7660,13 +7660,13 @@
       "Bioenergy": 0.1406,
       "Hydro": 0.7417,
       "Solar": 0.0927,
-      "Wind": 0.0249
+      "Wind": 0.025
     },
     "2020": {
       "Bioenergy": 0.1516,
       "Hydro": 0.7508,
       "Solar": 0.0868,
-      "Wind": 0.0108
+      "Wind": 0.0109
     },
     "2021": {
       "Bioenergy": 0.1554,
@@ -7677,7 +7677,7 @@
     "2022": {
       "Bioenergy": 0.1474,
       "Hydro": 0.7119,
-      "Solar": 0.113,
+      "Solar": 0.1131,
       "Wind": 0.0277
     },
     "2023": {
@@ -7693,9 +7693,9 @@
       "Wind": 0.0002
     },
     "2025": {
-      "Bioenergy": 0.1959,
-      "Hydro": 0.6541,
-      "Solar": 0.15,
+      "Bioenergy": 0.1988,
+      "Hydro": 0.6544,
+      "Solar": 0.1468,
       "Wind": 0
     }
   },
@@ -8001,10 +8001,10 @@
       "Wind": 0.0367
     },
     "2025": {
-      "Bioenergy": 0.2825,
-      "Hydro": 0.3309,
-      "Solar": 0.2905,
-      "Wind": 0.096
+      "Bioenergy": 0.2824,
+      "Hydro": 0.3307,
+      "Solar": 0.2906,
+      "Wind": 0.0963
     }
   },
   "SY": {
@@ -8259,16 +8259,16 @@
       "Wind": 0.1527
     },
     "2024": {
-      "Bioenergy": 0.3584,
+      "Bioenergy": 0.3583,
       "Hydro": 0.269,
       "Solar": 0.2152,
       "Wind": 0.1575
     },
     "2025": {
-      "Bioenergy": 0.2784,
-      "Hydro": 0.2665,
-      "Solar": 0.3134,
-      "Wind": 0.1417
+      "Bioenergy": 0.2629,
+      "Hydro": 0.2879,
+      "Solar": 0.3036,
+      "Wind": 0.1456
     }
   },
   "TJ": {
@@ -8310,8 +8310,8 @@
     },
     "2025": {
       "Bioenergy": 0.0001,
-      "Hydro": 0.9989,
-      "Solar": 0.0005,
+      "Hydro": 0.999,
+      "Solar": 0.0004,
       "Wind": 0.0005
     }
   },
@@ -8523,16 +8523,16 @@
       "Wind": 0.2737
     },
     "2024": {
-      "Bioenergy": 0.0597,
-      "Hydro": 0.5126,
-      "Solar": 0.1766,
-      "Wind": 0.2512
+      "Bioenergy": 0.0596,
+      "Hydro": 0.5129,
+      "Solar": 0.1767,
+      "Wind": 0.2508
     },
     "2025": {
-      "Bioenergy": 0.0539,
-      "Hydro": 0.4134,
-      "Solar": 0.2638,
-      "Wind": 0.2689
+      "Bioenergy": 0.0552,
+      "Hydro": 0.4007,
+      "Solar": 0.2702,
+      "Wind": 0.2738
     }
   },
   "TT": {
@@ -8617,10 +8617,10 @@
       "Wind": 0.3484
     },
     "2025": {
-      "Bioenergy": 0.0073,
-      "Hydro": 0.1919,
-      "Solar": 0.453,
-      "Wind": 0.3479
+      "Bioenergy": 0.008,
+      "Hydro": 0.202,
+      "Solar": 0.4849,
+      "Wind": 0.3051
     }
   },
   "TZ": {
@@ -8793,10 +8793,10 @@
       "Wind": 0.4378
     },
     "2025": {
-      "Bioenergy": 0.04,
-      "Hydro": 0.2104,
-      "Solar": 0.3592,
-      "Wind": 0.3903
+      "Bioenergy": 0.0399,
+      "Hydro": 0.2078,
+      "Solar": 0.358,
+      "Wind": 0.3943
     }
   },
   "UY": {
@@ -8837,10 +8837,10 @@
       "Wind": 0.3343
     },
     "2025": {
-      "Bioenergy": 0.1417,
-      "Hydro": 0.4808,
+      "Bioenergy": 0.1394,
+      "Hydro": 0.4777,
       "Solar": 0.0386,
-      "Wind": 0.339
+      "Wind": 0.3444
     }
   },
   "UZ": {
@@ -8882,9 +8882,9 @@
     },
     "2025": {
       "Bioenergy": 0.0039,
-      "Hydro": 0.9598,
-      "Solar": 0.0214,
-      "Wind": 0.0149
+      "Hydro": 0.96,
+      "Solar": 0.0213,
+      "Wind": 0.0148
     }
   },
   "VC": {
@@ -9102,9 +9102,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.722,
-      "Solar": 0.182,
-      "Wind": 0.0959
+      "Hydro": 0.7371,
+      "Solar": 0.1719,
+      "Wind": 0.091
     }
   },
   "VU": {
@@ -9216,27 +9216,27 @@
     },
     "2022": {
       "Bioenergy": 0.0226,
-      "Hydro": 0.4051,
+      "Hydro": 0.405,
       "Solar": 0.0155,
-      "Wind": 0.5568
+      "Wind": 0.5569
     },
     "2023": {
       "Bioenergy": 0.0235,
-      "Hydro": 0.4804,
-      "Solar": 0.0409,
+      "Hydro": 0.4803,
+      "Solar": 0.041,
       "Wind": 0.4552
     },
     "2024": {
       "Bioenergy": 0.0281,
-      "Hydro": 0.3916,
+      "Hydro": 0.3915,
       "Solar": 0.0433,
       "Wind": 0.537
     },
     "2025": {
-      "Bioenergy": 0.0351,
-      "Hydro": 0.4376,
-      "Solar": 0.1143,
-      "Wind": 0.413
+      "Bioenergy": 0.0349,
+      "Hydro": 0.4373,
+      "Solar": 0.1123,
+      "Wind": 0.4156
     }
   },
   "YE": {
@@ -9322,9 +9322,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.0536,
-      "Solar": 0.5825,
-      "Wind": 0.3639
+      "Hydro": 0.0494,
+      "Solar": 0.6103,
+      "Wind": 0.3403
     }
   },
   "ZM": {