@digital4better/data 1.3.20 → 1.3.21

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

@@ -81,10 +81,10 @@
       "Wind": 0.1331
     },
     "2025": {
-      "Bioenergy": 0.035,
-      "Hydro": 0.6279,
-      "Solar": 0.1989,
-      "Wind": 0.1382
+      "Bioenergy": 0.0351,
+      "Hydro": 0.6323,
+      "Solar": 0.1975,
+      "Wind": 0.1351
     }
   },
   "AG": {
@@ -134,45 +134,45 @@
   "AL": {
     "2019": {
       "Bioenergy": 0.0112,
-      "Hydro": 0.9357,
+      "Hydro": 0.9358,
       "Solar": 0.0159,
-      "Wind": 0.0372
+      "Wind": 0.0371
     },
     "2020": {
-      "Bioenergy": 0.0117,
-      "Hydro": 0.9277,
+      "Bioenergy": 0.0116,
+      "Hydro": 0.9278,
       "Solar": 0.0185,
-      "Wind": 0.0421
+      "Wind": 0.042
     },
     "2021": {
       "Bioenergy": 0.012,
-      "Hydro": 0.9284,
-      "Solar": 0.0197,
-      "Wind": 0.0399
+      "Hydro": 0.9285,
+      "Solar": 0.0196,
+      "Wind": 0.0398
     },
     "2022": {
       "Bioenergy": 0.0121,
-      "Hydro": 0.9185,
+      "Hydro": 0.9186,
       "Solar": 0.024,
       "Wind": 0.0453
     },
     "2023": {
       "Bioenergy": 0.0109,
-      "Hydro": 0.9113,
+      "Hydro": 0.9114,
       "Solar": 0.0284,
       "Wind": 0.0493
     },
     "2024": {
       "Bioenergy": 0.0109,
-      "Hydro": 0.9061,
-      "Solar": 0.0332,
-      "Wind": 0.0499
+      "Hydro": 0.9062,
+      "Solar": 0.0331,
+      "Wind": 0.0498
     },
     "2025": {
       "Bioenergy": 0.0107,
-      "Hydro": 0.8978,
-      "Solar": 0.0466,
-      "Wind": 0.0449
+      "Hydro": 0.8981,
+      "Solar": 0.0452,
+      "Wind": 0.0461
     }
   },
   "AM": {
@@ -213,10 +213,10 @@
       "Wind": 0.0045
     },
     "2025": {
-      "Bioenergy": 0,
-      "Hydro": 0.7739,
-      "Solar": 0.2261,
-      "Wind": 0
+      "Bioenergy": 0.0012,
+      "Hydro": 0.7623,
+      "Solar": 0.2324,
+      "Wind": 0.0041
     }
   },
   "AO": {
@@ -301,10 +301,10 @@
       "Wind": 0.2828
     },
     "2025": {
-      "Bioenergy": 0.0278,
-      "Hydro": 0.5736,
-      "Solar": 0.0805,
-      "Wind": 0.3182
+      "Bioenergy": 0.0283,
+      "Hydro": 0.5643,
+      "Solar": 0.0837,
+      "Wind": 0.3237
     }
   },
   "AS": {
@@ -367,12 +367,12 @@
     "2021": {
       "Bioenergy": 0.0331,
       "Hydro": 0.765,
-      "Solar": 0.0507,
-      "Wind": 0.1513
+      "Solar": 0.0506,
+      "Wind": 0.1512
     },
     "2022": {
       "Bioenergy": 0.0538,
-      "Hydro": 0.7151,
+      "Hydro": 0.7152,
       "Solar": 0.072,
       "Wind": 0.159
     },
@@ -389,10 +389,10 @@
       "Wind": 0.1511
     },
     "2025": {
-      "Bioenergy": 0.0305,
-      "Hydro": 0.6416,
-      "Solar": 0.1893,
-      "Wind": 0.1386
+      "Bioenergy": 0.0321,
+      "Hydro": 0.6383,
+      "Solar": 0.1869,
+      "Wind": 0.1427
     }
   },
   "AU": {
@@ -433,10 +433,10 @@
       "Wind": 0.3444
     },
     "2025": {
-      "Bioenergy": 0.0043,
-      "Hydro": 0.134,
-      "Solar": 0.4767,
-      "Wind": 0.385
+      "Bioenergy": 0.0041,
+      "Hydro": 0.1322,
+      "Solar": 0.4806,
+      "Wind": 0.3831
     }
   },
   "AW": {
@@ -522,8 +522,8 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.847,
-      "Solar": 0.153,
+      "Hydro": 0.9629,
+      "Solar": 0.0371,
       "Wind": 0
     }
   },
@@ -566,9 +566,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.8349,
-      "Solar": 0.1292,
-      "Wind": 0.036
+      "Hydro": 0.8325,
+      "Solar": 0.131,
+      "Wind": 0.0365
     }
   },
   "BB": {
@@ -648,27 +648,27 @@
     },
     "2024": {
       "Bioenergy": 0.0502,
-      "Hydro": 0.4306,
+      "Hydro": 0.4308,
       "Solar": 0.3423,
-      "Wind": 0.1768
+      "Wind": 0.1767
     },
     "2025": {
-      "Bioenergy": 0.0455,
-      "Hydro": 0.3683,
-      "Solar": 0.4063,
-      "Wind": 0.1799
+      "Bioenergy": 0.0454,
+      "Hydro": 0.3731,
+      "Solar": 0.4067,
+      "Wind": 0.1748
     }
   },
   "BE": {
     "2019": {
       "Bioenergy": 0.1622,
-      "Hydro": 0.0313,
+      "Hydro": 0.0314,
       "Solar": 0.2363,
-      "Wind": 0.5702
+      "Wind": 0.5701
     },
     "2020": {
       "Bioenergy": 0.1299,
-      "Hydro": 0.0223,
+      "Hydro": 0.0224,
       "Solar": 0.2313,
       "Wind": 0.6165
     },
@@ -686,21 +686,21 @@
     },
     "2023": {
       "Bioenergy": 0.0431,
-      "Hydro": 0.0392,
+      "Hydro": 0.0393,
       "Solar": 0.3079,
-      "Wind": 0.6097
+      "Wind": 0.6096
     },
     "2024": {
       "Bioenergy": 0.0374,
-      "Hydro": 0.0799,
-      "Solar": 0.34,
-      "Wind": 0.5428
+      "Hydro": 0.0802,
+      "Solar": 0.3398,
+      "Wind": 0.5426
     },
     "2025": {
-      "Bioenergy": 0.0367,
-      "Hydro": 0.0781,
-      "Solar": 0.487,
-      "Wind": 0.3981
+      "Bioenergy": 0.0402,
+      "Hydro": 0.0784,
+      "Solar": 0.4636,
+      "Wind": 0.4177
     }
   },
   "BF": {
@@ -774,21 +774,21 @@
     },
     "2023": {
       "Bioenergy": 0.0234,
-      "Hydro": 0.3931,
+      "Hydro": 0.3932,
       "Solar": 0.3897,
       "Wind": 0.1937
     },
     "2024": {
       "Bioenergy": 0.0171,
-      "Hydro": 0.3192,
+      "Hydro": 0.3193,
       "Solar": 0.5027,
-      "Wind": 0.161
+      "Wind": 0.1609
     },
     "2025": {
-      "Bioenergy": 0.0108,
-      "Hydro": 0.247,
-      "Solar": 0.6403,
-      "Wind": 0.1019
+      "Bioenergy": 0.0111,
+      "Hydro": 0.2366,
+      "Solar": 0.6455,
+      "Wind": 0.1068
     }
   },
   "BH": {
@@ -1049,10 +1049,10 @@
       "Wind": 0.1289
     },
     "2025": {
-      "Bioenergy": 0.0248,
-      "Hydro": 0.8292,
-      "Solar": 0.0807,
-      "Wind": 0.0652
+      "Bioenergy": 0.025,
+      "Hydro": 0.8281,
+      "Solar": 0.0813,
+      "Wind": 0.0656
     }
   },
   "BR": {
@@ -1093,10 +1093,10 @@
       "Wind": 0.1724
     },
     "2025": {
-      "Bioenergy": 0.0124,
-      "Hydro": 0.666,
-      "Solar": 0.1388,
-      "Wind": 0.1828
+      "Bioenergy": 0.012,
+      "Hydro": 0.6648,
+      "Solar": 0.1394,
+      "Wind": 0.1838
     }
   },
   "BS": {
@@ -1234,21 +1234,21 @@
   "BY": {
     "2019": {
       "Bioenergy": 0.1403,
-      "Hydro": 0.4246,
+      "Hydro": 0.4247,
       "Solar": 0.2242,
       "Wind": 0.2108
     },
     "2020": {
       "Bioenergy": 0.2286,
-      "Hydro": 0.4047,
-      "Solar": 0.152,
+      "Hydro": 0.4048,
+      "Solar": 0.1519,
       "Wind": 0.2147
     },
     "2021": {
-      "Bioenergy": 0.2409,
-      "Hydro": 0.405,
+      "Bioenergy": 0.2408,
+      "Hydro": 0.4052,
       "Solar": 0.1865,
-      "Wind": 0.1676
+      "Wind": 0.1675
     },
     "2022": {
       "Bioenergy": 0.2433,
@@ -1264,15 +1264,15 @@
     },
     "2024": {
       "Bioenergy": 0.2934,
-      "Hydro": 0.3688,
-      "Solar": 0.1865,
-      "Wind": 0.1513
+      "Hydro": 0.369,
+      "Solar": 0.1864,
+      "Wind": 0.1512
     },
     "2025": {
-      "Bioenergy": 0.4575,
-      "Hydro": 0.3085,
-      "Solar": 0.0782,
-      "Wind": 0.1558
+      "Bioenergy": 0.3747,
+      "Hydro": 0.3434,
+      "Solar": 0.1433,
+      "Wind": 0.1386
     }
   },
   "BZ": {
@@ -1313,9 +1313,9 @@
       "Wind": 0.0539
     },
     "2025": {
-      "Bioenergy": 0.2218,
-      "Hydro": 0.6632,
-      "Solar": 0.0582,
+      "Bioenergy": 0.2224,
+      "Hydro": 0.662,
+      "Solar": 0.0589,
       "Wind": 0.0567
     }
   },
