@digital4better/data 1.3.18 → 1.3.20

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

@@ -75,16 +75,16 @@
       "Wind": 0.1321
     },
     "2024": {
-      "Bioenergy": 0.0379,
-      "Hydro": 0.6672,
+      "Bioenergy": 0.0378,
+      "Hydro": 0.6674,
       "Solar": 0.1617,
       "Wind": 0.1331
     },
     "2025": {
-      "Bioenergy": 0.0347,
-      "Hydro": 0.6262,
-      "Solar": 0.1969,
-      "Wind": 0.1421
+      "Bioenergy": 0.035,
+      "Hydro": 0.6279,
+      "Solar": 0.1989,
+      "Wind": 0.1382
     }
   },
   "AG": {
@@ -134,7 +134,7 @@
   "AL": {
     "2019": {
       "Bioenergy": 0.0112,
-      "Hydro": 0.9356,
+      "Hydro": 0.9357,
       "Solar": 0.0159,
       "Wind": 0.0372
     },
@@ -145,7 +145,7 @@
       "Wind": 0.0421
     },
     "2021": {
-      "Bioenergy": 0.0121,
+      "Bioenergy": 0.012,
       "Hydro": 0.9284,
       "Solar": 0.0197,
       "Wind": 0.0399
@@ -160,19 +160,19 @@
       "Bioenergy": 0.0109,
       "Hydro": 0.9113,
       "Solar": 0.0284,
-      "Wind": 0.0494
+      "Wind": 0.0493
     },
     "2024": {
-      "Bioenergy": 0.011,
-      "Hydro": 0.9063,
+      "Bioenergy": 0.0109,
+      "Hydro": 0.9061,
       "Solar": 0.0332,
-      "Wind": 0.0495
+      "Wind": 0.0499
     },
     "2025": {
-      "Bioenergy": 0.0108,
-      "Hydro": 0.8986,
-      "Solar": 0.0453,
-      "Wind": 0.0453
+      "Bioenergy": 0.0107,
+      "Hydro": 0.8978,
+      "Solar": 0.0466,
+      "Wind": 0.0449
     }
   },
   "AM": {
@@ -214,8 +214,8 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.7741,
-      "Solar": 0.2259,
+      "Hydro": 0.7739,
+      "Solar": 0.2261,
       "Wind": 0
     }
   },
@@ -301,10 +301,10 @@
       "Wind": 0.2828
     },
     "2025": {
-      "Bioenergy": 0.0275,
-      "Hydro": 0.5714,
-      "Solar": 0.081,
-      "Wind": 0.3201
+      "Bioenergy": 0.0278,
+      "Hydro": 0.5736,
+      "Solar": 0.0805,
+      "Wind": 0.3182
     }
   },
   "AS": {
@@ -360,7 +360,7 @@
     },
     "2020": {
       "Bioenergy": 0.0345,
-      "Hydro": 0.7844,
+      "Hydro": 0.7845,
       "Solar": 0.0362,
       "Wind": 0.1449
     },
@@ -389,10 +389,10 @@
       "Wind": 0.1511
     },
     "2025": {
-      "Bioenergy": 0.0316,
-      "Hydro": 0.6443,
-      "Solar": 0.1826,
-      "Wind": 0.1415
+      "Bioenergy": 0.0305,
+      "Hydro": 0.6416,
+      "Solar": 0.1893,
+      "Wind": 0.1386
     }
   },
   "AU": {
@@ -433,10 +433,10 @@
       "Wind": 0.3444
     },
     "2025": {
-      "Bioenergy": 0.0038,
-      "Hydro": 0.1338,
-      "Solar": 0.4818,
-      "Wind": 0.3806
+      "Bioenergy": 0.0043,
+      "Hydro": 0.134,
+      "Solar": 0.4767,
+      "Wind": 0.385
     }
   },
   "AW": {
@@ -522,8 +522,8 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.8471,
-      "Solar": 0.1529,
+      "Hydro": 0.847,
+      "Solar": 0.153,
       "Wind": 0
     }
   },
@@ -566,9 +566,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.8611,
-      "Solar": 0.102,
-      "Wind": 0.0369
+      "Hydro": 0.8349,
+      "Solar": 0.1292,
+      "Wind": 0.036
     }
   },
   "BB": {
@@ -647,16 +647,16 @@
       "Wind": 0.1934
     },
     "2024": {
-      "Bioenergy": 0.0504,
-      "Hydro": 0.4305,
+      "Bioenergy": 0.0502,
+      "Hydro": 0.4306,
       "Solar": 0.3423,
       "Wind": 0.1768
     },
     "2025": {
-      "Bioenergy": 0.0457,
-      "Hydro": 0.353,
-      "Solar": 0.4136,
-      "Wind": 0.1876
+      "Bioenergy": 0.0455,
+      "Hydro": 0.3683,
+      "Solar": 0.4063,
+      "Wind": 0.1799
     }
   },
   "BE": {
@@ -691,16 +691,16 @@
       "Wind": 0.6097
     },
     "2024": {
-      "Bioenergy": 0.0375,
-      "Hydro": 0.08,
-      "Solar": 0.3401,
-      "Wind": 0.5425
+      "Bioenergy": 0.0374,
+      "Hydro": 0.0799,
+      "Solar": 0.34,
+      "Wind": 0.5428
     },
     "2025": {
-      "Bioenergy": 0.0364,
-      "Hydro": 0.0794,
-      "Solar": 0.4769,
-      "Wind": 0.4073
+      "Bioenergy": 0.0367,
+      "Hydro": 0.0781,
+      "Solar": 0.487,
+      "Wind": 0.3981
     }
   },
   "BF": {
@@ -780,15 +780,15 @@
     },
     "2024": {
       "Bioenergy": 0.0171,
-      "Hydro": 0.3193,
-      "Solar": 0.5028,
-      "Wind": 0.1609
+      "Hydro": 0.3192,
+      "Solar": 0.5027,
+      "Wind": 0.161
     },
     "2025": {
-      "Bioenergy": 0.011,
-      "Hydro": 0.2509,
-      "Solar": 0.632,
-      "Wind": 0.1062
+      "Bioenergy": 0.0108,
+      "Hydro": 0.247,
+      "Solar": 0.6403,
+      "Wind": 0.1019
     }
   },
   "BH": {
@@ -1049,10 +1049,10 @@
       "Wind": 0.1289
     },
     "2025": {
-      "Bioenergy": 0.0207,
-      "Hydro": 0.8374,
-      "Solar": 0.0796,
-      "Wind": 0.0623
+      "Bioenergy": 0.0248,
+      "Hydro": 0.8292,
+      "Solar": 0.0807,
+      "Wind": 0.0652
     }
   },
   "BR": {
@@ -1093,10 +1093,10 @@
       "Wind": 0.1724
     },
     "2025": {
-      "Bioenergy": 0.0116,
-      "Hydro": 0.6764,
-      "Solar": 0.1368,
-      "Wind": 0.1752
+      "Bioenergy": 0.0124,
+      "Hydro": 0.666,
+      "Solar": 0.1388,
+      "Wind": 0.1828
     }
   },
   "BS": {
@@ -1246,7 +1246,7 @@
     },
     "2021": {
       "Bioenergy": 0.2409,
-      "Hydro": 0.4051,
+      "Hydro": 0.405,
       "Solar": 0.1865,
       "Wind": 0.1676
     },