@@ -1357,10 +1357,10 @@
       "Wind": 0.1145
     },
     "2025": {
-      "Bioenergy": 0.0242,
-      "Hydro": 0.8362,
-      "Solar": 0.0175,
-      "Wind": 0.1221
+      "Bioenergy": 0.0262,
+      "Hydro": 0.8438,
+      "Solar": 0.0171,
+      "Wind": 0.1129
     }
   },
   "CD": {
@@ -1516,7 +1516,7 @@
     },
     "2022": {
       "Bioenergy": 0.005,
-      "Hydro": 0.864,
+      "Hydro": 0.8641,
       "Solar": 0.1051,
       "Wind": 0.0258
     },
@@ -1534,9 +1534,9 @@
     },
     "2025": {
       "Bioenergy": 0.002,
-      "Hydro": 0.7822,
-      "Solar": 0.2039,
-      "Wind": 0.0119
+      "Hydro": 0.7895,
+      "Solar": 0.1966,
+      "Wind": 0.012
     }
   },
   "CI": {
@@ -1665,10 +1665,10 @@
       "Wind": 0.1887
     },
     "2025": {
-      "Bioenergy": 0.0403,
-      "Hydro": 0.3901,
-      "Solar": 0.3445,
-      "Wind": 0.2251
+      "Bioenergy": 0.0398,
+      "Hydro": 0.3866,
+      "Solar": 0.3501,
+      "Wind": 0.2234
     }
   },
   "CM": {
@@ -1841,10 +1841,10 @@
       "Wind": 0.1275
     },
     "2025": {
-      "Bioenergy": 0.0046,
-      "Hydro": 0.8519,
-      "Solar": 0.0009,
-      "Wind": 0.1426
+      "Bioenergy": 0.0047,
+      "Hydro": 0.8552,
+      "Solar": 0.0012,
+      "Wind": 0.1389
     }
   },
   "CU": {
@@ -2017,10 +2017,10 @@
       "Wind": 0.0743
     },
     "2025": {
-      "Bioenergy": 0.2618,
-      "Hydro": 0.1526,
-      "Solar": 0.5371,
-      "Wind": 0.0486
+      "Bioenergy": 0.2661,
+      "Hydro": 0.1567,
+      "Solar": 0.5253,
+      "Wind": 0.0519
     }
   },
   "DE": {
@@ -2034,7 +2034,7 @@
       "Bioenergy": 0.1783,
       "Hydro": 0.0802,
       "Solar": 0.2067,
-      "Wind": 0.5348
+      "Wind": 0.5347
     },
     "2021": {
       "Bioenergy": 0.1856,
@@ -2050,21 +2050,21 @@
     },
     "2023": {
       "Bioenergy": 0.1587,
-      "Hydro": 0.0868,
+      "Hydro": 0.0869,
       "Solar": 0.2434,
       "Wind": 0.5111
     },
     "2024": {
       "Bioenergy": 0.1477,
-      "Hydro": 0.0963,
-      "Solar": 0.2661,
+      "Hydro": 0.0964,
+      "Solar": 0.266,
       "Wind": 0.4899
     },
     "2025": {
-      "Bioenergy": 0.1425,
-      "Hydro": 0.0814,
-      "Solar": 0.386,
-      "Wind": 0.3901
+      "Bioenergy": 0.142,
+      "Hydro": 0.0785,
+      "Solar": 0.3673,
+      "Wind": 0.4122
     }
   },
   "DJ": {
@@ -2114,21 +2114,21 @@
   "DK": {
     "2019": {
       "Bioenergy": 0.1705,
-      "Hydro": 0.0484,
-      "Solar": 0.0548,
-      "Wind": 0.7264
+      "Hydro": 0.0486,
+      "Solar": 0.0547,
+      "Wind": 0.7262
     },
     "2020": {
-      "Bioenergy": 0.1396,
-      "Hydro": 0.0599,
-      "Solar": 0.069,
-      "Wind": 0.7315
+      "Bioenergy": 0.1395,
+      "Hydro": 0.0602,
+      "Solar": 0.0689,
+      "Wind": 0.7313
     },
     "2021": {
-      "Bioenergy": 0.2082,
-      "Hydro": 0.0364,
-      "Solar": 0.0696,
-      "Wind": 0.6859
+      "Bioenergy": 0.2081,
+      "Hydro": 0.0366,
+      "Solar": 0.0695,
+      "Wind": 0.6857
     },
     "2022": {
       "Bioenergy": 0.1599,
@@ -2138,21 +2138,21 @@
     },
     "2023": {
       "Bioenergy": 0.1389,
-      "Hydro": 0.0231,
+      "Hydro": 0.0233,
       "Solar": 0.1203,
-      "Wind": 0.7177
+      "Wind": 0.7176
     },
     "2024": {
-      "Bioenergy": 0.1375,
-      "Hydro": 0.0246,
+      "Bioenergy": 0.1374,
+      "Hydro": 0.0248,
       "Solar": 0.1361,
-      "Wind": 0.7018
+      "Wind": 0.7017
     },
     "2025": {
-      "Bioenergy": 0.1103,
-      "Hydro": 0.0475,
-      "Solar": 0.2219,
-      "Wind": 0.6203
+      "Bioenergy": 0.1146,
+      "Hydro": 0.0453,
+      "Solar": 0.2102,
+      "Wind": 0.63
     }
   },
   "DM": {
@@ -2326,53 +2326,53 @@
     },
     "2025": {
       "Bioenergy": 0.0003,
-      "Hydro": 0.9889,
+      "Hydro": 0.9888,
       "Solar": 0.0029,
       "Wind": 0.008
     }
   },
   "EE": {
     "2019": {
-      "Bioenergy": 0.3153,
-      "Hydro": 0.1959,
+      "Bioenergy": 0.315,
+      "Hydro": 0.1969,
       "Solar": 0.0375,
-      "Wind": 0.4512
+      "Wind": 0.4507
     },
     "2020": {
-      "Bioenergy": 0.2354,
-      "Hydro": 0.2295,
-      "Solar": 0.0867,
-      "Wind": 0.4484
+      "Bioenergy": 0.2351,
+      "Hydro": 0.2305,
+      "Solar": 0.0866,
+      "Wind": 0.4478
     },
     "2021": {
-      "Bioenergy": 0.2229,
-      "Hydro": 0.1842,
-      "Solar": 0.1682,
-      "Wind": 0.4246
+      "Bioenergy": 0.2227,
+      "Hydro": 0.1852,
+      "Solar": 0.168,
+      "Wind": 0.4241
     },
     "2022": {
-      "Bioenergy": 0.3281,
-      "Hydro": 0.0686,
+      "Bioenergy": 0.328,
+      "Hydro": 0.0688,
       "Solar": 0.2532,
-      "Wind": 0.3501
+      "Wind": 0.35
     },
     "2023": {
-      "Bioenergy": 0.1795,
-      "Hydro": 0.1686,
-      "Solar": 0.2793,
-      "Wind": 0.3726
+      "Bioenergy": 0.1794,
+      "Hydro": 0.1692,
+      "Solar": 0.2791,
+      "Wind": 0.3723
     },
     "2024": {
-      "Bioenergy": 0.1395,
-      "Hydro": 0.1356,
-      "Solar": 0.3071,
-      "Wind": 0.4178
+      "Bioenergy": 0.1394,
+      "Hydro": 0.1362,
+      "Solar": 0.3069,
+      "Wind": 0.4175
     },
     "2025": {
-      "Bioenergy": 0.1199,
-      "Hydro": 0.1103,
-      "Solar": 0.4039,
-      "Wind": 0.3658
+      "Bioenergy": 0.1202,
+      "Hydro": 0.1094,
+      "Solar": 0.3915,
+      "Wind": 0.3788
     }
   },
   "EG": {
@@ -2466,13 +2466,13 @@
   "ES": {
     "2019": {
       "Bioenergy": 0.0316,
-      "Hydro": 0.2825,
+      "Hydro": 0.2826,
       "Solar": 0.1486,
       "Wind": 0.5372
     },
     "2020": {
       "Bioenergy": 0.0355,
-      "Hydro": 0.3079,
+      "Hydro": 0.308,
       "Solar": 0.1792,
       "Wind": 0.4773
     },
@@ -2502,9 +2502,9 @@
     },
     "2025": {
       "Bioenergy": 0.024,
-      "Hydro": 0.2088,
-      "Solar": 0.4292,
-      "Wind": 0.3381
+      "Hydro": 0.2098,
+      "Solar": 0.4229,
+      "Wind": 0.3433
     }
   },
   "ET": {
@@ -2553,28 +2553,28 @@
   },
   "FI": {
     "2019": {
-      "Bioenergy": 0.3458,
-      "Hydro": 0.429,
+      "Bioenergy": 0.3457,
+      "Hydro": 0.4293,
       "Solar": 0.0209,
-      "Wind": 0.2043
+      "Wind": 0.2041
     },
     "2020": {
-      "Bioenergy": 0.2681,
-      "Hydro": 0.4815,
-      "Solar": 0.0227,
-      "Wind": 0.2278
+      "Bioenergy": 0.268,
+      "Hydro": 0.4817,
+      "Solar": 0.0226,
+      "Wind": 0.2277
     },
     "2021": {
-      "Bioenergy": 0.2968,
-      "Hydro": 0.4469,
-      "Solar": 0.0257,
-      "Wind": 0.2306
+      "Bioenergy": 0.2967,
+      "Hydro": 0.4472,
+      "Solar": 0.0256,
+      "Wind": 0.2304
     },
     "2022": {
-      "Bioenergy": 0.303,
-      "Hydro": 0.3718,
+      "Bioenergy": 0.3029,
+      "Hydro": 0.372,
       "Solar": 0.0241,
-      "Wind": 0.3011
+      "Wind": 0.301
     },
     "2023": {
       "Bioenergy": 0.2569,
@@ -2586,13 +2586,13 @@
       "Bioenergy": 0.209,
       "Hydro": 0.3272,
       "Solar": 0.0315,
-      "Wind": 0.4324
+      "Wind": 0.4323
     },
     "2025": {
-      "Bioenergy": 0.2048,
-      "Hydro": 0.3053,
-      "Solar": 0.0546,
-      "Wind": 0.4353
+      "Bioenergy": 0.2023,
+      "Hydro": 0.3026,
+      "Solar": 0.0508,
+      "Wind": 0.4442
     }
   },
   "FJ": {
@@ -2736,7 +2736,7 @@
     },
     "2020": {
       "Bioenergy": 0.0262,
-      "Hydro": 0.522,
+      "Hydro": 0.5221,
       "Solar": 0.111,
       "Wind": 0.3407
     },
@@ -2744,13 +2744,13 @@
       "Bioenergy": 0.0293,
       "Hydro": 0.5192,
       "Solar": 0.122,
-      "Wind": 0.3296
+      "Wind": 0.3295
     },
     "2022": {
       "Bioenergy": 0.0381,
       "Hydro": 0.4254,
       "Solar": 0.177,
-      "Wind": 0.3596
+      "Wind": 0.3595
     },
     "2023": {
       "Bioenergy": 0.0263,
@@ -2765,10 +2765,10 @@
       "Wind": 0.3414
     },
     "2025": {
-      "Bioenergy": 0.0209,
-      "Hydro": 0.3912,
-      "Solar": 0.2661,
-      "Wind": 0.3218
+      "Bioenergy": 0.0208,
+      "Hydro": 0.391,
+      "Solar": 0.2559,
+      "Wind": 0.3323
     }
   },
   "GA": {
@@ -2818,21 +2818,21 @@
   "GB": {
     "2019": {
       "Bioenergy": 0.1779,
-      "Hydro": 0.0711,
+      "Hydro": 0.0713,
       "Solar": 0.1231,
-      "Wind": 0.6278
+      "Wind": 0.6277
     },
     "2020": {
       "Bioenergy": 0.1635,
-      "Hydro": 0.0674,
+      "Hydro": 0.0676,
       "Solar": 0.1122,
-      "Wind": 0.6568
+      "Wind": 0.6567
     },
     "2021": {
       "Bioenergy": 0.1908,
-      "Hydro": 0.0727,
+      "Hydro": 0.0729,
       "Solar": 0.1187,
-      "Wind": 0.6178
+      "Wind": 0.6176
     },
     "2022": {
       "Bioenergy": 0.138,
@@ -2842,21 +2842,21 @@
     },
     "2023": {
       "Bioenergy": 0.1196,
-      "Hydro": 0.0622,
+      "Hydro": 0.0623,
       "Solar": 0.1169,
-      "Wind": 0.7013
+      "Wind": 0.7012
     },
     "2024": {
       "Bioenergy": 0.151,
-      "Hydro": 0.074,
-      "Solar": 0.1272,
-      "Wind": 0.6478
+      "Hydro": 0.0743,
+      "Solar": 0.1271,
+      "Wind": 0.6476
     },
     "2025": {
-      "Bioenergy": 0.1576,
-      "Hydro": 0.0621,
-      "Solar": 0.1994,
-      "Wind": 0.5809
+      "Bioenergy": 0.1535,
+      "Hydro": 0.0604,
+      "Solar": 0.1881,
+      "Wind": 0.598
     }
   },
   "GD": {
@@ -2941,10 +2941,10 @@
       "Wind": 0.0182
     },
     "2025": {
-      "Bioenergy": 0.0023,
-      "Hydro": 0.9707,
-      "Solar": 0.0088,
-      "Wind": 0.0182
+      "Bioenergy": 0.0029,
+      "Hydro": 0.9645,
+      "Solar": 0.0118,
+      "Wind": 0.0208
     }
   },
   "GF": {
@@ -3302,33 +3302,33 @@
   "GR": {
     "2019": {
       "Bioenergy": 0.0179,
-      "Hydro": 0.2965,
-      "Solar": 0.2531,
-      "Wind": 0.4325
+      "Hydro": 0.2969,
+      "Solar": 0.253,
+      "Wind": 0.4323
     },
     "2020": {
       "Bioenergy": 0.0152,
-      "Hydro": 0.239,
-      "Solar": 0.2537,
-      "Wind": 0.4921
+      "Hydro": 0.2394,
+      "Solar": 0.2536,
+      "Wind": 0.4919
     },
     "2021": {
       "Bioenergy": 0.0062,
-      "Hydro": 0.2723,
+      "Hydro": 0.2725,
       "Solar": 0.2386,
-      "Wind": 0.4829
+      "Wind": 0.4828
     },
     "2022": {
       "Bioenergy": 0.0067,
-      "Hydro": 0.2032,
+      "Hydro": 0.2033,
       "Solar": 0.2921,
       "Wind": 0.4979
     },
     "2023": {
       "Bioenergy": 0.0064,
-      "Hydro": 0.1879,
-      "Solar": 0.3612,
-      "Wind": 0.4446
+      "Hydro": 0.188,
+      "Solar": 0.3611,
+      "Wind": 0.4445
     },
     "2024": {
       "Bioenergy": 0.0014,
@@ -3338,9 +3338,9 @@
     },
     "2025": {
       "Bioenergy": 0.0008,
-      "Hydro": 0.0909,
-      "Solar": 0.537,
-      "Wind": 0.3712
+      "Hydro": 0.0918,
+      "Solar": 0.535,
+      "Wind": 0.3724
     }
   },
   "GT": {
@@ -3534,7 +3534,7 @@
     },
     "2021": {
       "Bioenergy": 0.117,
-      "Hydro": 0.4996,
+      "Hydro": 0.4997,
       "Solar": 0.1659,
       "Wind": 0.2175
     },
@@ -3552,15 +3552,15 @@
     },
     "2024": {
       "Bioenergy": 0.1057,
-      "Hydro": 0.3951,
-      "Solar": 0.2579,
-      "Wind": 0.2413
+      "Hydro": 0.3953,
+      "Solar": 0.2578,
+      "Wind": 0.2412
     },
     "2025": {
-      "Bioenergy": 0.0942,
-      "Hydro": 0.3528,
-      "Solar": 0.3132,
-      "Wind": 0.2398
+      "Bioenergy": 0.0951,
+      "Hydro": 0.3578,
+      "Solar": 0.3119,
+      "Wind": 0.2352
     }
   },
   "HN": {
@@ -3602,53 +3602,53 @@
     },
     "2025": {
       "Bioenergy": 0.2442,
-      "Hydro": 0.4244,
-      "Solar": 0.1903,
+      "Hydro": 0.4242,
+      "Solar": 0.1904,
       "Wind": 0.1412
     }
   },
   "HR": {
     "2019": {
       "Bioenergy": 0.065,
-      "Hydro": 0.6848,
+      "Hydro": 0.6851,
       "Solar": 0.0331,
-      "Wind": 0.217
+      "Wind": 0.2168
     },
     "2020": {
       "Bioenergy": 0.0708,
-      "Hydro": 0.6455,
-      "Solar": 0.034,
-      "Wind": 0.2497
+      "Hydro": 0.6458,
+      "Solar": 0.0339,
+      "Wind": 0.2495
     },
     "2021": {
       "Bioenergy": 0.0687,
-      "Hydro": 0.6664,
-      "Solar": 0.0298,
-      "Wind": 0.2351
+      "Hydro": 0.6666,
+      "Solar": 0.0297,
+      "Wind": 0.235
     },
     "2022": {
-      "Bioenergy": 0.0847,
-      "Hydro": 0.5612,
-      "Solar": 0.0516,
-      "Wind": 0.3025
+      "Bioenergy": 0.0846,
+      "Hydro": 0.5615,
+      "Solar": 0.0515,
+      "Wind": 0.3024
     },
     "2023": {
       "Bioenergy": 0.0596,
-      "Hydro": 0.6402,
+      "Hydro": 0.6403,
       "Solar": 0.0515,
       "Wind": 0.2487
     },
     "2024": {
       "Bioenergy": 0.0632,
-      "Hydro": 0.5497,
-      "Solar": 0.1121,
-      "Wind": 0.275
+      "Hydro": 0.55,
+      "Solar": 0.112,
+      "Wind": 0.2748
     },
     "2025": {
-      "Bioenergy": 0.0594,
-      "Hydro": 0.4631,
-      "Solar": 0.1799,
-      "Wind": 0.2976
+      "Bioenergy": 0.0608,
+      "Hydro": 0.4652,
+      "Solar": 0.178,
+      "Wind": 0.296
     }
   },
   "HT": {
@@ -3697,46 +3697,46 @@
   },
   "HU": {
     "2019": {
-      "Bioenergy": 0.1796,
-      "Hydro": 0.317,
-      "Solar": 0.2486,
-      "Wind": 0.2548
+      "Bioenergy": 0.1793,
+      "Hydro": 0.3181,
+      "Solar": 0.2482,
+      "Wind": 0.2543
     },
     "2020": {
-      "Bioenergy": 0.1611,
-      "Hydro": 0.2775,
-      "Solar": 0.3366,
-      "Wind": 0.2248
+      "Bioenergy": 0.1609,
+      "Hydro": 0.2785,
+      "Solar": 0.3362,
+      "Wind": 0.2244
     },
     "2021": {
-      "Bioenergy": 0.1478,
-      "Hydro": 0.2309,
-      "Solar": 0.4306,
-      "Wind": 0.1907
+      "Bioenergy": 0.1476,
+      "Hydro": 0.2319,
+      "Solar": 0.4301,
+      "Wind": 0.1904
     },
     "2022": {
-      "Bioenergy": 0.1387,
-      "Hydro": 0.1865,
-      "Solar": 0.4907,
-      "Wind": 0.1841
+      "Bioenergy": 0.1386,
+      "Hydro": 0.1871,
+      "Solar": 0.4903,
+      "Wind": 0.1839
     },
     "2023": {
       "Bioenergy": 0.0846,
-      "Hydro": 0.1675,
-      "Solar": 0.5818,
-      "Wind": 0.166
+      "Hydro": 0.168,
+      "Solar": 0.5815,
+      "Wind": 0.1659
     },
     "2024": {
-      "Bioenergy": 0.0804,
-      "Hydro": 0.1381,
-      "Solar": 0.6447,
-      "Wind": 0.1368
+      "Bioenergy": 0.0803,
+      "Hydro": 0.1387,
+      "Solar": 0.6443,
+      "Wind": 0.1367
     },
     "2025": {
-      "Bioenergy": 0.0875,
-      "Hydro": 0.0777,
-      "Solar": 0.7557,
-      "Wind": 0.0791
+      "Bioenergy": 0.09,
+      "Hydro": 0.0834,
+      "Solar": 0.7422,
+      "Wind": 0.0844
     }
   },
   "ID": {
@@ -3777,54 +3777,54 @@
       "Wind": 0.0173
     },
     "2025": {
-      "Bioenergy": 0.3542,
-      "Hydro": 0.6196,
-      "Solar": 0.0085,
-      "Wind": 0.0177
+      "Bioenergy": 0.3543,
+      "Hydro": 0.6197,
+      "Solar": 0.0084,
+      "Wind": 0.0176
     }
   },
   "IE": {
     "2019": {
       "Bioenergy": 0.024,
-      "Hydro": 0.1223,
+      "Hydro": 0.1225,
       "Solar": 0.0091,
-      "Wind": 0.8446
+      "Wind": 0.8444
     },
     "2020": {
       "Bioenergy": 0.0186,
-      "Hydro": 0.1143,
+      "Hydro": 0.1146,
       "Solar": 0.0097,
-      "Wind": 0.8574
+      "Wind": 0.8572
     },
     "2021": {
       "Bioenergy": 0.0187,
-      "Hydro": 0.112,
-      "Solar": 0.0123,
-      "Wind": 0.8571
+      "Hydro": 0.1122,
+      "Solar": 0.0122,
+      "Wind": 0.8568
     },
     "2022": {
       "Bioenergy": 0.016,
-      "Hydro": 0.0869,
+      "Hydro": 0.087,
       "Solar": 0.0115,
-      "Wind": 0.8856
+      "Wind": 0.8855
     },
     "2023": {
       "Bioenergy": 0.016,
-      "Hydro": 0.1115,
+      "Hydro": 0.1116,
       "Solar": 0.0451,
-      "Wind": 0.8275
+      "Wind": 0.8273
     },
     "2024": {
       "Bioenergy": 0.0179,
-      "Hydro": 0.1135,
+      "Hydro": 0.1138,
       "Solar": 0.0757,
-      "Wind": 0.7929
+      "Wind": 0.7927
     },
     "2025": {
       "Bioenergy": 0.0199,
-      "Hydro": 0.1044,
-      "Solar": 0.143,
-      "Wind": 0.7326
+      "Hydro": 0.1051,
+      "Solar": 0.1414,
+      "Wind": 0.7336
     }
   },
   "IL": {
@@ -3909,10 +3909,10 @@
       "Wind": 0.212
     },
     "2025": {
-      "Bioenergy": 0.031,
-      "Hydro": 0.3707,
-      "Solar": 0.3277,
-      "Wind": 0.2706
+      "Bioenergy": 0.0264,
+      "Hydro": 0.3879,
+      "Solar": 0.3363,
+      "Wind": 0.2495
     }
   },
   "IQ": {
@@ -4049,46 +4049,46 @@
   },
   "IT": {
     "2019": {
-      "Bioenergy": 0.1641,
-      "Hydro": 0.4215,
-      "Solar": 0.2112,
-      "Wind": 0.2032
+      "Bioenergy": 0.1572,
+      "Hydro": 0.4458,
+      "Solar": 0.2024,
+      "Wind": 0.1946
     },
     "2020": {
-      "Bioenergy": 0.1634,
-      "Hydro": 0.4249,
-      "Solar": 0.22,
-      "Wind": 0.1917
+      "Bioenergy": 0.1563,
+      "Hydro": 0.4498,
+      "Solar": 0.2105,
+      "Wind": 0.1834
     },
     "2021": {
-      "Bioenergy": 0.1585,
-      "Hydro": 0.4078,
-      "Solar": 0.2231,
-      "Wind": 0.2106
+      "Bioenergy": 0.1508,
+      "Hydro": 0.4363,
+      "Solar": 0.2123,
+      "Wind": 0.2005
     },
     "2022": {
-      "Bioenergy": 0.1646,
-      "Hydro": 0.3132,
-      "Solar": 0.2841,
-      "Wind": 0.2381
+      "Bioenergy": 0.1593,
+      "Hydro": 0.3356,
+      "Solar": 0.2749,
+      "Wind": 0.2303
     },
     "2023": {
-      "Bioenergy": 0.1324,
-      "Hydro": 0.3577,
-      "Solar": 0.2701,
-      "Wind": 0.2398
+      "Bioenergy": 0.1284,
+      "Hydro": 0.3773,
+      "Solar": 0.2618,
+      "Wind": 0.2325
     },
     "2024": {
-      "Bioenergy": 0.1178,
-      "Hydro": 0.3956,
-      "Solar": 0.2813,
-      "Wind": 0.2053
+      "Bioenergy": 0.1129,
+      "Hydro": 0.4207,
+      "Solar": 0.2696,
+      "Wind": 0.1968
     },
     "2025": {
-      "Bioenergy": 0.1042,
-      "Hydro": 0.2933,
-      "Solar": 0.4073,
-      "Wind": 0.1953
+      "Bioenergy": 0.095,
+      "Hydro": 0.3635,
+      "Solar": 0.3637,
+      "Wind": 0.1779
     }
   },
   "JM": {
@@ -4261,10 +4261,10 @@
       "Wind": 0.2855
     },
     "2025": {
-      "Bioenergy": 0.0512,
-      "Hydro": 0.578,
-      "Solar": 0.07,
-      "Wind": 0.3008
+      "Bioenergy": 0.0557,
+      "Hydro": 0.5789,
+      "Solar": 0.0679,
+      "Wind": 0.2975
     }
   },
   "KG": {
@@ -4306,9 +4306,9 @@
     },
     "2025": {
       "Bioenergy": 0.0018,
-      "Hydro": 0.982,
-      "Solar": 0.0091,
-      "Wind": 0.0071
+      "Hydro": 0.9823,
+      "Solar": 0.009,
+      "Wind": 0.0069
     }
   },
   "KH": {
@@ -4350,9 +4350,9 @@
     },
     "2025": {
       "Bioenergy": 0.0299,
-      "Hydro": 0.8442,
-      "Solar": 0.0805,
-      "Wind": 0.0454
+      "Hydro": 0.846,
+      "Solar": 0.0799,
+      "Wind": 0.0442
     }
   },
   "KI": {
@@ -4973,134 +4973,134 @@
   },
   "LT": {
     "2019": {
-      "Bioenergy": 0.1294,
-      "Hydro": 0.3678,
-      "Solar": 0.0689,
-      "Wind": 0.4338
+      "Bioenergy": 0.1292,
+      "Hydro": 0.3689,
+      "Solar": 0.0688,
+      "Wind": 0.4331
     },
     "2020": {
-      "Bioenergy": 0.1269,
-      "Hydro": 0.3367,
-      "Solar": 0.0717,
-      "Wind": 0.4647
+      "Bioenergy": 0.1267,
+      "Hydro": 0.3378,
+      "Solar": 0.0715,
+      "Wind": 0.464
     },
     "2021": {
-      "Bioenergy": 0.1302,
-      "Hydro": 0.3622,
-      "Solar": 0.0901,
-      "Wind": 0.4174
+      "Bioenergy": 0.13,
+      "Hydro": 0.3635,
+      "Solar": 0.0899,
+      "Wind": 0.4166
     },
     "2022": {
-      "Bioenergy": 0.1125,
-      "Hydro": 0.3102,
-      "Solar": 0.1405,
-      "Wind": 0.4369
+      "Bioenergy": 0.1123,
+      "Hydro": 0.311,
+      "Solar": 0.1403,
+      "Wind": 0.4364
     },
     "2023": {
-      "Bioenergy": 0.0722,
-      "Hydro": 0.2519,
-      "Solar": 0.1684,
-      "Wind": 0.5074
+      "Bioenergy": 0.0721,
+      "Hydro": 0.2526,
+      "Solar": 0.1683,
+      "Wind": 0.507
     },
     "2024": {
       "Bioenergy": 0.0513,
-      "Hydro": 0.1838,
-      "Solar": 0.2362,
-      "Wind": 0.5286
+      "Hydro": 0.1845,
+      "Solar": 0.236,
+      "Wind": 0.5282
     },
     "2025": {
       "Bioenergy": 0.0323,
-      "Hydro": 0.1114,
-      "Solar": 0.3316,
-      "Wind": 0.5247
+      "Hydro": 0.1088,
+      "Solar": 0.3205,
+      "Wind": 0.5384
     }
   },
   "LU": {
     "2019": {
-      "Bioenergy": 0.149,
-      "Hydro": 0.387,
-      "Solar": 0.1304,
-      "Wind": 0.3335
+      "Bioenergy": 0.1488,
+      "Hydro": 0.3883,
+      "Solar": 0.1301,
+      "Wind": 0.3328
     },
     "2020": {
-      "Bioenergy": 0.1647,
-      "Hydro": 0.3499,
-      "Solar": 0.132,
-      "Wind": 0.3534
+      "Bioenergy": 0.1644,
+      "Hydro": 0.3511,
+      "Solar": 0.1318,
+      "Wind": 0.3528
     },
     "2021": {
-      "Bioenergy": 0.1848,
-      "Hydro": 0.3436,
-      "Solar": 0.1527,
-      "Wind": 0.3189
+      "Bioenergy": 0.1845,
+      "Hydro": 0.3449,
+      "Solar": 0.1523,
+      "Wind": 0.3183
     },
     "2022": {
-      "Bioenergy": 0.1872,
-      "Hydro": 0.2883,
-      "Solar": 0.1961,
-      "Wind": 0.3285
+      "Bioenergy": 0.187,
+      "Hydro": 0.2892,
+      "Solar": 0.1958,
+      "Wind": 0.328
     },
     "2023": {
-      "Bioenergy": 0.1103,
-      "Hydro": 0.2882,
-      "Solar": 0.2008,
-      "Wind": 0.4008
+      "Bioenergy": 0.1102,
+      "Hydro": 0.289,
+      "Solar": 0.2005,
+      "Wind": 0.4003
     },
     "2024": {
-      "Bioenergy": 0.1378,
-      "Hydro": 0.292,
-      "Solar": 0.2202,
-      "Wind": 0.35
+      "Bioenergy": 0.1376,
+      "Hydro": 0.2931,
+      "Solar": 0.2198,
+      "Wind": 0.3494
     },
     "2025": {
       "Bioenergy": 0.1275,
-      "Hydro": 0.228,
-      "Solar": 0.3461,
-      "Wind": 0.2984
+      "Hydro": 0.2318,
+      "Solar": 0.3274,
+      "Wind": 0.3133
     }
   },
   "LV": {
     "2019": {
-      "Bioenergy": 0.1957,
-      "Hydro": 0.7133,
+      "Bioenergy": 0.1956,
+      "Hydro": 0.7135,
       "Solar": 0.0129,
-      "Wind": 0.0781
+      "Wind": 0.078
     },
     "2020": {
-      "Bioenergy": 0.1523,
-      "Hydro": 0.75,
+      "Bioenergy": 0.1522,
+      "Hydro": 0.7502,
       "Solar": 0.0186,
       "Wind": 0.0791
     },
     "2021": {
-      "Bioenergy": 0.1471,
-      "Hydro": 0.7507,
+      "Bioenergy": 0.147,
+      "Hydro": 0.7509,
       "Solar": 0.024,
       "Wind": 0.0782
     },
     "2022": {
       "Bioenergy": 0.1007,
-      "Hydro": 0.7505,
+      "Hydro": 0.7507,
       "Solar": 0.0407,
-      "Wind": 0.1081
+      "Wind": 0.108
     },
     "2023": {
-      "Bioenergy": 0.0583,
-      "Hydro": 0.7751,
-      "Solar": 0.0657,
-      "Wind": 0.101
+      "Bioenergy": 0.0582,
+      "Hydro": 0.7752,
+      "Solar": 0.0656,
+      "Wind": 0.1009
     },
     "2024": {
       "Bioenergy": 0.0896,
-      "Hydro": 0.6786,
-      "Solar": 0.124,
-      "Wind": 0.1077
+      "Hydro": 0.6789,
+      "Solar": 0.1239,
+      "Wind": 0.1076
     },
     "2025": {
       "Bioenergy": 0.0811,
-      "Hydro": 0.657,
-      "Solar": 0.2013,
-      "Wind": 0.0605
+      "Hydro": 0.6501,
+      "Solar": 0.2024,
+      "Wind": 0.0664
     }
   },
   "LY": {
@@ -5193,72 +5193,72 @@
   },
   "MD": {
     "2019": {
-      "Bioenergy": 0.0836,
-      "Hydro": 0.7093,
+      "Bioenergy": 0.0835,
+      "Hydro": 0.7097,
       "Solar": 0.0348,
-      "Wind": 0.1723
+      "Wind": 0.172
     },
     "2020": {
-      "Bioenergy": 0.0132,
-      "Hydro": 0.9174,
-      "Solar": 0.0099,
-      "Wind": 0.0596
+      "Bioenergy": 0.0131,
+      "Hydro": 0.9175,
+      "Solar": 0.0098,
+      "Wind": 0.0595
     },
     "2021": {
-      "Bioenergy": 0.0141,
-      "Hydro": 0.9152,
+      "Bioenergy": 0.014,
+      "Hydro": 0.9154,
       "Solar": 0.027,
-      "Wind": 0.0437
+      "Wind": 0.0436
     },
     "2022": {
-      "Bioenergy": 0.0475,
-      "Hydro": 0.6976,
-      "Solar": 0.0778,
-      "Wind": 0.1771
+      "Bioenergy": 0.0474,
+      "Hydro": 0.6981,
+      "Solar": 0.0777,
+      "Wind": 0.1768
     },
     "2023": {
       "Bioenergy": 0.0113,
-      "Hydro": 0.8461,
+      "Hydro": 0.8462,
       "Solar": 0.0159,
-      "Wind": 0.1267
+      "Wind": 0.1266
     },
     "2024": {
       "Bioenergy": 0.0122,
-      "Hydro": 0.6417,
-      "Solar": 0.1683,
-      "Wind": 0.1778
+      "Hydro": 0.6419,
+      "Solar": 0.1682,
+      "Wind": 0.1777
     },
     "2025": {
       "Bioenergy": 0.0081,
-      "Hydro": 0.6331,
-      "Solar": 0.325,
-      "Wind": 0.0338
+      "Hydro": 0.6334,
+      "Solar": 0.3238,
+      "Wind": 0.0347
     }
   },
   "ME": {
     "2019": {
       "Bioenergy": 0.0142,
-      "Hydro": 0.7939,
+      "Hydro": 0.7941,
       "Solar": 0.0196,
-      "Wind": 0.1723
+      "Wind": 0.1722
     },
     "2020": {
       "Bioenergy": 0.0143,
-      "Hydro": 0.7524,
-      "Solar": 0.0175,
-      "Wind": 0.2159
+      "Hydro": 0.7526,
+      "Solar": 0.0174,
+      "Wind": 0.2157
     },
     "2021": {
       "Bioenergy": 0.0075,
-      "Hydro": 0.8137,
+      "Hydro": 0.8138,
       "Solar": 0.0153,
-      "Wind": 0.1635
+      "Wind": 0.1634
     },
     "2022": {
       "Bioenergy": 0.0017,
-      "Hydro": 0.7948,
+      "Hydro": 0.7949,
       "Solar": 0.0025,
-      "Wind": 0.201
+      "Wind": 0.2009
     },
     "2023": {
       "Bioenergy": 0.0013,
@@ -5267,16 +5267,16 @@
       "Wind": 0.1506
     },
     "2024": {
-      "Bioenergy": 0.0069,
-      "Hydro": 0.7721,
+      "Bioenergy": 0.0068,
+      "Hydro": 0.7722,
       "Solar": 0.0571,
-      "Wind": 0.1639
+      "Wind": 0.1638
     },
     "2025": {
-      "Bioenergy": 0.0249,
-      "Hydro": 0.5751,
-      "Solar": 0.179,
-      "Wind": 0.221
+      "Bioenergy": 0.0235,
+      "Hydro": 0.5921,
+      "Solar": 0.1702,
+      "Wind": 0.2143
     }
   },
   "MG": {
@@ -5326,45 +5326,45 @@
   "MK": {
     "2019": {
       "Bioenergy": 0.0676,
-      "Hydro": 0.77,
+      "Hydro": 0.7703,
       "Solar": 0.0191,
-      "Wind": 0.1432
+      "Wind": 0.1431
     },
     "2020": {
-      "Bioenergy": 0.0716,
-      "Hydro": 0.75,
+      "Bioenergy": 0.0715,
+      "Hydro": 0.7504,
       "Solar": 0.0263,
-      "Wind": 0.1521
+      "Wind": 0.1519
     },
     "2021": {
-      "Bioenergy": 0.0648,
-      "Hydro": 0.768,
+      "Bioenergy": 0.0647,
+      "Hydro": 0.7684,
       "Solar": 0.0305,
-      "Wind": 0.1367
+      "Wind": 0.1365
     },
     "2022": {
       "Bioenergy": 0.0421,
-      "Hydro": 0.7823,
-      "Solar": 0.0425,
-      "Wind": 0.1331
+      "Hydro": 0.7825,
+      "Solar": 0.0424,
+      "Wind": 0.133
     },
     "2023": {
       "Bioenergy": 0.0466,
-      "Hydro": 0.7212,
+      "Hydro": 0.7213,
       "Solar": 0.1466,
       "Wind": 0.0855
     },
     "2024": {
       "Bioenergy": 0.0541,
-      "Hydro": 0.6823,
+      "Hydro": 0.6824,
       "Solar": 0.1422,
-      "Wind": 0.1214
+      "Wind": 0.1213
     },
     "2025": {
-      "Bioenergy": 0.0278,
-      "Hydro": 0.6086,
-      "Solar": 0.1787,
-      "Wind": 0.185
+      "Bioenergy": 0.0277,
+      "Hydro": 0.6095,
+      "Solar": 0.1755,
+      "Wind": 0.1873
     }
   },
   "ML": {
@@ -5514,7 +5514,7 @@
     },
     "2021": {
       "Bioenergy": 0.2166,
-      "Hydro": 0.4461,
+      "Hydro": 0.4462,
       "Solar": 0.143,
       "Wind": 0.1942
     },
@@ -5532,15 +5532,15 @@
     },
     "2024": {
       "Bioenergy": 0.1934,
-      "Hydro": 0.3583,
+      "Hydro": 0.3585,
       "Solar": 0.2294,
-      "Wind": 0.2188
+      "Wind": 0.2187
     },
     "2025": {
-      "Bioenergy": 0.1753,
-      "Hydro": 0.3228,
-      "Solar": 0.2825,
-      "Wind": 0.2194
+      "Bioenergy": 0.1767,
+      "Hydro": 0.3272,
+      "Solar": 0.2811,
+      "Wind": 0.2151
     }
   },
   "MQ": {
@@ -5677,46 +5677,46 @@
   },
   "MT": {
     "2019": {
-      "Bioenergy": 0.0877,
-      "Hydro": 0.5232,
-      "Solar": 0.102,
-      "Wind": 0.2871
+      "Bioenergy": 0.0874,
+      "Hydro": 0.5246,
+      "Solar": 0.1018,
+      "Wind": 0.2862
     },
     "2020": {
-      "Bioenergy": 0.0851,
-      "Hydro": 0.512,
-      "Solar": 0.1024,
-      "Wind": 0.3004
+      "Bioenergy": 0.0848,
+      "Hydro": 0.5137,
+      "Solar": 0.102,
+      "Wind": 0.2994
     },
     "2021": {
-      "Bioenergy": 0.0903,
-      "Hydro": 0.4973,
-      "Solar": 0.1115,
-      "Wind": 0.301
+      "Bioenergy": 0.09,
+      "Hydro": 0.4989,
+      "Solar": 0.111,
+      "Wind": 0.3001
     },
     "2022": {
-      "Bioenergy": 0.0564,
-      "Hydro": 0.2876,
-      "Solar": 0.4509,
-      "Wind": 0.205
+      "Bioenergy": 0.0563,
+      "Hydro": 0.2886,
+      "Solar": 0.4504,
+      "Wind": 0.2047
     },
     "2023": {
-      "Bioenergy": 0.0248,
-      "Hydro": 0.1541,
-      "Solar": 0.7052,
-      "Wind": 0.116
+      "Bioenergy": 0.0247,
+      "Hydro": 0.1547,
+      "Solar": 0.7048,
+      "Wind": 0.1158
     },
     "2024": {
       "Bioenergy": 0.0297,
-      "Hydro": 0.191,
-      "Solar": 0.6457,
-      "Wind": 0.1336
+      "Hydro": 0.192,
+      "Solar": 0.645,
+      "Wind": 0.1333
     },
     "2025": {
       "Bioenergy": 0.0273,
-      "Hydro": 0.1644,
-      "Solar": 0.6933,
-      "Wind": 0.1149
+      "Hydro": 0.1658,
+      "Solar": 0.6885,
+      "Wind": 0.1184
     }
   },
   "MU": {
@@ -5890,9 +5890,9 @@
     },
     "2025": {
       "Bioenergy": 0.0011,
-      "Hydro": 0.3806,
-      "Solar": 0.2955,
-      "Wind": 0.3228
+      "Hydro": 0.3807,
+      "Solar": 0.2954,
+      "Wind": 0.3227
     }
   },
   "MY": {
@@ -5933,9 +5933,9 @@
       "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0.109,
+      "Bioenergy": 0.1089,
       "Hydro": 0.8095,
-      "Solar": 0.0814,
+      "Solar": 0.0817,
       "Wind": 0
     }
   },