@@ -1263,16 +1263,16 @@
       "Wind": 0.1517
     },
     "2024": {
-      "Bioenergy": 0.2935,
-      "Hydro": 0.369,
+      "Bioenergy": 0.2934,
+      "Hydro": 0.3688,
       "Solar": 0.1865,
-      "Wind": 0.1511
+      "Wind": 0.1513
     },
     "2025": {
-      "Bioenergy": 0.4571,
-      "Hydro": 0.3087,
+      "Bioenergy": 0.4575,
+      "Hydro": 0.3085,
       "Solar": 0.0782,
-      "Wind": 0.1561
+      "Wind": 0.1558
     }
   },
   "BZ": {
@@ -1313,10 +1313,10 @@
       "Wind": 0.0539
     },
     "2025": {
-      "Bioenergy": 0.2212,
-      "Hydro": 0.665,
+      "Bioenergy": 0.2218,
+      "Hydro": 0.6632,
       "Solar": 0.0582,
-      "Wind": 0.0556
+      "Wind": 0.0567
     }
   },
   "CA": {
@@ -1357,10 +1357,10 @@
       "Wind": 0.1145
     },
     "2025": {
-      "Bioenergy": 0.0225,
-      "Hydro": 0.8355,
-      "Solar": 0.016,
-      "Wind": 0.126
+      "Bioenergy": 0.0242,
+      "Hydro": 0.8362,
+      "Solar": 0.0175,
+      "Wind": 0.1221
     }
   },
   "CD": {
@@ -1533,10 +1533,10 @@
       "Wind": 0.0069
     },
     "2025": {
-      "Bioenergy": 0.0023,
-      "Hydro": 0.7823,
-      "Solar": 0.2022,
-      "Wind": 0.0133
+      "Bioenergy": 0.002,
+      "Hydro": 0.7822,
+      "Solar": 0.2039,
+      "Wind": 0.0119
     }
   },
   "CI": {
@@ -1666,9 +1666,9 @@
     },
     "2025": {
       "Bioenergy": 0.0403,
-      "Hydro": 0.3887,
-      "Solar": 0.3465,
-      "Wind": 0.2246
+      "Hydro": 0.3901,
+      "Solar": 0.3445,
+      "Wind": 0.2251
     }
   },
   "CM": {
@@ -1749,14 +1749,14 @@
     "2024": {
       "Bioenergy": 0.06,
       "Hydro": 0.3876,
-      "Solar": 0.2523,
+      "Solar": 0.2524,
       "Wind": 0.3
     },
     "2025": {
-      "Bioenergy": 0.051,
-      "Hydro": 0.3336,
-      "Solar": 0.3205,
-      "Wind": 0.2949
+      "Bioenergy": 0.0536,
+      "Hydro": 0.3436,
+      "Solar": 0.3227,
+      "Wind": 0.2801
     }
   },
   "CO": {
@@ -1798,8 +1798,8 @@
     },
     "2025": {
       "Bioenergy": 0.0001,
-      "Hydro": 0.9379,
-      "Solar": 0.0588,
+      "Hydro": 0.938,
+      "Solar": 0.0586,
       "Wind": 0.0033
     }
   },