@@ -6197,29 +6197,29 @@
       "Wind": 0.3676
     },
     "2025": {
-      "Bioenergy": 0.4011,
-      "Hydro": 0.2001,
-      "Solar": 0.0307,
-      "Wind": 0.3681
+      "Bioenergy": 0.4014,
+      "Hydro": 0.1993,
+      "Solar": 0.0309,
+      "Wind": 0.3683
     }
   },
   "NL": {
     "2019": {
       "Bioenergy": 0.2236,
-      "Hydro": 0.0255,
-      "Solar": 0.2425,
-      "Wind": 0.5085
+      "Hydro": 0.0256,
+      "Solar": 0.2424,
+      "Wind": 0.5084
     },
     "2020": {
-      "Bioenergy": 0.2456,
+      "Bioenergy": 0.2457,
       "Hydro": 0.0078,
       "Solar": 0.2639,
       "Wind": 0.4826
     },
     "2021": {
       "Bioenergy": 0.2575,
-      "Hydro": 0.0153,
-      "Solar": 0.2974,
+      "Hydro": 0.0154,
+      "Solar": 0.2973,
       "Wind": 0.4298
     },
     "2022": {
@@ -6236,15 +6236,15 @@
     },
     "2024": {
       "Bioenergy": 0.0981,
-      "Hydro": 0.0032,
+      "Hydro": 0.0033,
       "Solar": 0.3872,
       "Wind": 0.5115
     },
     "2025": {
-      "Bioenergy": 0.089,
+      "Bioenergy": 0.0876,
       "Hydro": 0.0005,
-      "Solar": 0.533,
-      "Wind": 0.3775
+      "Solar": 0.5124,
+      "Wind": 0.3995
     }
   },
   "NO": {
@@ -6286,9 +6286,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9184,
+      "Hydro": 0.918,
       "Solar": 0,
-      "Wind": 0.0816
+      "Wind": 0.082
     }
   },
   "NP": {
@@ -6325,14 +6325,14 @@
     "2024": {
       "Bioenergy": 0.0051,
       "Hydro": 0.9444,
-      "Solar": 0.0309,
+      "Solar": 0.031,
       "Wind": 0.0195
     },
     "2025": {
       "Bioenergy": 0.005,
-      "Hydro": 0.9367,
-      "Solar": 0.0373,
-      "Wind": 0.0211
+      "Hydro": 0.9375,
+      "Solar": 0.0369,
+      "Wind": 0.0206
     }
   },
   "NR": {
@@ -6769,30 +6769,30 @@
       "Wind": 0.0556
     },
     "2025": {
-      "Bioenergy": 0.0072,
-      "Hydro": 0.5319,
-      "Solar": 0.3953,
-      "Wind": 0.0656
+      "Bioenergy": 0.0074,
+      "Hydro": 0.5427,
+      "Solar": 0.3886,
+      "Wind": 0.0613
     }
   },
   "PL": {
     "2019": {
-      "Bioenergy": 0.1058,
-      "Hydro": 0.1468,
-      "Solar": 0.0478,
-      "Wind": 0.6997
+      "Bioenergy": 0.1057,
+      "Hydro": 0.1472,
+      "Solar": 0.0477,
+      "Wind": 0.6994
     },
     "2020": {
-      "Bioenergy": 0.0963,
-      "Hydro": 0.156,
-      "Solar": 0.103,
-      "Wind": 0.6448
+      "Bioenergy": 0.0962,
+      "Hydro": 0.1564,
+      "Solar": 0.1029,
+      "Wind": 0.6445
     },
     "2021": {
       "Bioenergy": 0.081,
-      "Hydro": 0.0974,
+      "Hydro": 0.0976,
       "Solar": 0.1924,
-      "Wind": 0.6291
+      "Wind": 0.629
     },
     "2022": {
       "Bioenergy": 0.052,
@@ -6807,16 +6807,16 @@
       "Wind": 0.5489
     },
     "2024": {
-      "Bioenergy": 0.0521,
-      "Hydro": 0.0523,
+      "Bioenergy": 0.052,
+      "Hydro": 0.0524,
       "Solar": 0.3777,
-      "Wind": 0.5179
+      "Wind": 0.5178
     },
     "2025": {
-      "Bioenergy": 0.0588,
-      "Hydro": 0.0363,
-      "Solar": 0.4898,
-      "Wind": 0.4151
+      "Bioenergy": 0.0592,
+      "Hydro": 0.0358,
+      "Solar": 0.4714,
+      "Wind": 0.4335
     }
   },
   "PM": {
@@ -6903,8 +6903,8 @@
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.4476,
-      "Wind": 0.5524
+      "Solar": 0.4857,
+      "Wind": 0.5143
     }
   },
   "PS": {
@@ -6954,45 +6954,45 @@
   "PT": {
     "2019": {
       "Bioenergy": 0.1097,
-      "Hydro": 0.2976,
+      "Hydro": 0.2977,
       "Solar": 0.0575,
-      "Wind": 0.5353
+      "Wind": 0.5352
     },
     "2020": {
       "Bioenergy": 0.1169,
-      "Hydro": 0.3866,
+      "Hydro": 0.3867,
       "Solar": 0.0651,
       "Wind": 0.4313
     },
     "2021": {
       "Bioenergy": 0.1208,
-      "Hydro": 0.3503,
+      "Hydro": 0.3504,
       "Solar": 0.0815,
       "Wind": 0.4474
     },
     "2022": {
       "Bioenergy": 0.127,
-      "Hydro": 0.2418,
-      "Solar": 0.1357,
-      "Wind": 0.4954
+      "Hydro": 0.242,
+      "Solar": 0.1356,
+      "Wind": 0.4953
     },
     "2023": {
       "Bioenergy": 0.0908,
-      "Hydro": 0.3325,
+      "Hydro": 0.3327,
       "Solar": 0.1741,
-      "Wind": 0.4026
+      "Wind": 0.4025
     },
     "2024": {
       "Bioenergy": 0.0835,
-      "Hydro": 0.3393,
-      "Solar": 0.2011,
-      "Wind": 0.3761
+      "Hydro": 0.3395,
+      "Solar": 0.201,
+      "Wind": 0.376
     },
     "2025": {
-      "Bioenergy": 0.0737,
-      "Hydro": 0.3409,
-      "Solar": 0.2566,
-      "Wind": 0.3288
+      "Bioenergy": 0.0734,
+      "Hydro": 0.3395,
+      "Solar": 0.2498,
+      "Wind": 0.3373
     }
   },
   "PY": {
@@ -7132,7 +7132,7 @@
       "Bioenergy": 0.0196,
       "Hydro": 0.6439,
       "Solar": 0.0576,
-      "Wind": 0.279
+      "Wind": 0.2789
     },
     "2020": {
       "Bioenergy": 0.0231,
@@ -7144,7 +7144,7 @@
       "Bioenergy": 0.0252,
       "Hydro": 0.6667,
       "Solar": 0.0529,
-      "Wind": 0.2552
+      "Wind": 0.2551
     },
     "2022": {
       "Bioenergy": 0.0257,
@@ -7154,21 +7154,21 @@
     },
     "2023": {
       "Bioenergy": 0.0132,
-      "Hydro": 0.6462,
+      "Hydro": 0.6463,
       "Solar": 0.0766,
       "Wind": 0.264
     },
     "2024": {
       "Bioenergy": 0.0205,
-      "Hydro": 0.5589,
+      "Hydro": 0.559,
       "Solar": 0.1668,
-      "Wind": 0.2538
+      "Wind": 0.2537
     },
     "2025": {
-      "Bioenergy": 0.0213,
-      "Hydro": 0.4777,
-      "Solar": 0.2739,
-      "Wind": 0.2272
+      "Bioenergy": 0.0215,
+      "Hydro": 0.4773,
+      "Solar": 0.2687,
+      "Wind": 0.2324
     }
   },
   "RS": {
@@ -7186,15 +7186,15 @@
     },
     "2021": {
       "Bioenergy": 0.0246,
-      "Hydro": 0.8693,
+      "Hydro": 0.8694,
       "Solar": 0.005,
       "Wind": 0.1011
     },
     "2022": {
       "Bioenergy": 0.0318,
-      "Hydro": 0.8241,
+      "Hydro": 0.8242,
       "Solar": 0.0178,
-      "Wind": 0.1263
+      "Wind": 0.1262
     },
     "2023": {
       "Bioenergy": 0.0184,
@@ -7204,15 +7204,15 @@
     },
     "2024": {
       "Bioenergy": 0.025,
-      "Hydro": 0.8494,
+      "Hydro": 0.8495,
       "Solar": 0.0164,
-      "Wind": 0.1092
+      "Wind": 0.1091
     },
     "2025": {
-      "Bioenergy": 0.0325,
-      "Hydro": 0.8227,
-      "Solar": 0.01,
-      "Wind": 0.1347
+      "Bioenergy": 0.0327,
+      "Hydro": 0.8166,
+      "Solar": 0.0109,
+      "Wind": 0.1398
     }
   },
   "RU": {
@@ -7253,10 +7253,10 @@
       "Wind": 0.0243
     },
     "2025": {
-      "Bioenergy": 0.0038,
-      "Hydro": 0.963,
+      "Bioenergy": 0.0039,
+      "Hydro": 0.9625,
       "Solar": 0.0128,
-      "Wind": 0.0203
+      "Wind": 0.0208
     }
   },
   "RW": {
@@ -7518,8 +7518,8 @@
     },
     "2025": {
       "Bioenergy": 0.0471,
-      "Hydro": 0.5748,
-      "Solar": 0.0511,
+      "Hydro": 0.5757,
+      "Solar": 0.0502,
       "Wind": 0.327
     }
   },
@@ -7557,14 +7557,14 @@
     "2024": {
       "Bioenergy": 0.0004,
       "Hydro": 0.0015,
-      "Solar": 0.9968,
+      "Solar": 0.9969,
       "Wind": 0.0013
     },
     "2025": {
       "Bioenergy": 0.0031,
-      "Hydro": 0.0181,
-      "Solar": 0.9665,
-      "Wind": 0.0124
+      "Hydro": 0.0182,
+      "Solar": 0.9667,
+      "Wind": 0.012
     }
   },
   "SH": {
@@ -7614,25 +7614,25 @@
   "SI": {
     "2019": {
       "Bioenergy": 0.027,
-      "Hydro": 0.8924,
+      "Hydro": 0.8925,
       "Solar": 0.0656,
-      "Wind": 0.015
+      "Wind": 0.0149
     },
     "2020": {
       "Bioenergy": 0.0253,
-      "Hydro": 0.9033,
+      "Hydro": 0.9034,
       "Solar": 0.0602,
       "Wind": 0.0112
     },
     "2021": {
       "Bioenergy": 0.0157,
-      "Hydro": 0.9035,
+      "Hydro": 0.9036,
       "Solar": 0.0678,
-      "Wind": 0.013
+      "Wind": 0.0129
     },
     "2022": {
       "Bioenergy": 0.0302,
-      "Hydro": 0.8125,
+      "Hydro": 0.8126,
       "Solar": 0.1127,
       "Wind": 0.0445
     },
@@ -7649,35 +7649,35 @@
       "Wind": 0.0053
     },
     "2025": {
-      "Bioenergy": 0.0218,
-      "Hydro": 0.6885,
-      "Solar": 0.2888,
-      "Wind": 0.0009
+      "Bioenergy": 0.0236,
+      "Hydro": 0.6663,
+      "Solar": 0.3066,
+      "Wind": 0.0035
     }
   },
   "SK": {
     "2019": {
-      "Bioenergy": 0.1407,
-      "Hydro": 0.7416,
+      "Bioenergy": 0.1406,
+      "Hydro": 0.7417,
       "Solar": 0.0927,
-      "Wind": 0.025
+      "Wind": 0.0249
     },
     "2020": {
       "Bioenergy": 0.1516,
-      "Hydro": 0.7507,
+      "Hydro": 0.7508,
       "Solar": 0.0868,
-      "Wind": 0.0109
+      "Wind": 0.0108
     },
     "2021": {
       "Bioenergy": 0.1554,
-      "Hydro": 0.7355,
+      "Hydro": 0.7356,
       "Solar": 0.0909,
-      "Wind": 0.0182
+      "Wind": 0.0181
     },
     "2022": {
       "Bioenergy": 0.1474,
-      "Hydro": 0.7118,
-      "Solar": 0.1131,
+      "Hydro": 0.7119,
+      "Solar": 0.113,
       "Wind": 0.0277
     },
     "2023": {
@@ -7693,9 +7693,9 @@
       "Wind": 0.0002
     },
     "2025": {
-      "Bioenergy": 0.1981,
-      "Hydro": 0.6487,
-      "Solar": 0.1533,
+      "Bioenergy": 0.1959,
+      "Hydro": 0.6541,
+      "Solar": 0.15,
       "Wind": 0
     }
   },