@@ -1841,10 +1841,10 @@
       "Wind": 0.1275
     },
     "2025": {
-      "Bioenergy": 0.0052,
-      "Hydro": 0.8458,
-      "Solar": 0.001,
-      "Wind": 0.148
+      "Bioenergy": 0.0046,
+      "Hydro": 0.8519,
+      "Solar": 0.0009,
+      "Wind": 0.1426
     }
   },
   "CU": {
@@ -1975,8 +1975,8 @@
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.8666,
-      "Wind": 0.1334
+      "Solar": 0.8823,
+      "Wind": 0.1177
     }
   },
   "CZ": {
@@ -2017,16 +2017,16 @@
       "Wind": 0.0743
     },
     "2025": {
-      "Bioenergy": 0.2623,
-      "Hydro": 0.1597,
-      "Solar": 0.527,
-      "Wind": 0.051
+      "Bioenergy": 0.2618,
+      "Hydro": 0.1526,
+      "Solar": 0.5371,
+      "Wind": 0.0486
     }
   },
   "DE": {
     "2019": {
       "Bioenergy": 0.1829,
-      "Hydro": 0.088,
+      "Hydro": 0.0881,
       "Solar": 0.1978,
       "Wind": 0.5313
     },
@@ -2049,22 +2049,22 @@
       "Wind": 0.4975
     },
     "2023": {
-      "Bioenergy": 0.1586,
+      "Bioenergy": 0.1587,
       "Hydro": 0.0868,
       "Solar": 0.2434,
       "Wind": 0.5111
     },
     "2024": {
-      "Bioenergy": 0.1521,
-      "Hydro": 0.0997,
-      "Solar": 0.2697,
-      "Wind": 0.4786
+      "Bioenergy": 0.1477,
+      "Hydro": 0.0963,
+      "Solar": 0.2661,
+      "Wind": 0.4899
     },
     "2025": {
-      "Bioenergy": 0.1442,
-      "Hydro": 0.0791,
-      "Solar": 0.3743,
-      "Wind": 0.4024
+      "Bioenergy": 0.1425,
+      "Hydro": 0.0814,
+      "Solar": 0.386,
+      "Wind": 0.3901
     }
   },
   "DJ": {
@@ -2115,7 +2115,7 @@
     "2019": {
       "Bioenergy": 0.1705,
       "Hydro": 0.0484,
-      "Solar": 0.0547,
+      "Solar": 0.0548,
       "Wind": 0.7264
     },
     "2020": {
@@ -2133,7 +2133,7 @@
     "2022": {
       "Bioenergy": 0.1599,
       "Hydro": 0.0183,
-      "Solar": 0.0907,
+      "Solar": 0.0906,
       "Wind": 0.7312
     },
     "2023": {
@@ -2144,15 +2144,15 @@
     },
     "2024": {
       "Bioenergy": 0.1375,
-      "Hydro": 0.0247,
-      "Solar": 0.1362,
-      "Wind": 0.7017
+      "Hydro": 0.0246,
+      "Solar": 0.1361,
+      "Wind": 0.7018
     },
     "2025": {
-      "Bioenergy": 0.1166,
-      "Hydro": 0.0459,
-      "Solar": 0.2121,
-      "Wind": 0.6253
+      "Bioenergy": 0.1103,
+      "Hydro": 0.0475,
+      "Solar": 0.2219,
+      "Wind": 0.6203
     }
   },
   "DM": {
@@ -2237,10 +2237,10 @@
       "Wind": 0.2476
     },
     "2025": {
-      "Bioenergy": 0.0462,
-      "Hydro": 0.3237,
-      "Solar": 0.3497,
-      "Wind": 0.2804
+      "Bioenergy": 0.0453,
+      "Hydro": 0.3174,
+      "Solar": 0.3501,
+      "Wind": 0.2872
     }
   },
   "DZ": {
@@ -2326,27 +2326,27 @@
     },
     "2025": {
       "Bioenergy": 0.0003,
-      "Hydro": 0.9887,
-      "Solar": 0.003,
+      "Hydro": 0.9889,
+      "Solar": 0.0029,
       "Wind": 0.008
     }
   },
   "EE": {
     "2019": {
       "Bioenergy": 0.3153,
-      "Hydro": 0.196,
+      "Hydro": 0.1959,
       "Solar": 0.0375,
       "Wind": 0.4512
     },
     "2020": {
-      "Bioenergy": 0.2353,
-      "Hydro": 0.2296,
+      "Bioenergy": 0.2354,
+      "Hydro": 0.2295,
       "Solar": 0.0867,
       "Wind": 0.4484
     },
     "2021": {
-      "Bioenergy": 0.223,
-      "Hydro": 0.1843,
+      "Bioenergy": 0.2229,
+      "Hydro": 0.1842,
       "Solar": 0.1682,
       "Wind": 0.4246
     },
@@ -2363,16 +2363,16 @@
       "Wind": 0.3726
     },
     "2024": {
-      "Bioenergy": 0.1396,
-      "Hydro": 0.1357,
-      "Solar": 0.3073,
-      "Wind": 0.4173
+      "Bioenergy": 0.1395,
+      "Hydro": 0.1356,
+      "Solar": 0.3071,
+      "Wind": 0.4178
     },
     "2025": {
-      "Bioenergy": 0.1247,
-      "Hydro": 0.1066,
-      "Solar": 0.3912,
-      "Wind": 0.3775
+      "Bioenergy": 0.1199,
+      "Hydro": 0.1103,
+      "Solar": 0.4039,
+      "Wind": 0.3658
     }
   },
   "EG": {
@@ -2414,9 +2414,9 @@
     },
     "2025": {
       "Bioenergy": 0.0036,
-      "Hydro": 0.5027,
-      "Solar": 0.2466,
-      "Wind": 0.247
+      "Hydro": 0.5034,
+      "Solar": 0.2471,
+      "Wind": 0.2458
     }
   },
   "ER": {
@@ -2501,10 +2501,10 @@
       "Wind": 0.3979
     },
     "2025": {
-      "Bioenergy": 0.0236,
-      "Hydro": 0.2195,
-      "Solar": 0.4122,
-      "Wind": 0.3446
+      "Bioenergy": 0.024,
+      "Hydro": 0.2088,
+      "Solar": 0.4292,
+      "Wind": 0.3381
     }
   },
   "ET": {
@@ -2586,13 +2586,13 @@
       "Bioenergy": 0.209,
       "Hydro": 0.3272,
       "Solar": 0.0315,
-      "Wind": 0.4323
+      "Wind": 0.4324
     },
     "2025": {
-      "Bioenergy": 0.2137,
-      "Hydro": 0.2969,
-      "Solar": 0.0501,
-      "Wind": 0.4392
+      "Bioenergy": 0.2048,
+      "Hydro": 0.3053,
+      "Solar": 0.0546,
+      "Wind": 0.4353
     }
   },
   "FJ": {
@@ -2765,10 +2765,10 @@
       "Wind": 0.3414
     },
     "2025": {
-      "Bioenergy": 0.0211,
-      "Hydro": 0.3997,
-      "Solar": 0.2537,
-      "Wind": 0.3255
+      "Bioenergy": 0.0209,
+      "Hydro": 0.3912,
+      "Solar": 0.2661,
+      "Wind": 0.3218
     }
   },
   "GA": {
@@ -2818,7 +2818,7 @@
   "GB": {
     "2019": {
       "Bioenergy": 0.1779,
-      "Hydro": 0.0712,
+      "Hydro": 0.0711,
       "Solar": 0.1231,
       "Wind": 0.6278
     },
@@ -2847,16 +2847,16 @@
       "Wind": 0.7013
     },
     "2024": {
-      "Bioenergy": 0.1511,
-      "Hydro": 0.0741,
+      "Bioenergy": 0.151,
+      "Hydro": 0.074,
       "Solar": 0.1272,
-      "Wind": 0.6476
+      "Wind": 0.6478
     },
     "2025": {
-      "Bioenergy": 0.1568,
-      "Hydro": 0.0623,
-      "Solar": 0.1942,
-      "Wind": 0.5867
+      "Bioenergy": 0.1576,
+      "Hydro": 0.0621,
+      "Solar": 0.1994,
+      "Wind": 0.5809
     }
   },
   "GD": {
@@ -2941,10 +2941,10 @@
       "Wind": 0.0182
     },
     "2025": {
-      "Bioenergy": 0.0026,
-      "Hydro": 0.9673,
-      "Solar": 0.0102,
-      "Wind": 0.0199
+      "Bioenergy": 0.0023,
+      "Hydro": 0.9707,
+      "Solar": 0.0088,
+      "Wind": 0.0182
     }
   },
   "GF": {
@@ -3327,20 +3327,20 @@
     "2023": {
       "Bioenergy": 0.0064,
       "Hydro": 0.1879,
-      "Solar": 0.3611,
+      "Solar": 0.3612,
       "Wind": 0.4446
     },
     "2024": {
-      "Bioenergy": 0.0015,
+      "Bioenergy": 0.0014,
       "Hydro": 0.1142,
       "Solar": 0.4489,
-      "Wind": 0.4354
+      "Wind": 0.4355
     },
     "2025": {
-      "Bioenergy": 0.0009,
-      "Hydro": 0.0927,
-      "Solar": 0.5347,
-      "Wind": 0.3716
+      "Bioenergy": 0.0008,
+      "Hydro": 0.0909,
+      "Solar": 0.537,
+      "Wind": 0.3712
     }
   },
   "GT": {
@@ -3551,16 +3551,16 @@
       "Wind": 0.2479
     },
     "2024": {
-      "Bioenergy": 0.1059,
-      "Hydro": 0.3949,
-      "Solar": 0.2578,
+      "Bioenergy": 0.1057,
+      "Hydro": 0.3951,
+      "Solar": 0.2579,
       "Wind": 0.2413
     },
     "2025": {
-      "Bioenergy": 0.0944,
-      "Hydro": 0.3471,
-      "Solar": 0.3109,
-      "Wind": 0.2476
+      "Bioenergy": 0.0942,
+      "Hydro": 0.3528,
+      "Solar": 0.3132,
+      "Wind": 0.2398
     }
   },
   "HN": {
@@ -3601,10 +3601,10 @@
       "Wind": 0.141
     },
     "2025": {
-      "Bioenergy": 0.2441,
-      "Hydro": 0.4245,
+      "Bioenergy": 0.2442,
+      "Hydro": 0.4244,
       "Solar": 0.1903,
-      "Wind": 0.1411
+      "Wind": 0.1412
     }
   },
   "HR": {
@@ -3627,28 +3627,28 @@
       "Wind": 0.2351
     },
     "2022": {
-      "Bioenergy": 0.0846,
+      "Bioenergy": 0.0847,
       "Hydro": 0.5612,
       "Solar": 0.0516,
       "Wind": 0.3025
     },
     "2023": {
       "Bioenergy": 0.0596,
-      "Hydro": 0.6401,
+      "Hydro": 0.6402,
       "Solar": 0.0515,
       "Wind": 0.2487
     },
     "2024": {
-      "Bioenergy": 0.0633,
-      "Hydro": 0.5499,
+      "Bioenergy": 0.0632,
+      "Hydro": 0.5497,
       "Solar": 0.1121,
-      "Wind": 0.2746
+      "Wind": 0.275
     },
     "2025": {
-      "Bioenergy": 0.0589,
-      "Hydro": 0.4722,
-      "Solar": 0.172,
-      "Wind": 0.2969
+      "Bioenergy": 0.0594,
+      "Hydro": 0.4631,
+      "Solar": 0.1799,
+      "Wind": 0.2976
     }
   },
   "HT": {
@@ -3705,38 +3705,38 @@
     "2020": {
       "Bioenergy": 0.1611,
       "Hydro": 0.2775,
-      "Solar": 0.3365,
-      "Wind": 0.2249
+      "Solar": 0.3366,
+      "Wind": 0.2248
     },
     "2021": {
       "Bioenergy": 0.1478,
       "Hydro": 0.2309,
       "Solar": 0.4306,
-      "Wind": 0.1908
+      "Wind": 0.1907
     },
     "2022": {
       "Bioenergy": 0.1387,
       "Hydro": 0.1865,
-      "Solar": 0.4906,
-      "Wind": 0.1842
+      "Solar": 0.4907,
+      "Wind": 0.1841
     },
     "2023": {
       "Bioenergy": 0.0846,
       "Hydro": 0.1675,
       "Solar": 0.5818,
-      "Wind": 0.1661
+      "Wind": 0.166
     },
     "2024": {
-      "Bioenergy": 0.0805,
-      "Hydro": 0.1383,
-      "Solar": 0.645,
-      "Wind": 0.1362
+      "Bioenergy": 0.0804,
+      "Hydro": 0.1381,
+      "Solar": 0.6447,
+      "Wind": 0.1368
     },
     "2025": {
-      "Bioenergy": 0.0903,
-      "Hydro": 0.0828,
-      "Solar": 0.743,
-      "Wind": 0.0839
+      "Bioenergy": 0.0875,
+      "Hydro": 0.0777,
+      "Solar": 0.7557,
+      "Wind": 0.0791
     }
   },
   "ID": {
@@ -3779,8 +3779,8 @@
     "2025": {
       "Bioenergy": 0.3542,
       "Hydro": 0.6196,
-      "Solar": 0.0084,
-      "Wind": 0.0178
+      "Solar": 0.0085,
+      "Wind": 0.0177
     }
   },
   "IE": {
@@ -3792,15 +3792,15 @@
     },
     "2020": {
       "Bioenergy": 0.0186,
-      "Hydro": 0.1144,
+      "Hydro": 0.1143,
       "Solar": 0.0097,
-      "Wind": 0.8573
+      "Wind": 0.8574
     },
     "2021": {
       "Bioenergy": 0.0187,
       "Hydro": 0.112,
       "Solar": 0.0123,
-      "Wind": 0.857
+      "Wind": 0.8571
     },
     "2022": {
       "Bioenergy": 0.016,
@@ -3816,15 +3816,15 @@
     },
     "2024": {
       "Bioenergy": 0.0179,
-      "Hydro": 0.1136,
-      "Solar": 0.0758,
-      "Wind": 0.7927
+      "Hydro": 0.1135,
+      "Solar": 0.0757,
+      "Wind": 0.7929
     },
     "2025": {
-      "Bioenergy": 0.0197,
-      "Hydro": 0.1057,
-      "Solar": 0.1357,
-      "Wind": 0.7388
+      "Bioenergy": 0.0199,
+      "Hydro": 0.1044,
+      "Solar": 0.143,
+      "Wind": 0.7326
     }
   },
   "IL": {
@@ -3909,10 +3909,10 @@
       "Wind": 0.212
     },
     "2025": {
-      "Bioenergy": 0.0321,
-      "Hydro": 0.3607,
-      "Solar": 0.3458,
-      "Wind": 0.2614
+      "Bioenergy": 0.031,
+      "Hydro": 0.3707,
+      "Solar": 0.3277,
+      "Wind": 0.2706
     }
   },
   "IQ": {
@@ -4058,7 +4058,7 @@
       "Bioenergy": 0.1634,
       "Hydro": 0.4249,
       "Solar": 0.22,
-      "Wind": 0.1918
+      "Wind": 0.1917
     },
     "2021": {
       "Bioenergy": 0.1585,
@@ -4076,19 +4076,19 @@
       "Bioenergy": 0.1324,
       "Hydro": 0.3577,
       "Solar": 0.2701,
-      "Wind": 0.2399
+      "Wind": 0.2398
     },
     "2024": {
-      "Bioenergy": 0.1179,
-      "Hydro": 0.3957,
+      "Bioenergy": 0.1178,
+      "Hydro": 0.3956,
       "Solar": 0.2813,
-      "Wind": 0.205
+      "Wind": 0.2053
     },
     "2025": {
-      "Bioenergy": 0.1048,
-      "Hydro": 0.2966,
-      "Solar": 0.3984,
-      "Wind": 0.2002
+      "Bioenergy": 0.1042,
+      "Hydro": 0.2933,
+      "Solar": 0.4073,
+      "Wind": 0.1953
     }
   },
   "JM": {
@@ -4217,10 +4217,10 @@
       "Wind": 0.0718
     },
     "2025": {
-      "Bioenergy": 0.2154,
-      "Hydro": 0.2657,
-      "Solar": 0.4366,
-      "Wind": 0.0823
+      "Bioenergy": 0.1997,
+      "Hydro": 0.2499,
+      "Solar": 0.4784,
+      "Wind": 0.072
     }
   },
   "KE": {
@@ -4261,10 +4261,10 @@
       "Wind": 0.2855
     },
     "2025": {
-      "Bioenergy": 0.0527,
-      "Hydro": 0.5765,
-      "Solar": 0.0712,
-      "Wind": 0.2996
+      "Bioenergy": 0.0512,
+      "Hydro": 0.578,
+      "Solar": 0.07,
+      "Wind": 0.3008
     }
   },
   "KG": {
@@ -4307,8 +4307,8 @@
     "2025": {
       "Bioenergy": 0.0018,
       "Hydro": 0.982,
-      "Solar": 0.009,
-      "Wind": 0.0072
+      "Solar": 0.0091,
+      "Wind": 0.0071
     }
   },
   "KH": {
@@ -4344,15 +4344,15 @@
     },
     "2024": {
       "Bioenergy": 0.0307,
-      "Hydro": 0.8606,
+      "Hydro": 0.8607,
       "Solar": 0.0666,
       "Wind": 0.0421
     },
     "2025": {
-      "Bioenergy": 0.0298,
-      "Hydro": 0.8441,
-      "Solar": 0.0796,
-      "Wind": 0.0465
+      "Bioenergy": 0.0299,
+      "Hydro": 0.8442,
+      "Solar": 0.0805,
+      "Wind": 0.0454
     }
   },
   "KI": {
@@ -4569,10 +4569,10 @@
       "Wind": 0.0639
     },
     "2025": {
-      "Bioenergy": 0.1916,
-      "Hydro": 0.0652,
-      "Solar": 0.6807,
-      "Wind": 0.0624
+      "Bioenergy": 0.196,
+      "Hydro": 0.0565,
+      "Solar": 0.6898,
+      "Wind": 0.0577
     }
   },
   "KW": {
@@ -4702,9 +4702,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.6152,
-      "Solar": 0.1226,
-      "Wind": 0.2622
+      "Hydro": 0.6186,
+      "Solar": 0.1285,
+      "Wind": 0.2528
     }
   },
   "LA": {
@@ -4974,18 +4974,18 @@
   "LT": {
     "2019": {
       "Bioenergy": 0.1294,
-      "Hydro": 0.3679,
+      "Hydro": 0.3678,
       "Solar": 0.0689,
       "Wind": 0.4338
     },
     "2020": {
       "Bioenergy": 0.1269,
-      "Hydro": 0.3368,
+      "Hydro": 0.3367,
       "Solar": 0.0717,
       "Wind": 0.4647
     },
     "2021": {
-      "Bioenergy": 0.1303,
+      "Bioenergy": 0.1302,
       "Hydro": 0.3622,
       "Solar": 0.0901,
       "Wind": 0.4174
@@ -5003,22 +5003,22 @@
       "Wind": 0.5074
     },
     "2024": {
-      "Bioenergy": 0.0515,
-      "Hydro": 0.1841,
-      "Solar": 0.2364,
-      "Wind": 0.5281
+      "Bioenergy": 0.0513,
+      "Hydro": 0.1838,
+      "Solar": 0.2362,
+      "Wind": 0.5286
     },
     "2025": {
-      "Bioenergy": 0.0325,
-      "Hydro": 0.1094,
-      "Solar": 0.32,
-      "Wind": 0.5381
+      "Bioenergy": 0.0323,
+      "Hydro": 0.1114,
+      "Solar": 0.3316,
+      "Wind": 0.5247
     }
   },
   "LU": {
     "2019": {
       "Bioenergy": 0.149,
-      "Hydro": 0.3871,
+      "Hydro": 0.387,
       "Solar": 0.1304,
       "Wind": 0.3335
     },
@@ -5026,7 +5026,7 @@
       "Bioenergy": 0.1647,
       "Hydro": 0.3499,
       "Solar": 0.132,
-      "Wind": 0.3535
+      "Wind": 0.3534
     },
     "2021": {
       "Bioenergy": 0.1848,
@@ -5035,7 +5035,7 @@
       "Wind": 0.3189
     },
     "2022": {
-      "Bioenergy": 0.1871,
+      "Bioenergy": 0.1872,
       "Hydro": 0.2883,
       "Solar": 0.1961,
       "Wind": 0.3285
@@ -5047,16 +5047,16 @@
       "Wind": 0.4008
     },
     "2024": {
-      "Bioenergy": 0.1381,
-      "Hydro": 0.2926,
-      "Solar": 0.2204,
-      "Wind": 0.3489
+      "Bioenergy": 0.1378,
+      "Hydro": 0.292,
+      "Solar": 0.2202,
+      "Wind": 0.35
     },
     "2025": {
-      "Bioenergy": 0.1273,
-      "Hydro": 0.2332,
-      "Solar": 0.3329,
-      "Wind": 0.3066
+      "Bioenergy": 0.1275,
+      "Hydro": 0.228,
+      "Solar": 0.3461,
+      "Wind": 0.2984
     }
   },
   "LV": {
@@ -5070,13 +5070,13 @@
       "Bioenergy": 0.1523,
       "Hydro": 0.75,
       "Solar": 0.0186,
-      "Wind": 0.0792
+      "Wind": 0.0791
     },
     "2021": {
       "Bioenergy": 0.1471,
-      "Hydro": 0.7506,
+      "Hydro": 0.7507,
       "Solar": 0.024,
-      "Wind": 0.0783
+      "Wind": 0.0782
     },
     "2022": {
       "Bioenergy": 0.1007,
@@ -5086,21 +5086,21 @@
     },
     "2023": {
       "Bioenergy": 0.0583,
-      "Hydro": 0.775,
+      "Hydro": 0.7751,
       "Solar": 0.0657,
       "Wind": 0.101
     },
     "2024": {
-      "Bioenergy": 0.0897,
-      "Hydro": 0.679,
-      "Solar": 0.1241,
-      "Wind": 0.1073
+      "Bioenergy": 0.0896,
+      "Hydro": 0.6786,
+      "Solar": 0.124,
+      "Wind": 0.1077
     },
     "2025": {
-      "Bioenergy": 0.0817,
-      "Hydro": 0.6712,
-      "Solar": 0.1861,
-      "Wind": 0.061
+      "Bioenergy": 0.0811,
+      "Hydro": 0.657,
+      "Solar": 0.2013,
+      "Wind": 0.0605
     }
   },
   "LY": {
@@ -5186,21 +5186,21 @@
     },
     "2025": {
       "Bioenergy": 0.0007,
-      "Hydro": 0.124,
-      "Solar": 0.1245,
-      "Wind": 0.7508
+      "Hydro": 0.1248,
+      "Solar": 0.1246,
+      "Wind": 0.7499
     }
   },
   "MD": {
     "2019": {
-      "Bioenergy": 0.0837,
-      "Hydro": 0.7092,
-      "Solar": 0.0349,
+      "Bioenergy": 0.0836,
+      "Hydro": 0.7093,
+      "Solar": 0.0348,
       "Wind": 0.1723
     },
     "2020": {
       "Bioenergy": 0.0132,
-      "Hydro": 0.9173,
+      "Hydro": 0.9174,
       "Solar": 0.0099,
       "Wind": 0.0596
     },
@@ -5212,9 +5212,9 @@
     },
     "2022": {
       "Bioenergy": 0.0475,
-      "Hydro": 0.6975,
+      "Hydro": 0.6976,
       "Solar": 0.0778,
-      "Wind": 0.1772
+      "Wind": 0.1771
     },
     "2023": {
       "Bioenergy": 0.0113,
@@ -5223,16 +5223,16 @@
       "Wind": 0.1267
     },
     "2024": {
-      "Bioenergy": 0.0123,
-      "Hydro": 0.6419,
-      "Solar": 0.1684,
-      "Wind": 0.1774
+      "Bioenergy": 0.0122,
+      "Hydro": 0.6417,
+      "Solar": 0.1683,
+      "Wind": 0.1778
     },
     "2025": {
       "Bioenergy": 0.0081,
-      "Hydro": 0.6337,
-      "Solar": 0.3241,
-      "Wind": 0.0341
+      "Hydro": 0.6331,
+      "Solar": 0.325,
+      "Wind": 0.0338
     }
   },
   "ME": {
@@ -5268,15 +5268,15 @@
     },
     "2024": {
       "Bioenergy": 0.0069,
-      "Hydro": 0.7723,
+      "Hydro": 0.7721,
       "Solar": 0.0571,
-      "Wind": 0.1637
+      "Wind": 0.1639
     },
     "2025": {
-      "Bioenergy": 0.0239,
-      "Hydro": 0.5895,
-      "Solar": 0.1676,
-      "Wind": 0.2189
+      "Bioenergy": 0.0249,
+      "Hydro": 0.5751,
+      "Solar": 0.179,
+      "Wind": 0.221
     }
   },
   "MG": {
@@ -5326,12 +5326,12 @@
   "MK": {
     "2019": {
       "Bioenergy": 0.0676,
-      "Hydro": 0.7699,
-      "Solar": 0.0192,
-      "Wind": 0.1433
+      "Hydro": 0.77,
+      "Solar": 0.0191,
+      "Wind": 0.1432
     },
     "2020": {
-      "Bioenergy": 0.0715,
+      "Bioenergy": 0.0716,
       "Hydro": 0.75,
       "Solar": 0.0263,
       "Wind": 0.1521
@@ -5355,16 +5355,16 @@
       "Wind": 0.0855
     },
     "2024": {
-      "Bioenergy": 0.054,
-      "Hydro": 0.6825,
-      "Solar": 0.1423,
-      "Wind": 0.1212
+      "Bioenergy": 0.0541,
+      "Hydro": 0.6823,
+      "Solar": 0.1422,
+      "Wind": 0.1214
     },
     "2025": {
-      "Bioenergy": 0.0285,
-      "Hydro": 0.6109,
-      "Solar": 0.1752,
-      "Wind": 0.1853
+      "Bioenergy": 0.0278,
+      "Hydro": 0.6086,
+      "Solar": 0.1787,
+      "Wind": 0.185
     }
   },
   "ML": {
@@ -5531,16 +5531,16 @@
       "Wind": 0.2232
     },
     "2024": {
-      "Bioenergy": 0.1937,
-      "Hydro": 0.3581,
+      "Bioenergy": 0.1934,
+      "Hydro": 0.3583,
       "Solar": 0.2294,
       "Wind": 0.2188
     },
     "2025": {
-      "Bioenergy": 0.1761,
-      "Hydro": 0.3174,
-      "Solar": 0.2802,
-      "Wind": 0.2263
+      "Bioenergy": 0.1753,
+      "Hydro": 0.3228,
+      "Solar": 0.2825,
+      "Wind": 0.2194
     }
   },
   "MQ": {
@@ -5678,20 +5678,20 @@
   "MT": {
     "2019": {
       "Bioenergy": 0.0877,
-      "Hydro": 0.5231,
+      "Hydro": 0.5232,
       "Solar": 0.102,
       "Wind": 0.2871
     },
     "2020": {
-      "Bioenergy": 0.0852,
+      "Bioenergy": 0.0851,
       "Hydro": 0.512,
       "Solar": 0.1024,
-      "Wind": 0.3005
+      "Wind": 0.3004
     },
     "2021": {
       "Bioenergy": 0.0903,
-      "Hydro": 0.4972,
-      "Solar": 0.1114,
+      "Hydro": 0.4973,
+      "Solar": 0.1115,
       "Wind": 0.301
     },
     "2022": {
@@ -5707,16 +5707,16 @@
       "Wind": 0.116
     },
     "2024": {
-      "Bioenergy": 0.0299,
-      "Hydro": 0.1915,
-      "Solar": 0.6459,
-      "Wind": 0.1327
+      "Bioenergy": 0.0297,
+      "Hydro": 0.191,
+      "Solar": 0.6457,
+      "Wind": 0.1336
     },
     "2025": {
-      "Bioenergy": 0.0257,
-      "Hydro": 0.1537,
-      "Solar": 0.7118,
-      "Wind": 0.1088
+      "Bioenergy": 0.0273,
+      "Hydro": 0.1644,
+      "Solar": 0.6933,
+      "Wind": 0.1149
     }
   },
   "MU": {
@@ -5889,10 +5889,10 @@
       "Wind": 0.3199
     },
     "2025": {
-      "Bioenergy": 0.0012,
-      "Hydro": 0.3805,
-      "Solar": 0.2874,
-      "Wind": 0.3309
+      "Bioenergy": 0.0011,
+      "Hydro": 0.3806,
+      "Solar": 0.2955,
+      "Wind": 0.3228
     }
   },
   "MY": {
@@ -5933,9 +5933,9 @@
       "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0.1087,
-      "Hydro": 0.8096,
-      "Solar": 0.0817,
+      "Bioenergy": 0.109,
+      "Hydro": 0.8095,
+      "Solar": 0.0814,
       "Wind": 0
     }
   },
@@ -6197,10 +6197,10 @@
       "Wind": 0.3676
     },
     "2025": {
-      "Bioenergy": 0.4007,
-      "Hydro": 0.2012,
+      "Bioenergy": 0.4011,
+      "Hydro": 0.2001,
       "Solar": 0.0307,
-      "Wind": 0.3674
+      "Wind": 0.3681
     }
   },
   "NL": {
@@ -6241,10 +6241,10 @@
       "Wind": 0.5115
     },
     "2025": {
-      "Bioenergy": 0.0902,
-      "Hydro": 0.0006,
-      "Solar": 0.5241,
-      "Wind": 0.3851
+      "Bioenergy": 0.089,
+      "Hydro": 0.0005,
+      "Solar": 0.533,
+      "Wind": 0.3775
     }
   },
   "NO": {
@@ -6286,9 +6286,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9196,
+      "Hydro": 0.9184,
       "Solar": 0,
-      "Wind": 0.0804
+      "Wind": 0.0816
     }
   },
   "NP": {
@@ -6329,10 +6329,10 @@
       "Wind": 0.0195
     },
     "2025": {
-      "Bioenergy": 0.0049,
+      "Bioenergy": 0.005,
       "Hydro": 0.9367,
-      "Solar": 0.0369,
-      "Wind": 0.0216
+      "Solar": 0.0373,
+      "Wind": 0.0211
     }
   },
   "NR": {
@@ -6461,10 +6461,10 @@
       "Wind": 0.1407
     },
     "2025": {
-      "Bioenergy": 0.0006,
-      "Hydro": 0.8746,
+      "Bioenergy": 0.0005,
+      "Hydro": 0.8739,
       "Solar": 0,
-      "Wind": 0.1248
+      "Wind": 0.1256
     }
   },
   "OM": {
@@ -6593,10 +6593,10 @@
       "Wind": 0.1075
     },
     "2025": {
-      "Bioenergy": 0.0082,
-      "Hydro": 0.8611,
-      "Solar": 0.0402,
-      "Wind": 0.0905
+      "Bioenergy": 0.0092,
+      "Hydro": 0.8506,
+      "Solar": 0.0433,
+      "Wind": 0.0969
     }
   },
   "PF": {
@@ -6725,10 +6725,10 @@
       "Wind": 0.0721
     },
     "2025": {
-      "Bioenergy": 0.0649,
-      "Hydro": 0.6418,
-      "Solar": 0.2396,
-      "Wind": 0.0538
+      "Bioenergy": 0.0615,
+      "Hydro": 0.6537,
+      "Solar": 0.235,
+      "Wind": 0.0499
     }
   },
   "PK": {
@@ -6769,10 +6769,10 @@
       "Wind": 0.0556
     },
     "2025": {
-      "Bioenergy": 0.0076,
-      "Hydro": 0.5173,
-      "Solar": 0.4113,
-      "Wind": 0.0638
+      "Bioenergy": 0.0072,
+      "Hydro": 0.5319,
+      "Solar": 0.3953,
+      "Wind": 0.0656
     }
   },
   "PL": {
@@ -6780,7 +6780,7 @@
       "Bioenergy": 0.1058,
       "Hydro": 0.1468,
       "Solar": 0.0478,
-      "Wind": 0.6996
+      "Wind": 0.6997
     },
     "2020": {
       "Bioenergy": 0.0963,
@@ -6790,7 +6790,7 @@
     },
     "2021": {
       "Bioenergy": 0.081,
-      "Hydro": 0.0975,
+      "Hydro": 0.0974,
       "Solar": 0.1924,
       "Wind": 0.6291
     },