@@ -8001,9 +8001,9 @@
       "Wind": 0.0367
     },
     "2025": {
-      "Bioenergy": 0.2823,
-      "Hydro": 0.3313,
-      "Solar": 0.2903,
+      "Bioenergy": 0.2825,
+      "Hydro": 0.3309,
+      "Solar": 0.2905,
       "Wind": 0.096
     }
   },
@@ -8260,15 +8260,15 @@
     },
     "2024": {
       "Bioenergy": 0.3584,
-      "Hydro": 0.2689,
+      "Hydro": 0.269,
       "Solar": 0.2152,
       "Wind": 0.1575
     },
     "2025": {
-      "Bioenergy": 0.2857,
-      "Hydro": 0.2629,
-      "Solar": 0.3131,
-      "Wind": 0.1383
+      "Bioenergy": 0.2784,
+      "Hydro": 0.2665,
+      "Solar": 0.3134,
+      "Wind": 0.1417
     }
   },
   "TJ": {
@@ -8309,10 +8309,10 @@
       "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0.0004,
-      "Hydro": 0.996,
-      "Solar": 0.002,
-      "Wind": 0.0016
+      "Bioenergy": 0.0001,
+      "Hydro": 0.9989,
+      "Solar": 0.0005,
+      "Wind": 0.0005
     }
   },
   "TL": {
@@ -8531,7 +8531,7 @@
     "2025": {
       "Bioenergy": 0.0539,
       "Hydro": 0.4134,
-      "Solar": 0.2639,
+      "Solar": 0.2638,
       "Wind": 0.2689
     }
   },