@@ -6808,15 +6808,15 @@
     },
     "2024": {
       "Bioenergy": 0.0521,
-      "Hydro": 0.0524,
-      "Solar": 0.3778,
-      "Wind": 0.5178
+      "Hydro": 0.0523,
+      "Solar": 0.3777,
+      "Wind": 0.5179
     },
     "2025": {
-      "Bioenergy": 0.0593,
-      "Hydro": 0.0361,
-      "Solar": 0.4753,
-      "Wind": 0.4293
+      "Bioenergy": 0.0588,
+      "Hydro": 0.0363,
+      "Solar": 0.4898,
+      "Wind": 0.4151
     }
   },
   "PM": {
@@ -6903,8 +6903,8 @@
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.4547,
-      "Wind": 0.5453
+      "Solar": 0.4476,
+      "Wind": 0.5524
     }
   },
   "PS": {
@@ -6968,7 +6968,7 @@
       "Bioenergy": 0.1208,
       "Hydro": 0.3503,
       "Solar": 0.0815,
-      "Wind": 0.4475
+      "Wind": 0.4474
     },
     "2022": {
       "Bioenergy": 0.127,
@@ -6984,15 +6984,15 @@
     },
     "2024": {
       "Bioenergy": 0.0835,
-      "Hydro": 0.3394,
+      "Hydro": 0.3393,
       "Solar": 0.2011,
-      "Wind": 0.3759
+      "Wind": 0.3761
     },
     "2025": {
-      "Bioenergy": 0.071,
-      "Hydro": 0.3547,
-      "Solar": 0.2448,
-      "Wind": 0.3295
+      "Bioenergy": 0.0737,
+      "Hydro": 0.3409,
+      "Solar": 0.2566,
+      "Wind": 0.3288
     }
   },
   "PY": {
@@ -7160,15 +7160,15 @@
     },
     "2024": {
       "Bioenergy": 0.0205,
-      "Hydro": 0.559,
+      "Hydro": 0.5589,
       "Solar": 0.1668,
-      "Wind": 0.2537
+      "Wind": 0.2538
     },
     "2025": {
-      "Bioenergy": 0.0217,
-      "Hydro": 0.4828,
-      "Solar": 0.2628,
-      "Wind": 0.2327
+      "Bioenergy": 0.0213,
+      "Hydro": 0.4777,
+      "Solar": 0.2739,
+      "Wind": 0.2272
     }
   },
   "RS": {
@@ -7192,8 +7192,8 @@
     },
     "2022": {
       "Bioenergy": 0.0318,
-      "Hydro": 0.824,
-      "Solar": 0.0179,
+      "Hydro": 0.8241,
+      "Solar": 0.0178,
       "Wind": 0.1263
     },
     "2023": {
@@ -7204,15 +7204,15 @@
     },
     "2024": {
       "Bioenergy": 0.025,
-      "Hydro": 0.8495,
+      "Hydro": 0.8494,
       "Solar": 0.0164,
-      "Wind": 0.109
+      "Wind": 0.1092
     },
     "2025": {
-      "Bioenergy": 0.0311,
-      "Hydro": 0.8258,
-      "Solar": 0.0109,
-      "Wind": 0.1322
+      "Bioenergy": 0.0325,
+      "Hydro": 0.8227,
+      "Solar": 0.01,
+      "Wind": 0.1347
     }
   },
   "RU": {
@@ -7253,10 +7253,10 @@
       "Wind": 0.0243
     },
     "2025": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.9629,
-      "Solar": 0.0123,
-      "Wind": 0.0208
+      "Bioenergy": 0.0038,
+      "Hydro": 0.963,
+      "Solar": 0.0128,
+      "Wind": 0.0203
     }
   },
   "RW": {
@@ -7517,10 +7517,10 @@
       "Wind": 0.3508
     },
     "2025": {
-      "Bioenergy": 0.049,
-      "Hydro": 0.5726,
-      "Solar": 0.0493,
-      "Wind": 0.3291
+      "Bioenergy": 0.0471,
+      "Hydro": 0.5748,
+      "Solar": 0.0511,
+      "Wind": 0.327
     }
   },
   "SG": {
@@ -7561,10 +7561,10 @@
       "Wind": 0.0013
     },
     "2025": {
-      "Bioenergy": 0.0036,
-      "Hydro": 0.0221,
-      "Solar": 0.9594,
-      "Wind": 0.0148
+      "Bioenergy": 0.0031,
+      "Hydro": 0.0181,
+      "Solar": 0.9665,
+      "Wind": 0.0124
     }
   },
   "SH": {
@@ -7634,7 +7634,7 @@
       "Bioenergy": 0.0302,
       "Hydro": 0.8125,
       "Solar": 0.1127,
-      "Wind": 0.0446
+      "Wind": 0.0445
     },
     "2023": {
       "Bioenergy": 0.0133,
@@ -7649,10 +7649,10 @@
       "Wind": 0.0053
     },
     "2025": {
-      "Bioenergy": 0.0215,
-      "Hydro": 0.6983,
-      "Solar": 0.2793,
-      "Wind": 0.001
+      "Bioenergy": 0.0218,
+      "Hydro": 0.6885,
+      "Solar": 0.2888,
+      "Wind": 0.0009
     }
   },
   "SK": {
@@ -7693,9 +7693,9 @@
       "Wind": 0.0002
     },
     "2025": {
-      "Bioenergy": 0.2012,
-      "Hydro": 0.6485,
-      "Solar": 0.1503,
+      "Bioenergy": 0.1981,
+      "Hydro": 0.6487,
+      "Solar": 0.1533,
       "Wind": 0
     }
   },