@@ -8793,10 +8793,10 @@
       "Wind": 0.4378
     },
     "2025": {
-      "Bioenergy": 0.0398,
-      "Hydro": 0.2132,
-      "Solar": 0.36,
-      "Wind": 0.387
+      "Bioenergy": 0.04,
+      "Hydro": 0.2104,
+      "Solar": 0.3592,
+      "Wind": 0.3903
     }
   },
   "UY": {
@@ -8837,10 +8837,10 @@
       "Wind": 0.3343
     },
     "2025": {
-      "Bioenergy": 0.143,
-      "Hydro": 0.4756,
-      "Solar": 0.0382,
-      "Wind": 0.3432
+      "Bioenergy": 0.1417,
+      "Hydro": 0.4808,
+      "Solar": 0.0386,
+      "Wind": 0.339
     }
   },
   "UZ": {
@@ -8882,9 +8882,9 @@
     },
     "2025": {
       "Bioenergy": 0.0039,
-      "Hydro": 0.9591,
-      "Solar": 0.0216,
-      "Wind": 0.0154
+      "Hydro": 0.9598,
+      "Solar": 0.0214,
+      "Wind": 0.0149
     }
   },
   "VC": {
@@ -9102,9 +9102,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.7076,
-      "Solar": 0.1973,
-      "Wind": 0.0951
+      "Hydro": 0.722,
+      "Solar": 0.182,
+      "Wind": 0.0959
     }
   },
   "VU": {
@@ -9198,7 +9198,7 @@
   "XK": {
     "2019": {
       "Bioenergy": 0.0018,
-      "Hydro": 0.6738,
+      "Hydro": 0.6739,
       "Solar": 0.034,
       "Wind": 0.2904
     },
@@ -9215,28 +9215,28 @@
       "Wind": 0.2904
     },
     "2022": {
-      "Bioenergy": 0.0265,
-      "Hydro": 0.3308,
-      "Solar": 0.0182,
-      "Wind": 0.6245
+      "Bioenergy": 0.0226,
+      "Hydro": 0.4051,
+      "Solar": 0.0155,
+      "Wind": 0.5568
     },
     "2023": {
-      "Bioenergy": 0.0236,
-      "Hydro": 0.4715,
-      "Solar": 0.041,
-      "Wind": 0.464
+      "Bioenergy": 0.0235,
+      "Hydro": 0.4804,
+      "Solar": 0.0409,
+      "Wind": 0.4552
     },
     "2024": {
       "Bioenergy": 0.0281,
-      "Hydro": 0.3911,
-      "Solar": 0.0434,
-      "Wind": 0.5374
+      "Hydro": 0.3916,
+      "Solar": 0.0433,
+      "Wind": 0.537
     },
     "2025": {
-      "Bioenergy": 0.0352,
-      "Hydro": 0.4361,
-      "Solar": 0.1177,
-      "Wind": 0.411
+      "Bioenergy": 0.0351,
+      "Hydro": 0.4376,
+      "Solar": 0.1143,
+      "Wind": 0.413
     }
   },
   "YE": {