@@ -8001,10 +8001,10 @@
       "Wind": 0.0367
     },
     "2025": {
-      "Bioenergy": 0.2822,
-      "Hydro": 0.3318,
-      "Solar": 0.2902,
-      "Wind": 0.0958
+      "Bioenergy": 0.2823,
+      "Hydro": 0.3313,
+      "Solar": 0.2903,
+      "Wind": 0.096
     }
   },
   "SY": {
@@ -8265,10 +8265,10 @@
       "Wind": 0.1575
     },
     "2025": {
-      "Bioenergy": 0.2863,
-      "Hydro": 0.264,
-      "Solar": 0.3119,
-      "Wind": 0.1378
+      "Bioenergy": 0.2857,
+      "Hydro": 0.2629,
+      "Solar": 0.3131,
+      "Wind": 0.1383
     }
   },
   "TJ": {
@@ -8529,10 +8529,10 @@
       "Wind": 0.2512
     },
     "2025": {
-      "Bioenergy": 0.0544,
-      "Hydro": 0.4365,
-      "Solar": 0.2586,
-      "Wind": 0.2505
+      "Bioenergy": 0.0539,
+      "Hydro": 0.4134,
+      "Solar": 0.2639,
+      "Wind": 0.2689
     }
   },
   "TT": {
@@ -8618,9 +8618,9 @@
     },
     "2025": {
       "Bioenergy": 0.0073,
-      "Hydro": 0.1846,
-      "Solar": 0.4486,
-      "Wind": 0.3594
+      "Hydro": 0.1919,
+      "Solar": 0.453,
+      "Wind": 0.3479
     }
   },
   "TZ": {
@@ -8793,10 +8793,10 @@
       "Wind": 0.4378
     },
     "2025": {
-      "Bioenergy": 0.0391,
-      "Hydro": 0.2138,
-      "Solar": 0.3491,
-      "Wind": 0.3979
+      "Bioenergy": 0.0398,
+      "Hydro": 0.2132,
+      "Solar": 0.36,
+      "Wind": 0.387
     }
   },
   "UY": {
@@ -8837,10 +8837,10 @@
       "Wind": 0.3343
     },
     "2025": {
-      "Bioenergy": 0.1441,
-      "Hydro": 0.4748,
-      "Solar": 0.0393,
-      "Wind": 0.3418
+      "Bioenergy": 0.143,
+      "Hydro": 0.4756,
+      "Solar": 0.0382,
+      "Wind": 0.3432
     }
   },
   "UZ": {
@@ -8881,10 +8881,10 @@
       "Wind": 0.0141
     },
     "2025": {
-      "Bioenergy": 0.0038,
+      "Bioenergy": 0.0039,
       "Hydro": 0.9591,
-      "Solar": 0.0213,
-      "Wind": 0.0157
+      "Solar": 0.0216,
+      "Wind": 0.0154
     }
   },
   "VC": {
@@ -9102,9 +9102,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.6928,
-      "Solar": 0.207,
-      "Wind": 0.1002
+      "Hydro": 0.7076,
+      "Solar": 0.1973,
+      "Wind": 0.0951
     }
   },
   "VU": {
@@ -9227,16 +9227,16 @@
       "Wind": 0.464
     },
     "2024": {
-      "Bioenergy": 0.0279,
-      "Hydro": 0.3916,
-      "Solar": 0.0435,
-      "Wind": 0.5371
+      "Bioenergy": 0.0281,
+      "Hydro": 0.3911,
+      "Solar": 0.0434,
+      "Wind": 0.5374
     },
     "2025": {
-      "Bioenergy": 0.0357,
-      "Hydro": 0.4365,
-      "Solar": 0.114,
-      "Wind": 0.4138
+      "Bioenergy": 0.0352,
+      "Hydro": 0.4361,
+      "Solar": 0.1177,
+      "Wind": 0.411
     }
   },
   "YE": {
@@ -9322,9 +9322,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.0635,
-      "Solar": 0.5833,
-      "Wind": 0.3532
+      "Hydro": 0.0536,
+      "Solar": 0.5825,
+      "Wind": 0.3639
     }
   },
   "ZM": {