@digital4better/data 1.2.8 → 1.2.10

package/data/mix/country-yearly.json

@@ -135,26 +135,26 @@
       "Wind": 0.054
     },
     "2024": {
-      "Bioenergy": 0.0155,
-      "Coal": 0.4337,
-      "Gas": 0.0751,
-      "Hydro": 0.2855,
-      "Nuclear": 0.0405,
-      "Other Fossil": 0.0201,
-      "Other Renewables": 0.004,
-      "Solar": 0.0696,
-      "Wind": 0.0561
+      "Bioenergy": 0.0157,
+      "Coal": 0.4347,
+      "Gas": 0.0754,
+      "Hydro": 0.2843,
+      "Nuclear": 0.0404,
+      "Other Fossil": 0.0202,
+      "Other Renewables": 0.0041,
+      "Solar": 0.0691,
+      "Wind": 0.0562
     },
     "2025": {
-      "Bioenergy": 0.0159,
-      "Coal": 0.4416,
-      "Gas": 0.0745,
-      "Hydro": 0.2708,
-      "Nuclear": 0.0431,
-      "Other Fossil": 0.02,
-      "Other Renewables": 0.0041,
-      "Solar": 0.0693,
-      "Wind": 0.061
+      "Bioenergy": 0.0173,
+      "Coal": 0.451,
+      "Gas": 0.0759,
+      "Hydro": 0.262,
+      "Nuclear": 0.0426,
+      "Other Fossil": 0.0203,
+      "Other Renewables": 0.0039,
+      "Solar": 0.0643,
+      "Wind": 0.0626
     }
   },
   "AG": {
@@ -278,41 +278,41 @@
       "Nuclear": 0.0621,
       "Other Fossil": 0.0069,
       "Other Renewables": 0.0021,
-      "Solar": 0.0189,
-      "Wind": 0.036
+      "Solar": 0.0188,
+      "Wind": 0.0361
     },
     "2023": {
       "Bioenergy": 0.0088,
       "Coal": 0.0463,
-      "Gas": 0.0757,
+      "Gas": 0.0758,
       "Hydro": 0.7352,
       "Nuclear": 0.0632,
-      "Other Fossil": 0.0065,
+      "Other Fossil": 0.0064,
       "Other Renewables": 0.0021,
-      "Solar": 0.0226,
-      "Wind": 0.0397
+      "Solar": 0.0224,
+      "Wind": 0.0398
     },
     "2024": {
       "Bioenergy": 0.0089,
-      "Coal": 0.0423,
+      "Coal": 0.0422,
       "Gas": 0.0716,
-      "Hydro": 0.7386,
-      "Nuclear": 0.0638,
+      "Hydro": 0.7382,
+      "Nuclear": 0.0639,
       "Other Fossil": 0.0064,
-      "Other Renewables": 0.0021,
-      "Solar": 0.0268,
-      "Wind": 0.0396
+      "Other Renewables": 0.002,
+      "Solar": 0.0263,
+      "Wind": 0.0404
     },
     "2025": {
-      "Bioenergy": 0.0089,
-      "Coal": 0.0478,
-      "Gas": 0.0841,
-      "Hydro": 0.7305,
-      "Nuclear": 0.0642,
-      "Other Fossil": 0.0066,
-      "Other Renewables": 0.0021,
-      "Solar": 0.0138,
-      "Wind": 0.042
+      "Bioenergy": 0.0086,
+      "Coal": 0.046,
+      "Gas": 0.084,
+      "Hydro": 0.7304,
+      "Nuclear": 0.0649,
+      "Other Fossil": 0.0067,
+      "Other Renewables": 0.0019,
+      "Solar": 0.0114,
+      "Wind": 0.046
     }
   },
   "AM": {
@@ -532,10 +532,10 @@
     "2024": {
       "Bioenergy": 0.0088,
       "Coal": 0.0058,
-      "Gas": 0.5084,
-      "Hydro": 0.2505,
+      "Gas": 0.5083,
+      "Hydro": 0.2506,
       "Nuclear": 0.072,
-      "Other Fossil": 0.0118,
+      "Other Fossil": 0.0119,
       "Other Renewables": 0.0002,
       "Solar": 0.0288,
       "Wind": 0.1136
@@ -544,7 +544,7 @@
       "Bioenergy": 0.0084,
       "Coal": 0.0009,
       "Gas": 0.4803,
-      "Hydro": 0.2858,
+      "Hydro": 0.2859,
       "Nuclear": 0.0569,
       "Other Fossil": 0.0068,
       "Other Renewables": 0,
@@ -666,48 +666,48 @@
       "Wind": 0.1145
     },
     "2022": {
-      "Bioenergy": 0.0398,
-      "Coal": 0.0236,
-      "Gas": 0.1795,
-      "Hydro": 0.5287,
-      "Nuclear": 0.0268,
-      "Other Fossil": 0.0181,
+      "Bioenergy": 0.0402,
+      "Coal": 0.0239,
+      "Gas": 0.1817,
+      "Hydro": 0.535,
+      "Nuclear": 0.0272,
+      "Other Fossil": 0.0183,
       "Other Renewables": 0.0009,
-      "Solar": 0.065,
-      "Wind": 0.1176
+      "Solar": 0.0537,
+      "Wind": 0.119
     },
     "2023": {
-      "Bioenergy": 0.0222,
-      "Coal": 0.0096,
-      "Gas": 0.1098,
-      "Hydro": 0.5959,
-      "Nuclear": 0.0119,
-      "Other Fossil": 0.0167,
+      "Bioenergy": 0.0228,
+      "Coal": 0.0099,
+      "Gas": 0.1131,
+      "Hydro": 0.6131,
+      "Nuclear": 0.0122,
+      "Other Fossil": 0.0172,
       "Other Renewables": 0.0004,
-      "Solar": 0.1049,
-      "Wind": 0.1286
+      "Solar": 0.0789,
+      "Wind": 0.1324
     },
     "2024": {
-      "Bioenergy": 0.0264,
-      "Coal": 0.0021,
-      "Gas": 0.0886,
-      "Hydro": 0.6056,
-      "Nuclear": 0.0029,
-      "Other Fossil": 0.0147,
+      "Bioenergy": 0.0271,
+      "Coal": 0.0026,
+      "Gas": 0.09,
+      "Hydro": 0.6241,
+      "Nuclear": 0.0036,
+      "Other Fossil": 0.0151,
       "Other Renewables": 0.0001,
-      "Solar": 0.1333,
-      "Wind": 0.1264
+      "Solar": 0.104,
+      "Wind": 0.1334
     },
     "2025": {
-      "Bioenergy": 0.0356,
-      "Coal": 0.0115,
-      "Gas": 0.2512,
-      "Hydro": 0.4531,
-      "Nuclear": 0.0155,
-      "Other Fossil": 0.0159,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0887,
-      "Wind": 0.128
+      "Bioenergy": 0.0342,
+      "Coal": 0.0203,
+      "Gas": 0.2711,
+      "Hydro": 0.4429,
+      "Nuclear": 0.0287,
+      "Other Fossil": 0.0166,
+      "Other Renewables": 0.0009,
+      "Solar": 0.0556,
+      "Wind": 0.1297
     }
   },
   "AU": {
@@ -916,10 +916,10 @@
     "2023": {
       "Bioenergy": 0.0001,
       "Coal": 0.0021,
-      "Gas": 0.9242,
-      "Hydro": 0.0672,
+      "Gas": 0.9229,
+      "Hydro": 0.0673,
       "Nuclear": 0.0002,
-      "Other Fossil": 0.0032,
+      "Other Fossil": 0.0045,
       "Other Renewables": 0,
       "Solar": 0.0027,
       "Wind": 0.0002
@@ -927,10 +927,10 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.8671,
-      "Hydro": 0.1158,
+      "Gas": 0.8658,
+      "Hydro": 0.1156,
       "Nuclear": 0,
-      "Other Fossil": 0.0029,
+      "Other Fossil": 0.0044,
       "Other Renewables": 0,
       "Solar": 0.0142,
       "Wind": 0
@@ -1005,25 +1005,25 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.6701,
+      "Coal": 0.6522,
       "Gas": 0,
-      "Hydro": 0.2918,
+      "Hydro": 0.3077,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.029,
-      "Wind": 0.0091
+      "Solar": 0.0286,
+      "Wind": 0.0115
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.7529,
+      "Coal": 0.6703,
       "Gas": 0,
-      "Hydro": 0.2118,
+      "Hydro": 0.2857,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0353,
-      "Wind": 0
+      "Solar": 0.033,
+      "Wind": 0.011
     }
   },
   "BB": {
@@ -1162,26 +1162,26 @@
       "Wind": 0.0116
     },
     "2024": {
-      "Bioenergy": 0.0031,
-      "Coal": 0.3637,
-      "Gas": 0.4476,
-      "Hydro": 0.0286,
+      "Bioenergy": 0.0032,
+      "Coal": 0.3639,
+      "Gas": 0.4477,
+      "Hydro": 0.0284,
       "Nuclear": 0.0082,
       "Other Fossil": 0.1144,
       "Other Renewables": 0.0008,
-      "Solar": 0.0221,
+      "Solar": 0.022,
       "Wind": 0.0114
     },
     "2025": {
-      "Bioenergy": 0.0032,
-      "Coal": 0.3703,
-      "Gas": 0.4649,
-      "Hydro": 0.0258,
-      "Nuclear": 0.0086,
-      "Other Fossil": 0.0886,
+      "Bioenergy": 0.0035,
+      "Coal": 0.3722,
+      "Gas": 0.4652,
+      "Hydro": 0.024,
+      "Nuclear": 0.0085,
+      "Other Fossil": 0.0887,
       "Other Renewables": 0.0008,
-      "Solar": 0.0256,
-      "Wind": 0.0122
+      "Solar": 0.0246,
+      "Wind": 0.0125
     }
   },
   "BE": {
@@ -1237,30 +1237,30 @@
       "Nuclear": 0.3934,
       "Other Fossil": 0.0994,
       "Other Renewables": 0.0004,
-      "Solar": 0.0923,
+      "Solar": 0.0922,
       "Wind": 0.1828
     },
     "2024": {
-      "Bioenergy": 0.0119,
-      "Coal": 0.019,
-      "Gas": 0.173,
-      "Hydro": 0.0262,
-      "Nuclear": 0.3911,
-      "Other Fossil": 0.0921,
+      "Bioenergy": 0.0117,
+      "Coal": 0.018,
+      "Gas": 0.166,
+      "Hydro": 0.025,
+      "Nuclear": 0.3965,
+      "Other Fossil": 0.0917,
       "Other Renewables": 0.0009,
-      "Solar": 0.1137,
-      "Wind": 0.172
+      "Solar": 0.112,
+      "Wind": 0.1781
     },
     "2025": {
-      "Bioenergy": 0.0139,
-      "Coal": 0.0289,
-      "Gas": 0.2831,
-      "Hydro": 0.0301,
-      "Nuclear": 0.3348,
-      "Other Fossil": 0.1017,
-      "Other Renewables": 0.0012,
-      "Solar": 0.0366,
-      "Wind": 0.1698
+      "Bioenergy": 0.0126,
+      "Coal": 0.0263,
+      "Gas": 0.2432,
+      "Hydro": 0.0297,
+      "Nuclear": 0.4032,
+      "Other Fossil": 0.0842,
+      "Other Renewables": 0.0011,
+      "Solar": 0.0318,
+      "Wind": 0.1679
     }
   },
   "BF": {
@@ -1399,26 +1399,26 @@
       "Wind": 0.0386
     },
     "2024": {
-      "Bioenergy": 0.0048,
-      "Coal": 0.2641,
-      "Gas": 0.0665,
-      "Hydro": 0.0848,
-      "Nuclear": 0.4035,
-      "Other Fossil": 0.001,
-      "Other Renewables": 0.0003,
-      "Solar": 0.1338,
-      "Wind": 0.0413
+      "Bioenergy": 0.0044,
+      "Coal": 0.265,
+      "Gas": 0.0638,
+      "Hydro": 0.0821,
+      "Nuclear": 0.4138,
+      "Other Fossil": 0.0007,
+      "Other Renewables": 0.0002,
+      "Solar": 0.1291,
+      "Wind": 0.0408
     },
     "2025": {
-      "Bioenergy": 0.0077,
-      "Coal": 0.3684,
-      "Gas": 0.0993,
-      "Hydro": 0.0567,
-      "Nuclear": 0.3088,
-      "Other Fossil": 0.0034,
-      "Other Renewables": 0.0011,
-      "Solar": 0.0956,
-      "Wind": 0.0589
+      "Bioenergy": 0.0026,
+      "Coal": 0.3974,
+      "Gas": 0.0605,
+      "Hydro": 0.0421,
+      "Nuclear": 0.3868,
+      "Other Fossil": 0,
+      "Other Renewables": 0,
+      "Solar": 0.0763,
+      "Wind": 0.0342
     }
   },
   "BH": {
@@ -1963,15 +1963,15 @@
       "Wind": 0.1521
     },
     "2025": {
-      "Bioenergy": 0.0076,
-      "Coal": 0.0126,
-      "Gas": 0.0644,
-      "Hydro": 0.6028,
-      "Nuclear": 0.013,
-      "Other Fossil": 0.0105,
+      "Bioenergy": 0.0037,
+      "Coal": 0.0048,
+      "Gas": 0.0417,
+      "Hydro": 0.7016,
+      "Nuclear": 0.0211,
+      "Other Fossil": 0.0092,
       "Other Renewables": 0,
-      "Solar": 0.1305,
-      "Wind": 0.1587
+      "Solar": 0.1245,
+      "Wind": 0.0935
     }
   },
   "BS": {
@@ -2248,10 +2248,10 @@
     "2022": {
       "Bioenergy": 0.0062,
       "Coal": 0,
-      "Gas": 0.7346,
+      "Gas": 0.7344,
       "Hydro": 0.0095,
-      "Nuclear": 0.117,
-      "Other Fossil": 0.1231,
+      "Nuclear": 0.1169,
+      "Other Fossil": 0.1233,
       "Other Renewables": 0,
       "Solar": 0.0054,
       "Wind": 0.0043
@@ -2259,10 +2259,10 @@
     "2023": {
       "Bioenergy": 0.0122,
       "Coal": 0.0001,
-      "Gas": 0.5767,
+      "Gas": 0.5904,
       "Hydro": 0.0092,
       "Nuclear": 0.2862,
-      "Other Fossil": 0.1073,
+      "Other Fossil": 0.0937,
       "Other Renewables": 0,
       "Solar": 0.0037,
       "Wind": 0.0045
@@ -2270,10 +2270,10 @@
     "2024": {
       "Bioenergy": 0.0132,
       "Coal": 0.0011,
-      "Gas": 0.4936,
+      "Gas": 0.5127,
       "Hydro": 0.0102,
-      "Nuclear": 0.3798,
-      "Other Fossil": 0.0916,
+      "Nuclear": 0.3797,
+      "Other Fossil": 0.0726,
       "Other Renewables": 0.0001,
       "Solar": 0.0061,
       "Wind": 0.0044
@@ -2281,10 +2281,10 @@
     "2025": {
       "Bioenergy": 0.0125,
       "Coal": 0,
-      "Gas": 0.55,
+      "Gas": 0.5719,
       "Hydro": 0.0063,
       "Nuclear": 0.325,
-      "Other Fossil": 0.0969,
+      "Other Fossil": 0.075,
       "Other Renewables": 0,
       "Solar": 0.0063,
       "Wind": 0.0031
@@ -2347,26 +2347,26 @@
       "Wind": 0.038
     },
     "2024": {
-      "Bioenergy": 0.1711,
-      "Coal": 0.0159,
-      "Gas": 0.1058,
-      "Hydro": 0.509,
-      "Nuclear": 0.0091,
-      "Other Fossil": 0.1035,
+      "Bioenergy": 0.171,
+      "Coal": 0.0156,
+      "Gas": 0.1042,
+      "Hydro": 0.5109,
+      "Nuclear": 0.0092,
+      "Other Fossil": 0.1037,
       "Other Renewables": 0.0024,
-      "Solar": 0.0421,
-      "Wind": 0.0411
+      "Solar": 0.042,
+      "Wind": 0.041
     },
     "2025": {
-      "Bioenergy": 0.1711,
-      "Coal": 0.0159,
-      "Gas": 0.1026,
-      "Hydro": 0.505,
-      "Nuclear": 0.0061,
-      "Other Fossil": 0.1034,
-      "Other Renewables": 0.0021,
-      "Solar": 0.047,
-      "Wind": 0.0469
+      "Bioenergy": 0.1699,
+      "Coal": 0.0139,
+      "Gas": 0.0936,
+      "Hydro": 0.5174,
+      "Nuclear": 0.0077,
+      "Other Fossil": 0.1013,
+      "Other Renewables": 0.0023,
+      "Solar": 0.0487,
+      "Wind": 0.045
     }
   },
   "CA": {
@@ -2426,26 +2426,26 @@
       "Wind": 0.0646
     },
     "2024": {
-      "Bioenergy": 0.0163,
-      "Coal": 0.0475,
-      "Gas": 0.1494,
-      "Hydro": 0.5528,
-      "Nuclear": 0.1354,
-      "Other Fossil": 0.0106,
+      "Bioenergy": 0.0162,
+      "Coal": 0.0472,
+      "Gas": 0.1486,
+      "Hydro": 0.5572,
+      "Nuclear": 0.1342,
+      "Other Fossil": 0.0105,
       "Other Renewables": 0.0005,
-      "Solar": 0.0099,
-      "Wind": 0.0776
+      "Solar": 0.009,
+      "Wind": 0.0765
     },
     "2025": {
-      "Bioenergy": 0.0165,
-      "Coal": 0.048,
-      "Gas": 0.1511,
-      "Hydro": 0.5283,
-      "Nuclear": 0.1397,
-      "Other Fossil": 0.0108,
-      "Other Renewables": 0.0004,
-      "Solar": 0.0089,
-      "Wind": 0.0963
+      "Bioenergy": 0.0161,
+      "Coal": 0.0465,
+      "Gas": 0.1462,
+      "Hydro": 0.5562,
+      "Nuclear": 0.1321,
+      "Other Fossil": 0.0103,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0036,
+      "Wind": 0.0883
     }
   },
   "CD": {
@@ -2736,32 +2736,32 @@
       "Gas": 0.0088,
       "Hydro": 0.5503,
       "Nuclear": 0.3266,
-      "Other Fossil": 0.0504,
+      "Other Fossil": 0.0503,
       "Other Renewables": 0.0002,
       "Solar": 0.0504,
-      "Wind": 0.0066
+      "Wind": 0.0067
     },
     "2024": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0021,
+      "Coal": 0.002,
       "Gas": 0.0036,
-      "Hydro": 0.5992,
-      "Nuclear": 0.2908,
-      "Other Fossil": 0.0459,
+      "Hydro": 0.5954,
+      "Nuclear": 0.2934,
+      "Other Fossil": 0.0463,
       "Other Renewables": 0.0001,
-      "Solar": 0.0547,
-      "Wind": 0.0032
+      "Solar": 0.0553,
+      "Wind": 0.0036
     },
     "2025": {
-      "Bioenergy": 0.0031,
-      "Coal": 0.0168,
-      "Gas": 0.0295,
-      "Hydro": 0.5145,
-      "Nuclear": 0.3456,
-      "Other Fossil": 0.0491,
-      "Other Renewables": 0.0007,
-      "Solar": 0.0244,
-      "Wind": 0.0162
+      "Bioenergy": 0.0025,
+      "Coal": 0.0135,
+      "Gas": 0.0247,
+      "Hydro": 0.51,
+      "Nuclear": 0.3544,
+      "Other Fossil": 0.0508,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0285,
+      "Wind": 0.015
     }
   },
   "CI": {
@@ -2990,15 +2990,15 @@
       "Wind": 0.1296
     },
     "2025": {
-      "Bioenergy": 0.0178,
-      "Coal": 0.1149,
-      "Gas": 0.0903,
-      "Hydro": 0.3447,
+      "Bioenergy": 0.0233,
+      "Coal": 0.1084,
+      "Gas": 0.1427,
+      "Hydro": 0.284,
       "Nuclear": 0,
-      "Other Fossil": 0.0109,
+      "Other Fossil": 0.011,
       "Other Renewables": 0.0014,
-      "Solar": 0.2777,
-      "Wind": 0.1423
+      "Solar": 0.2853,
+      "Wind": 0.144
     }
   },
   "CM": {
@@ -3228,14 +3228,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.154,
-      "Gas": 0.0713,
-      "Hydro": 0.7147,
+      "Coal": 0.1182,
+      "Gas": 0.0694,
+      "Hydro": 0.7489,
       "Nuclear": 0,
-      "Other Fossil": 0.0081,
+      "Other Fossil": 0.0074,
       "Other Renewables": 0,
-      "Solar": 0.0502,
-      "Wind": 0.0016
+      "Solar": 0.0547,
+      "Wind": 0.0015
     }
   },
   "CR": {
@@ -3297,24 +3297,24 @@
     "2024": {
       "Bioenergy": 0.0041,
       "Coal": 0.001,
-      "Gas": 0.0065,
+      "Gas": 0.0064,
       "Hydro": 0.6649,
       "Nuclear": 0.0006,
       "Other Fossil": 0.106,
       "Other Renewables": 0.1171,
       "Solar": 0.0019,
-      "Wind": 0.098
+      "Wind": 0.0981
     },
     "2025": {
-      "Bioenergy": 0.0089,
+      "Bioenergy": 0.0083,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.7411,
+      "Hydro": 0.7521,
       "Nuclear": 0,
       "Other Fossil": 0,
-      "Other Renewables": 0.1071,
+      "Other Renewables": 0.0909,
       "Solar": 0,
-      "Wind": 0.1429
+      "Wind": 0.1488
     }
   },
   "CU": {
@@ -3537,10 +3537,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.7536,
+      "Other Fossil": 0.7587,
       "Other Renewables": 0,
-      "Solar": 0.2089,
-      "Wind": 0.0375
+      "Solar": 0.2021,
+      "Wind": 0.0392
     },
     "2025": {
       "Bioenergy": 0,
@@ -3548,10 +3548,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.7333,
+      "Other Fossil": 0.7708,
       "Other Renewables": 0,
-      "Solar": 0.2333,
-      "Wind": 0.0333
+      "Solar": 0.1875,
+      "Wind": 0.0417
     }
   },
   "CZ": {
@@ -3611,26 +3611,26 @@
       "Wind": 0.0105
     },
     "2024": {
-      "Bioenergy": 0.0328,
-      "Coal": 0.3533,
-      "Gas": 0.0518,
-      "Hydro": 0.0367,
-      "Nuclear": 0.4069,
-      "Other Fossil": 0.014,
-      "Other Renewables": 0.0353,
-      "Solar": 0.0589,
-      "Wind": 0.0105
+      "Bioenergy": 0.0329,
+      "Coal": 0.3482,
+      "Gas": 0.0498,
+      "Hydro": 0.0377,
+      "Nuclear": 0.4139,
+      "Other Fossil": 0.0138,
+      "Other Renewables": 0.0352,
+      "Solar": 0.0581,
+      "Wind": 0.0103
     },
     "2025": {
-      "Bioenergy": 0.0318,
-      "Coal": 0.442,
-      "Gas": 0.0811,
-      "Hydro": 0.0302,
-      "Nuclear": 0.337,
-      "Other Fossil": 0.0143,
-      "Other Renewables": 0.0302,
-      "Solar": 0.0223,
-      "Wind": 0.0111
+      "Bioenergy": 0.0344,
+      "Coal": 0.4427,
+      "Gas": 0.0645,
+      "Hydro": 0.0287,
+      "Nuclear": 0.3653,
+      "Other Fossil": 0.0115,
+      "Other Renewables": 0.0287,
+      "Solar": 0.0143,
+      "Wind": 0.01
     }
   },
   "DE": {
@@ -3690,26 +3690,26 @@
       "Wind": 0.2709
     },
     "2024": {
-      "Bioenergy": 0.0866,
-      "Coal": 0.216,
-      "Gas": 0.1688,
-      "Hydro": 0.0572,
-      "Nuclear": 0.0116,
-      "Other Fossil": 0.0441,
+      "Bioenergy": 0.0867,
+      "Coal": 0.2123,
+      "Gas": 0.1674,
+      "Hydro": 0.0569,
+      "Nuclear": 0.0111,
+      "Other Fossil": 0.0445,
       "Other Renewables": 0.0004,
-      "Solar": 0.1497,
-      "Wind": 0.2657
+      "Solar": 0.148,
+      "Wind": 0.2727
     },
     "2025": {
-      "Bioenergy": 0.0802,
-      "Coal": 0.2875,
-      "Gas": 0.193,
-      "Hydro": 0.0386,
-      "Nuclear": 0.0058,
-      "Other Fossil": 0.0531,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0508,
-      "Wind": 0.2908
+      "Bioenergy": 0.0792,
+      "Coal": 0.2477,
+      "Gas": 0.1982,
+      "Hydro": 0.0351,
+      "Nuclear": 0.0006,
+      "Other Fossil": 0.0568,
+      "Other Renewables": 0,
+      "Solar": 0.0429,
+      "Wind": 0.3395
     }
   },
   "DJ": {
@@ -3844,30 +3844,30 @@
       "Nuclear": 0.0199,
       "Other Fossil": 0.0359,
       "Other Renewables": 0.0006,
-      "Solar": 0.0915,
-      "Wind": 0.5467
+      "Solar": 0.0914,
+      "Wind": 0.5468
     },
     "2024": {
-      "Bioenergy": 0.1072,
-      "Coal": 0.102,
-      "Gas": 0.0733,
-      "Hydro": 0.0206,
-      "Nuclear": 0.0232,
-      "Other Fossil": 0.0347,
+      "Bioenergy": 0.1066,
+      "Coal": 0.0989,
+      "Gas": 0.0711,
+      "Hydro": 0.0192,
+      "Nuclear": 0.0215,
+      "Other Fossil": 0.0343,
       "Other Renewables": 0.0007,
-      "Solar": 0.1071,
-      "Wind": 0.5311
+      "Solar": 0.105,
+      "Wind": 0.5426
     },
     "2025": {
-      "Bioenergy": 0.1583,
-      "Coal": 0.1194,
-      "Gas": 0.0972,
-      "Hydro": 0.0224,
-      "Nuclear": 0.0289,
-      "Other Fossil": 0.0386,
-      "Other Renewables": 0.0009,
-      "Solar": 0.0258,
-      "Wind": 0.5085
+      "Bioenergy": 0.1375,
+      "Coal": 0.1002,
+      "Gas": 0.092,
+      "Hydro": 0.017,
+      "Nuclear": 0.0222,
+      "Other Fossil": 0.0339,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0189,
+      "Wind": 0.5777
     }
   },
   "DM": {
@@ -4166,8 +4166,8 @@
     "2024": {
       "Bioenergy": 0.0151,
       "Coal": 0.0013,
-      "Gas": 0.0387,
-      "Hydro": 0.652,
+      "Gas": 0.0385,
+      "Hydro": 0.6522,
       "Nuclear": 0.0007,
       "Other Fossil": 0.2793,
       "Other Renewables": 0.0002,
@@ -4175,15 +4175,15 @@
       "Wind": 0.01
     },
     "2025": {
-      "Bioenergy": 0.03,
-      "Coal": 0.0027,
-      "Gas": 0.0591,
-      "Hydro": 0.4492,
-      "Nuclear": 0.001,
-      "Other Fossil": 0.4395,
+      "Bioenergy": 0.0298,
+      "Coal": 0.0023,
+      "Gas": 0.0576,
+      "Hydro": 0.4513,
+      "Nuclear": 0.0013,
+      "Other Fossil": 0.4391,
       "Other Renewables": 0.0004,
-      "Solar": 0.0061,
-      "Wind": 0.0121
+      "Solar": 0.0063,
+      "Wind": 0.0118
     }
   },
   "EE": {
@@ -4232,37 +4232,37 @@
       "Wind": 0.1014
     },
     "2023": {
-      "Bioenergy": 0.0748,
+      "Bioenergy": 0.0749,
       "Coal": 0.0613,
-      "Gas": 0.0993,
-      "Hydro": 0.0703,
+      "Gas": 0.0994,
+      "Hydro": 0.0704,
       "Nuclear": 0.0825,
       "Other Fossil": 0.3376,
       "Other Renewables": 0.0027,
-      "Solar": 0.1162,
-      "Wind": 0.1553
+      "Solar": 0.1159,
+      "Wind": 0.1554
     },
     "2024": {
-      "Bioenergy": 0.0656,
-      "Coal": 0.0516,
-      "Gas": 0.0878,
-      "Hydro": 0.0674,
-      "Nuclear": 0.076,
-      "Other Fossil": 0.3017,
+      "Bioenergy": 0.0677,
+      "Coal": 0.0508,
+      "Gas": 0.0867,
+      "Hydro": 0.0661,
+      "Nuclear": 0.0753,
+      "Other Fossil": 0.3045,
       "Other Renewables": 0.0024,
-      "Solar": 0.1486,
-      "Wind": 0.1989
+      "Solar": 0.1442,
+      "Wind": 0.2023
     },
     "2025": {
-      "Bioenergy": 0.0687,
-      "Coal": 0.0659,
-      "Gas": 0.1159,
-      "Hydro": 0.0686,
-      "Nuclear": 0.0885,
-      "Other Fossil": 0.2485,
-      "Other Renewables": 0.0028,
-      "Solar": 0.0437,
-      "Wind": 0.2973
+      "Bioenergy": 0.0769,
+      "Coal": 0.0593,
+      "Gas": 0.1081,
+      "Hydro": 0.064,
+      "Nuclear": 0.0836,
+      "Other Fossil": 0.2981,
+      "Other Renewables": 0.0025,
+      "Solar": 0.0114,
+      "Wind": 0.296
     }
   },
   "EG": {
@@ -4459,47 +4459,47 @@
     },
     "2022": {
       "Bioenergy": 0.0154,
-      "Coal": 0.0301,
-      "Gas": 0.2929,
-      "Hydro": 0.0835,
-      "Nuclear": 0.2139,
+      "Coal": 0.0302,
+      "Gas": 0.2932,
+      "Hydro": 0.0836,
+      "Nuclear": 0.2141,
       "Other Fossil": 0.014,
       "Other Renewables": 0.0032,
-      "Solar": 0.1224,
-      "Wind": 0.2246
+      "Solar": 0.1215,
+      "Wind": 0.2248
     },
     "2023": {
-      "Bioenergy": 0.0123,
-      "Coal": 0.0158,
-      "Gas": 0.2179,
-      "Hydro": 0.0971,
-      "Nuclear": 0.2173,
-      "Other Fossil": 0.0108,
+      "Bioenergy": 0.0124,
+      "Coal": 0.0159,
+      "Gas": 0.2193,
+      "Hydro": 0.0978,
+      "Nuclear": 0.2187,
+      "Other Fossil": 0.0109,
       "Other Renewables": 0.0029,
-      "Solar": 0.1821,
-      "Wind": 0.2438
+      "Solar": 0.1767,
+      "Wind": 0.2454
     },
     "2024": {
-      "Bioenergy": 0.0137,
-      "Coal": 0.0119,
-      "Gas": 0.1665,
+      "Bioenergy": 0.0138,
+      "Coal": 0.012,
+      "Gas": 0.1708,
       "Hydro": 0.1279,
-      "Nuclear": 0.2072,
+      "Nuclear": 0.2102,
       "Other Fossil": 0.0094,
-      "Other Renewables": 0.0026,
-      "Solar": 0.226,
-      "Wind": 0.2349
+      "Other Renewables": 0.0027,
+      "Solar": 0.2166,
+      "Wind": 0.2368
     },
     "2025": {
-      "Bioenergy": 0.0152,
-      "Coal": 0.0152,
-      "Gas": 0.2486,
-      "Hydro": 0.123,
-      "Nuclear": 0.19,
-      "Other Fossil": 0.0094,
-      "Other Renewables": 0.0026,
-      "Solar": 0.145,
-      "Wind": 0.2512
+      "Bioenergy": 0.0141,
+      "Coal": 0.0133,
+      "Gas": 0.1764,
+      "Hydro": 0.1264,
+      "Nuclear": 0.2308,
+      "Other Fossil": 0.0071,
+      "Other Renewables": 0.0022,
+      "Solar": 0.1012,
+      "Wind": 0.3285
     }
   },
   "ET": {
@@ -4638,26 +4638,26 @@
       "Wind": 0.1767
     },
     "2024": {
-      "Bioenergy": 0.1105,
-      "Coal": 0.0186,
-      "Gas": 0.0181,
-      "Hydro": 0.1835,
-      "Nuclear": 0.3751,
-      "Other Fossil": 0.0425,
-      "Other Renewables": 0.0015,
-      "Solar": 0.0175,
-      "Wind": 0.2328
+      "Bioenergy": 0.1133,
+      "Coal": 0.0185,
+      "Gas": 0.0195,
+      "Hydro": 0.1771,
+      "Nuclear": 0.3746,
+      "Other Fossil": 0.0433,
+      "Other Renewables": 0.0014,
+      "Solar": 0.017,
+      "Wind": 0.2351
     },
     "2025": {
-      "Bioenergy": 0.1101,
-      "Coal": 0.0131,
-      "Gas": 0.0079,
-      "Hydro": 0.1599,
-      "Nuclear": 0.3578,
-      "Other Fossil": 0.0433,
-      "Other Renewables": 0.0039,
-      "Solar": 0.0026,
-      "Wind": 0.3014
+      "Bioenergy": 0.1097,
+      "Coal": 0.0204,
+      "Gas": 0.0397,
+      "Hydro": 0.1354,
+      "Nuclear": 0.3725,
+      "Other Fossil": 0.0558,
+      "Other Renewables": 0.0038,
+      "Solar": 0.0023,
+      "Wind": 0.2603
     }
   },
   "FJ": {
@@ -4955,25 +4955,25 @@
     },
     "2024": {
       "Bioenergy": 0.006,
-      "Coal": 0.0013,
-      "Gas": 0.0347,
-      "Hydro": 0.1212,
-      "Nuclear": 0.6969,
-      "Other Fossil": 0.0063,
+      "Coal": 0.0012,
+      "Gas": 0.0341,
+      "Hydro": 0.1223,
+      "Nuclear": 0.6963,
+      "Other Fossil": 0.0062,
       "Other Renewables": 0,
-      "Solar": 0.0455,
-      "Wind": 0.0881
+      "Solar": 0.0444,
+      "Wind": 0.0896
     },
     "2025": {
-      "Bioenergy": 0.0057,
-      "Coal": 0.0033,
-      "Gas": 0.0572,
-      "Hydro": 0.0943,
-      "Nuclear": 0.7172,
-      "Other Fossil": 0.0068,
+      "Bioenergy": 0.0054,
+      "Coal": 0.0063,
+      "Gas": 0.053,
+      "Hydro": 0.1112,
+      "Nuclear": 0.6957,
+      "Other Fossil": 0.0063,
       "Other Renewables": 0,
-      "Solar": 0.026,
-      "Wind": 0.0897
+      "Solar": 0.0189,
+      "Wind": 0.1032
     }
   },
   "GA": {
@@ -5101,37 +5101,37 @@
       "Wind": 0.2799
     },
     "2023": {
-      "Bioenergy": 0.0537,
+      "Bioenergy": 0.0538,
       "Coal": 0.0237,
       "Gas": 0.3527,
       "Hydro": 0.0279,
       "Nuclear": 0.1645,
-      "Other Fossil": 0.0117,
+      "Other Fossil": 0.0116,
       "Other Renewables": 0.0006,
       "Solar": 0.0524,
       "Wind": 0.3127
     },
     "2024": {
-      "Bioenergy": 0.0738,
-      "Coal": 0.0223,
-      "Gas": 0.2995,
-      "Hydro": 0.0365,
-      "Nuclear": 0.1683,
-      "Other Fossil": 0.015,
+      "Bioenergy": 0.0736,
+      "Coal": 0.0222,
+      "Gas": 0.2986,
+      "Hydro": 0.0362,
+      "Nuclear": 0.1679,
+      "Other Fossil": 0.0149,
       "Other Renewables": 0.0008,
-      "Solar": 0.0596,
-      "Wind": 0.3243
+      "Solar": 0.0617,
+      "Wind": 0.324
     },
     "2025": {
-      "Bioenergy": 0.0574,
-      "Coal": 0.0116,
-      "Gas": 0.3029,
-      "Hydro": 0.0318,
-      "Nuclear": 0.1309,
-      "Other Fossil": 0.0156,
+      "Bioenergy": 0.0658,
+      "Coal": 0.013,
+      "Gas": 0.4042,
+      "Hydro": 0.0294,
+      "Nuclear": 0.1328,
+      "Other Fossil": 0.0169,
       "Other Renewables": 0.0005,
-      "Solar": 0.0118,
-      "Wind": 0.4374
+      "Solar": 0.0182,
+      "Wind": 0.3192
     }
   },
   "GD": {
@@ -5271,25 +5271,25 @@
     },
     "2024": {
       "Bioenergy": 0.0016,
-      "Coal": 0.042,
-      "Gas": 0.1973,
-      "Hydro": 0.7349,
-      "Nuclear": 0.004,
+      "Coal": 0.0406,
+      "Gas": 0.2034,
+      "Hydro": 0.731,
+      "Nuclear": 0.0039,
       "Other Fossil": 0.0004,
       "Other Renewables": 0.0004,
-      "Solar": 0.0056,
-      "Wind": 0.0137
+      "Solar": 0.0052,
+      "Wind": 0.0135
     },
     "2025": {
-      "Bioenergy": 0.0039,
-      "Coal": 0.1056,
-      "Gas": 0.2942,
-      "Hydro": 0.5453,
-      "Nuclear": 0.0106,
-      "Other Fossil": 0.0011,
-      "Other Renewables": 0.001,
-      "Solar": 0.0147,
-      "Wind": 0.0236
+      "Bioenergy": 0.0035,
+      "Coal": 0.0883,
+      "Gas": 0.3688,
+      "Hydro": 0.4969,
+      "Nuclear": 0.0086,
+      "Other Fossil": 0.0009,
+      "Other Renewables": 0.0008,
+      "Solar": 0.011,
+      "Wind": 0.0212
     }
   },
   "GF": {
@@ -5966,7 +5966,7 @@
       "Nuclear": 0.0186,
       "Other Fossil": 0.002,
       "Other Renewables": 0.0006,
-      "Solar": 0.1233,
+      "Solar": 0.1232,
       "Wind": 0.2102
     },
     "2023": {
@@ -5977,30 +5977,30 @@
       "Nuclear": 0.0222,
       "Other Fossil": 0.0023,
       "Other Renewables": 0.0007,
-      "Solar": 0.1782,
+      "Solar": 0.1781,
       "Wind": 0.2194
     },
     "2024": {
       "Bioenergy": 0.0007,
-      "Coal": 0.0668,
-      "Gas": 0.4211,
-      "Hydro": 0.0564,
+      "Coal": 0.0675,
+      "Gas": 0.4215,
+      "Hydro": 0.0575,
       "Nuclear": 0.0053,
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0002,
-      "Solar": 0.2302,
-      "Wind": 0.2187
+      "Solar": 0.2274,
+      "Wind": 0.2193
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.0917,
-      "Gas": 0.481,
-      "Hydro": 0.0224,
+      "Coal": 0.1116,
+      "Gas": 0.4989,
+      "Hydro": 0.0481,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.1655,
-      "Wind": 0.2394
+      "Solar": 0.1575,
+      "Wind": 0.1838
     }
   },
   "GT": {
@@ -6346,7 +6346,7 @@
       "Bioenergy": 0.0076,
       "Coal": 0.5707,
       "Gas": 0.3431,
-      "Hydro": 0.0328,
+      "Hydro": 0.0327,
       "Nuclear": 0.0134,
       "Other Fossil": 0.0061,
       "Other Renewables": 0.0012,
@@ -6366,7 +6366,7 @@
     },
     "2023": {
       "Bioenergy": 0.0081,
-      "Coal": 0.5687,
+      "Coal": 0.5686,
       "Gas": 0.3405,
       "Hydro": 0.0292,
       "Nuclear": 0.0134,
@@ -6377,25 +6377,25 @@
     },
     "2024": {
       "Bioenergy": 0.0079,
-      "Coal": 0.5641,
-      "Gas": 0.3395,
-      "Hydro": 0.0306,
+      "Coal": 0.5645,
+      "Gas": 0.3396,
+      "Hydro": 0.0302,
       "Nuclear": 0.0132,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.0013,
-      "Solar": 0.02,
+      "Solar": 0.0198,
       "Wind": 0.0183
     },
     "2025": {
-      "Bioenergy": 0.008,
-      "Coal": 0.5667,
-      "Gas": 0.3393,
-      "Hydro": 0.0258,
-      "Nuclear": 0.014,
-      "Other Fossil": 0.0051,
+      "Bioenergy": 0.0085,
+      "Coal": 0.5698,
+      "Gas": 0.3398,
+      "Hydro": 0.0229,
+      "Nuclear": 0.0139,
+      "Other Fossil": 0.0052,
       "Other Renewables": 0.0013,
-      "Solar": 0.0199,
-      "Wind": 0.0199
+      "Solar": 0.0182,
+      "Wind": 0.0204
     }
   },
   "HN": {
@@ -6457,8 +6457,8 @@
     "2024": {
       "Bioenergy": 0.1283,
       "Coal": 0.0052,
-      "Gas": 0.0055,
-      "Hydro": 0.2228,
+      "Gas": 0.0054,
+      "Hydro": 0.2229,
       "Nuclear": 0.0005,
       "Other Fossil": 0.4373,
       "Other Renewables": 0.0264,
@@ -6466,15 +6466,15 @@
       "Wind": 0.074
     },
     "2025": {
-      "Bioenergy": 0.1283,
-      "Coal": 0.0052,
-      "Gas": 0.0053,
-      "Hydro": 0.2226,
-      "Nuclear": 0.0003,
-      "Other Fossil": 0.4373,
+      "Bioenergy": 0.1282,
+      "Coal": 0.0051,
+      "Gas": 0.0049,
+      "Hydro": 0.2233,
+      "Nuclear": 0.0004,
+      "Other Fossil": 0.4371,
       "Other Renewables": 0.0264,
-      "Solar": 0.1001,
-      "Wind": 0.0743
+      "Solar": 0.1002,
+      "Wind": 0.0742
     }
   },
   "HR": {
@@ -6512,48 +6512,48 @@
       "Wind": 0.138
     },
     "2022": {
-      "Bioenergy": 0.0448,
-      "Coal": 0.1285,
-      "Gas": 0.2545,
-      "Hydro": 0.2977,
-      "Nuclear": 0.0573,
+      "Bioenergy": 0.0447,
+      "Coal": 0.1282,
+      "Gas": 0.2539,
+      "Hydro": 0.2971,
+      "Nuclear": 0.0572,
       "Other Fossil": 0.0075,
       "Other Renewables": 0.0244,
-      "Solar": 0.0249,
-      "Wind": 0.1604
+      "Solar": 0.027,
+      "Wind": 0.1601
     },
     "2023": {
       "Bioenergy": 0.0378,
       "Coal": 0.0881,
-      "Gas": 0.2239,
-      "Hydro": 0.4059,
-      "Nuclear": 0.0293,
+      "Gas": 0.2241,
+      "Hydro": 0.4061,
+      "Nuclear": 0.0294,
       "Other Fossil": 0.009,
       "Other Renewables": 0.0153,
-      "Solar": 0.033,
-      "Wind": 0.1576
+      "Solar": 0.0324,
+      "Wind": 0.1578
     },
     "2024": {
-      "Bioenergy": 0.0403,
-      "Coal": 0.0754,
-      "Gas": 0.2086,
-      "Hydro": 0.3471,
-      "Nuclear": 0.0551,
-      "Other Fossil": 0.0099,
-      "Other Renewables": 0.0165,
-      "Solar": 0.0738,
-      "Wind": 0.1733
+      "Bioenergy": 0.04,
+      "Coal": 0.0744,
+      "Gas": 0.2146,
+      "Hydro": 0.3474,
+      "Nuclear": 0.0542,
+      "Other Fossil": 0.0097,
+      "Other Renewables": 0.0163,
+      "Solar": 0.0701,
+      "Wind": 0.1734
     },
     "2025": {
-      "Bioenergy": 0.0398,
-      "Coal": 0.1288,
-      "Gas": 0.1765,
-      "Hydro": 0.3014,
-      "Nuclear": 0.0493,
-      "Other Fossil": 0.0116,
-      "Other Renewables": 0.0213,
-      "Solar": 0.0481,
-      "Wind": 0.2231
+      "Bioenergy": 0.0364,
+      "Coal": 0.0333,
+      "Gas": 0.2655,
+      "Hydro": 0.3492,
+      "Nuclear": 0.0469,
+      "Other Fossil": 0.0108,
+      "Other Renewables": 0.0134,
+      "Solar": 0.0124,
+      "Wind": 0.232
     }
   },
   "HT": {
@@ -6673,45 +6673,45 @@
       "Bioenergy": 0.0332,
       "Coal": 0.1096,
       "Gas": 0.2423,
-      "Hydro": 0.0448,
+      "Hydro": 0.0449,
       "Nuclear": 0.3819,
       "Other Fossil": 0.0219,
       "Other Renewables": 0.0044,
       "Solar": 0.1176,
-      "Wind": 0.0442
+      "Wind": 0.0443
     },
     "2023": {
       "Bioenergy": 0.0239,
       "Coal": 0.0985,
-      "Gas": 0.2078,
+      "Gas": 0.2079,
       "Hydro": 0.0475,
       "Nuclear": 0.3887,
-      "Other Fossil": 0.0194,
+      "Other Fossil": 0.0193,
       "Other Renewables": 0.0027,
-      "Solar": 0.1646,
-      "Wind": 0.0469
+      "Solar": 0.1644,
+      "Wind": 0.047
     },
     "2024": {
-      "Bioenergy": 0.026,
-      "Coal": 0.0873,
-      "Gas": 0.1904,
-      "Hydro": 0.0457,
-      "Nuclear": 0.3693,
-      "Other Fossil": 0.0179,
-      "Other Renewables": 0.0038,
-      "Solar": 0.2157,
-      "Wind": 0.0437
+      "Bioenergy": 0.0264,
+      "Coal": 0.0878,
+      "Gas": 0.1907,
+      "Hydro": 0.0455,
+      "Nuclear": 0.3703,
+      "Other Fossil": 0.0177,
+      "Other Renewables": 0.004,
+      "Solar": 0.2128,
+      "Wind": 0.0448
     },
     "2025": {
-      "Bioenergy": 0.0331,
-      "Coal": 0.0898,
-      "Gas": 0.2651,
-      "Hydro": 0.0441,
-      "Nuclear": 0.3817,
-      "Other Fossil": 0.0194,
-      "Other Renewables": 0.004,
-      "Solar": 0.1176,
-      "Wind": 0.0451
+      "Bioenergy": 0.034,
+      "Coal": 0.0755,
+      "Gas": 0.2807,
+      "Hydro": 0.0477,
+      "Nuclear": 0.3767,
+      "Other Fossil": 0.0168,
+      "Other Renewables": 0.0039,
+      "Solar": 0.1115,
+      "Wind": 0.0533
     }
   },
   "ID": {
@@ -6772,7 +6772,7 @@
     },
     "2024": {
       "Bioenergy": 0.0411,
-      "Coal": 0.5903,
+      "Coal": 0.5904,
       "Gas": 0.2103,
       "Hydro": 0.0719,
       "Nuclear": 0.0003,
@@ -6783,14 +6783,14 @@
     },
     "2025": {
       "Bioenergy": 0.0411,
-      "Coal": 0.5904,
+      "Coal": 0.5905,
       "Gas": 0.2103,
-      "Hydro": 0.0718,
+      "Hydro": 0.0717,
       "Nuclear": 0.0003,
       "Other Fossil": 0.0356,
       "Other Renewables": 0.0476,
       "Solar": 0.0008,
-      "Wind": 0.002
+      "Wind": 0.0021
     }
   },
   "IE": {
@@ -6831,7 +6831,7 @@
       "Bioenergy": 0.006,
       "Coal": 0.0869,
       "Gas": 0.4646,
-      "Hydro": 0.0324,
+      "Hydro": 0.0325,
       "Nuclear": 0.0163,
       "Other Fossil": 0.0583,
       "Other Renewables": 0.0005,
@@ -6846,30 +6846,30 @@
       "Nuclear": 0.0246,
       "Other Fossil": 0.036,
       "Other Renewables": 0.0008,
-      "Solar": 0.0192,
+      "Solar": 0.0191,
       "Wind": 0.3593
     },
     "2024": {
       "Bioenergy": 0.0079,
-      "Coal": 0.0496,
-      "Gas": 0.4519,
-      "Hydro": 0.0493,
-      "Nuclear": 0.0318,
-      "Other Fossil": 0.0391,
+      "Coal": 0.0486,
+      "Gas": 0.4406,
+      "Hydro": 0.0502,
+      "Nuclear": 0.0319,
+      "Other Fossil": 0.0387,
       "Other Renewables": 0.001,
-      "Solar": 0.033,
-      "Wind": 0.3364
+      "Solar": 0.0327,
+      "Wind": 0.3483
     },
     "2025": {
-      "Bioenergy": 0.0069,
-      "Coal": 0.0457,
-      "Gas": 0.5287,
-      "Hydro": 0.0369,
-      "Nuclear": 0.0268,
-      "Other Fossil": 0.0382,
-      "Other Renewables": 0.0009,
-      "Solar": 0.0111,
-      "Wind": 0.3047
+      "Bioenergy": 0.0068,
+      "Coal": 0.0352,
+      "Gas": 0.4044,
+      "Hydro": 0.0492,
+      "Nuclear": 0.0275,
+      "Other Fossil": 0.0341,
+      "Other Renewables": 0.0008,
+      "Solar": 0.01,
+      "Wind": 0.432
     }
   },
   "IL": {
@@ -7008,26 +7008,26 @@
       "Wind": 0.0482
     },
     "2024": {
-      "Bioenergy": 0.0069,
-      "Coal": 0.7362,
-      "Gas": 0.0187,
-      "Hydro": 0.0873,
+      "Bioenergy": 0.0074,
+      "Coal": 0.7357,
+      "Gas": 0.0188,
+      "Hydro": 0.0865,
       "Nuclear": 0.0303,
       "Other Fossil": 0.0002,
       "Other Renewables": 0.0016,
-      "Solar": 0.0747,
-      "Wind": 0.0439
+      "Solar": 0.0741,
+      "Wind": 0.0452
     },
     "2025": {
-      "Bioenergy": 0.0097,
-      "Coal": 0.7644,
-      "Gas": 0.0106,
-      "Hydro": 0.0706,
-      "Nuclear": 0.0358,
+      "Bioenergy": 0.0163,
+      "Coal": 0.7566,
+      "Gas": 0.0114,
+      "Hydro": 0.0607,
+      "Nuclear": 0.0363,
       "Other Fossil": 0.0003,
-      "Other Renewables": 0.0018,
-      "Solar": 0.0837,
-      "Wind": 0.0231
+      "Other Renewables": 0.0016,
+      "Solar": 0.076,
+      "Wind": 0.0408
     }
   },
   "IQ": {
@@ -7168,10 +7168,10 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.808,
-      "Hydro": 0.0563,
+      "Gas": 0.7923,
+      "Hydro": 0.0568,
       "Nuclear": 0,
-      "Other Fossil": 0.1357,
+      "Other Fossil": 0.151,
       "Other Renewables": 0,
       "Solar": 0,
       "Wind": 0
@@ -7179,10 +7179,10 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.826,
-      "Hydro": 0.0248,
+      "Gas": 0.6419,
+      "Hydro": 0.0243,
       "Nuclear": 0,
-      "Other Fossil": 0.1492,
+      "Other Fossil": 0.3338,
       "Other Renewables": 0,
       "Solar": 0,
       "Wind": 0
@@ -7318,32 +7318,32 @@
       "Gas": 0.4226,
       "Hydro": 0.1517,
       "Nuclear": 0.0347,
-      "Other Fossil": 0.0331,
+      "Other Fossil": 0.033,
       "Other Renewables": 0.0193,
-      "Solar": 0.1143,
+      "Solar": 0.1142,
       "Wind": 0.1015
     },
     "2024": {
-      "Bioenergy": 0.0554,
-      "Coal": 0.0346,
-      "Gas": 0.4091,
-      "Hydro": 0.1895,
-      "Nuclear": 0.0342,
-      "Other Fossil": 0.0311,
-      "Other Renewables": 0.0188,
-      "Solar": 0.1339,
-      "Wind": 0.0934
+      "Bioenergy": 0.0555,
+      "Coal": 0.0351,
+      "Gas": 0.4092,
+      "Hydro": 0.1862,
+      "Nuclear": 0.0346,
+      "Other Fossil": 0.0313,
+      "Other Renewables": 0.0189,
+      "Solar": 0.1321,
+      "Wind": 0.097
     },
     "2025": {
-      "Bioenergy": 0.0529,
-      "Coal": 0.0347,
-      "Gas": 0.5076,
-      "Hydro": 0.1484,
-      "Nuclear": 0.032,
-      "Other Fossil": 0.0212,
-      "Other Renewables": 0.019,
-      "Solar": 0.0895,
-      "Wind": 0.0948
+      "Bioenergy": 0.0541,
+      "Coal": 0.04,
+      "Gas": 0.506,
+      "Hydro": 0.1128,
+      "Nuclear": 0.0359,
+      "Other Fossil": 0.0251,
+      "Other Renewables": 0.0192,
+      "Solar": 0.072,
+      "Wind": 0.135
     }
   },
   "JM": {
@@ -7561,26 +7561,26 @@
       "Wind": 0.0183
     },
     "2024": {
-      "Bioenergy": 0.0566,
-      "Coal": 0.284,
-      "Gas": 0.3074,
-      "Hydro": 0.0789,
-      "Nuclear": 0.0875,
-      "Other Fossil": 0.0333,
-      "Other Renewables": 0.01,
-      "Solar": 0.1262,
-      "Wind": 0.0162
+      "Bioenergy": 0.0599,
+      "Coal": 0.2822,
+      "Gas": 0.304,
+      "Hydro": 0.0787,
+      "Nuclear": 0.0902,
+      "Other Fossil": 0.0337,
+      "Other Renewables": 0.0102,
+      "Solar": 0.1232,
+      "Wind": 0.018
     },
     "2025": {
-      "Bioenergy": 0.056,
-      "Coal": 0.3013,
-      "Gas": 0.307,
-      "Hydro": 0.0681,
-      "Nuclear": 0.0867,
-      "Other Fossil": 0.032,
-      "Other Renewables": 0.0094,
-      "Solar": 0.1264,
-      "Wind": 0.0131
+      "Bioenergy": 0.0702,
+      "Coal": 0.2957,
+      "Gas": 0.2925,
+      "Hydro": 0.0657,
+      "Nuclear": 0.0982,
+      "Other Fossil": 0.0335,
+      "Other Renewables": 0.0102,
+      "Solar": 0.1135,
+      "Wind": 0.0206
     }
   },
   "KE": {
@@ -7675,70 +7675,70 @@
       "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0,
-      "Coal": 0.0831,
-      "Gas": 0.0039,
-      "Hydro": 0.9096,
-      "Nuclear": 0,
-      "Other Fossil": 0.0033,
-      "Other Renewables": 0,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0003,
+      "Coal": 0.0924,
+      "Gas": 0.006,
+      "Hydro": 0.8954,
+      "Nuclear": 0.0009,
+      "Other Fossil": 0.0034,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0006,
+      "Wind": 0.0009
     },
     "2021": {
-      "Bioenergy": 0,
-      "Coal": 0.1245,
-      "Gas": 0.0113,
-      "Hydro": 0.8601,
-      "Nuclear": 0,
-      "Other Fossil": 0.0042,
-      "Other Renewables": 0,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0007,
+      "Coal": 0.1427,
+      "Gas": 0.015,
+      "Hydro": 0.8342,
+      "Nuclear": 0.0019,
+      "Other Fossil": 0.0017,
+      "Other Renewables": 0.0002,
+      "Solar": 0.0015,
+      "Wind": 0.0021
     },
     "2022": {
-      "Bioenergy": 0,
-      "Coal": 0.1164,
-      "Gas": 0.0092,
-      "Hydro": 0.8691,
-      "Nuclear": 0,
-      "Other Fossil": 0.0054,
-      "Other Renewables": 0,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0017,
+      "Coal": 0.1553,
+      "Gas": 0.0167,
+      "Hydro": 0.8089,
+      "Nuclear": 0.0046,
+      "Other Fossil": 0.0022,
+      "Other Renewables": 0.0004,
+      "Solar": 0.0043,
+      "Wind": 0.0059
     },
     "2023": {
-      "Bioenergy": 0,
-      "Coal": 0.1276,
-      "Gas": 0.0084,
-      "Hydro": 0.8589,
-      "Nuclear": 0,
-      "Other Fossil": 0.005,
-      "Other Renewables": 0,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0016,
+      "Coal": 0.1593,
+      "Gas": 0.0155,
+      "Hydro": 0.807,
+      "Nuclear": 0.004,
+      "Other Fossil": 0.0029,
+      "Other Renewables": 0.0004,
+      "Solar": 0.0039,
+      "Wind": 0.0054
     },
     "2024": {
-      "Bioenergy": 0,
-      "Coal": 0.0886,
-      "Gas": 0.0087,
-      "Hydro": 0.8846,
-      "Nuclear": 0,
-      "Other Fossil": 0.0181,
-      "Other Renewables": 0,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0019,
+      "Coal": 0.1307,
+      "Gas": 0.0169,
+      "Hydro": 0.8151,
+      "Nuclear": 0.0047,
+      "Other Fossil": 0.017,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0066,
+      "Wind": 0.0066
     },
     "2025": {
-      "Bioenergy": 0,
-      "Coal": 0.0631,
-      "Gas": 0.009,
-      "Hydro": 0.9009,
-      "Nuclear": 0,
-      "Other Fossil": 0.027,
-      "Other Renewables": 0,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0017,
+      "Coal": 0.101,
+      "Gas": 0.0157,
+      "Hydro": 0.8402,
+      "Nuclear": 0.0041,
+      "Other Fossil": 0.0254,
+      "Other Renewables": 0.0004,
+      "Solar": 0.0053,
+      "Wind": 0.0061
     }
   },
   "KH": {
@@ -7799,25 +7799,25 @@
     },
     "2024": {
       "Bioenergy": 0.0134,
-      "Coal": 0.4629,
-      "Gas": 0.0246,
-      "Hydro": 0.3812,
+      "Coal": 0.4633,
+      "Gas": 0.0247,
+      "Hydro": 0.3808,
       "Nuclear": 0.0133,
       "Other Fossil": 0.0552,
       "Other Renewables": 0.0013,
-      "Solar": 0.0297,
+      "Solar": 0.0295,
       "Wind": 0.0184
     },
     "2025": {
-      "Bioenergy": 0.0135,
-      "Coal": 0.4655,
-      "Gas": 0.0244,
-      "Hydro": 0.3764,
-      "Nuclear": 0.0141,
-      "Other Fossil": 0.0551,
+      "Bioenergy": 0.014,
+      "Coal": 0.4686,
+      "Gas": 0.0249,
+      "Hydro": 0.3735,
+      "Nuclear": 0.014,
+      "Other Fossil": 0.0552,
       "Other Renewables": 0.0013,
-      "Solar": 0.0296,
-      "Wind": 0.02
+      "Solar": 0.0279,
+      "Wind": 0.0205
     }
   },
   "KI": {
@@ -8285,10 +8285,10 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.5832,
+      "Gas": 0.5833,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.4168,
+      "Other Fossil": 0.4167,
       "Other Renewables": 0,
       "Solar": 0,
       "Wind": 0
@@ -8964,45 +8964,45 @@
       "Bioenergy": 0.0516,
       "Coal": 0.1206,
       "Gas": 0.2259,
-      "Hydro": 0.1431,
+      "Hydro": 0.1432,
       "Nuclear": 0.1412,
       "Other Fossil": 0.0472,
       "Other Renewables": 0.0047,
-      "Solar": 0.0643,
-      "Wind": 0.2013
+      "Solar": 0.0641,
+      "Wind": 0.2014
     },
     "2023": {
       "Bioenergy": 0.0386,
       "Coal": 0.0891,
-      "Gas": 0.1949,
-      "Hydro": 0.1349,
-      "Nuclear": 0.1201,
-      "Other Fossil": 0.0576,
+      "Gas": 0.195,
+      "Hydro": 0.135,
+      "Nuclear": 0.1202,
+      "Other Fossil": 0.0575,
       "Other Renewables": 0.0039,
-      "Solar": 0.0896,
-      "Wind": 0.2713
+      "Solar": 0.0892,
+      "Wind": 0.2715
     },
     "2024": {
-      "Bioenergy": 0.0302,
-      "Coal": 0.0617,
-      "Gas": 0.1637,
-      "Hydro": 0.112,
-      "Nuclear": 0.0922,
-      "Other Fossil": 0.084,
-      "Other Renewables": 0.003,
-      "Solar": 0.1424,
-      "Wind": 0.3108
+      "Bioenergy": 0.0307,
+      "Coal": 0.0607,
+      "Gas": 0.1656,
+      "Hydro": 0.1101,
+      "Nuclear": 0.0911,
+      "Other Fossil": 0.0841,
+      "Other Renewables": 0.0029,
+      "Solar": 0.1399,
+      "Wind": 0.3149
     },
     "2025": {
-      "Bioenergy": 0.0219,
-      "Coal": 0.0686,
-      "Gas": 0.1934,
-      "Hydro": 0.0896,
-      "Nuclear": 0.0921,
-      "Other Fossil": 0.1004,
-      "Other Renewables": 0.003,
-      "Solar": 0.0343,
-      "Wind": 0.3967
+      "Bioenergy": 0.0256,
+      "Coal": 0.0489,
+      "Gas": 0.253,
+      "Hydro": 0.0773,
+      "Nuclear": 0.0689,
+      "Other Fossil": 0.0973,
+      "Other Renewables": 0.002,
+      "Solar": 0.0258,
+      "Wind": 0.4012
     }
   },
   "LU": {
@@ -9041,47 +9041,47 @@
     },
     "2022": {
       "Bioenergy": 0.0844,
-      "Coal": 0.1282,
-      "Gas": 0.2269,
-      "Hydro": 0.1305,
+      "Coal": 0.1281,
+      "Gas": 0.2268,
+      "Hydro": 0.1306,
       "Nuclear": 0.1501,
       "Other Fossil": 0.0383,
       "Other Renewables": 0.005,
-      "Solar": 0.0882,
-      "Wind": 0.1485
+      "Solar": 0.088,
+      "Wind": 0.1486
     },
     "2023": {
       "Bioenergy": 0.0551,
       "Coal": 0.111,
-      "Gas": 0.1979,
+      "Gas": 0.1981,
       "Hydro": 0.1442,
-      "Nuclear": 0.1505,
-      "Other Fossil": 0.0368,
+      "Nuclear": 0.1506,
+      "Other Fossil": 0.0367,
       "Other Renewables": 0.0049,
-      "Solar": 0.0996,
-      "Wind": 0.2001
+      "Solar": 0.0991,
+      "Wind": 0.2003
     },
     "2024": {
-      "Bioenergy": 0.0755,
-      "Coal": 0.0983,
-      "Gas": 0.1812,
-      "Hydro": 0.1573,
-      "Nuclear": 0.1474,
-      "Other Fossil": 0.0351,
+      "Bioenergy": 0.0735,
+      "Coal": 0.0981,
+      "Gas": 0.1811,
+      "Hydro": 0.1563,
+      "Nuclear": 0.1477,
+      "Other Fossil": 0.0371,
       "Other Renewables": 0.0047,
-      "Solar": 0.1188,
-      "Wind": 0.1817
+      "Solar": 0.1156,
+      "Wind": 0.1859
     },
     "2025": {
-      "Bioenergy": 0.09,
-      "Coal": 0.1167,
-      "Gas": 0.2279,
-      "Hydro": 0.1442,
-      "Nuclear": 0.1566,
-      "Other Fossil": 0.0161,
-      "Other Renewables": 0.005,
-      "Solar": 0.0502,
-      "Wind": 0.1934
+      "Bioenergy": 0.0842,
+      "Coal": 0.1083,
+      "Gas": 0.2187,
+      "Hydro": 0.1382,
+      "Nuclear": 0.1527,
+      "Other Fossil": 0.037,
+      "Other Renewables": 0.0045,
+      "Solar": 0.042,
+      "Wind": 0.2144
     }
   },
   "LV": {
@@ -9126,41 +9126,41 @@
       "Nuclear": 0.0677,
       "Other Fossil": 0.0449,
       "Other Renewables": 0.0023,
-      "Solar": 0.0232,
-      "Wind": 0.0623
+      "Solar": 0.0231,
+      "Wind": 0.0624
     },
     "2023": {
       "Bioenergy": 0.0367,
-      "Coal": 0.0389,
-      "Gas": 0.2484,
-      "Hydro": 0.4886,
+      "Coal": 0.039,
+      "Gas": 0.2485,
+      "Hydro": 0.4887,
       "Nuclear": 0.0568,
       "Other Fossil": 0.0241,
       "Other Renewables": 0.0018,
-      "Solar": 0.041,
-      "Wind": 0.0636
+      "Solar": 0.0407,
+      "Wind": 0.0637
     },
     "2024": {
-      "Bioenergy": 0.0461,
-      "Coal": 0.0392,
-      "Gas": 0.2716,
-      "Hydro": 0.4222,
-      "Nuclear": 0.0586,
-      "Other Fossil": 0.0162,
+      "Bioenergy": 0.0459,
+      "Coal": 0.0393,
+      "Gas": 0.2678,
+      "Hydro": 0.4256,
+      "Nuclear": 0.059,
+      "Other Fossil": 0.0161,
       "Other Renewables": 0.0019,
-      "Solar": 0.0804,
-      "Wind": 0.0638
+      "Solar": 0.0779,
+      "Wind": 0.0666
     },
     "2025": {
-      "Bioenergy": 0.0463,
-      "Coal": 0.0665,
-      "Gas": 0.3712,
-      "Hydro": 0.2557,
-      "Nuclear": 0.0893,
-      "Other Fossil": 0.0261,
-      "Other Renewables": 0.0029,
-      "Solar": 0.0326,
-      "Wind": 0.1093
+      "Bioenergy": 0.0335,
+      "Coal": 0.0092,
+      "Gas": 0.3343,
+      "Hydro": 0.5338,
+      "Nuclear": 0.013,
+      "Other Fossil": 0.0172,
+      "Other Renewables": 0.0004,
+      "Solar": 0.0018,
+      "Wind": 0.0568
     }
   },
   "LY": {
@@ -9289,36 +9289,36 @@
     },
     "2023": {
       "Bioenergy": 0.0002,
-      "Coal": 0.6373,
+      "Coal": 0.6376,
       "Gas": 0.1049,
       "Hydro": 0.0204,
       "Nuclear": 0.0007,
       "Other Fossil": 0.0223,
       "Other Renewables": 0.0003,
-      "Solar": 0.0535,
-      "Wind": 0.1605
+      "Solar": 0.0536,
+      "Wind": 0.16
     },
     "2024": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.5525,
-      "Gas": 0.0995,
-      "Hydro": 0.0244,
-      "Nuclear": 0.0009,
-      "Other Fossil": 0.0207,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0519,
-      "Wind": 0.2495
+      "Bioenergy": 0.0003,
+      "Coal": 0.5699,
+      "Gas": 0.1133,
+      "Hydro": 0.0258,
+      "Nuclear": 0.001,
+      "Other Fossil": 0.0224,
+      "Other Renewables": 0.0004,
+      "Solar": 0.0411,
+      "Wind": 0.2257
     },
     "2025": {
-      "Bioenergy": 0.0002,
-      "Coal": 0.5346,
-      "Gas": 0.0985,
-      "Hydro": 0.0236,
-      "Nuclear": 0.0009,
-      "Other Fossil": 0.0209,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0553,
-      "Wind": 0.2657
+      "Bioenergy": 0.0003,
+      "Coal": 0.5767,
+      "Gas": 0.1265,
+      "Hydro": 0.027,
+      "Nuclear": 0.0013,
+      "Other Fossil": 0.0242,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0361,
+      "Wind": 0.2073
     }
   },
   "MD": {
@@ -9364,7 +9364,7 @@
       "Other Fossil": 0.0035,
       "Other Renewables": 0.001,
       "Solar": 0.0079,
-      "Wind": 0.0182
+      "Wind": 0.0183
     },
     "2023": {
       "Bioenergy": 0.0008,
@@ -9381,23 +9381,23 @@
       "Bioenergy": 0.0009,
       "Coal": 0.0046,
       "Gas": 0.9136,
-      "Hydro": 0.0478,
+      "Hydro": 0.0477,
       "Nuclear": 0.0067,
       "Other Fossil": 0.0007,
       "Other Renewables": 0.0002,
       "Solar": 0.0125,
-      "Wind": 0.0131
+      "Wind": 0.0132
     },
     "2025": {
       "Bioenergy": 0.0006,
-      "Coal": 0.0031,
+      "Coal": 0.003,
       "Gas": 0.9222,
       "Hydro": 0.045,
-      "Nuclear": 0.0042,
+      "Nuclear": 0.0043,
       "Other Fossil": 0.0004,
       "Other Renewables": 0.0001,
-      "Solar": 0.0216,
-      "Wind": 0.0028
+      "Solar": 0.0214,
+      "Wind": 0.003
     }
   },
   "ME": {
@@ -9455,28 +9455,28 @@
       "Other Renewables": 0.0002,
       "Solar": 0.0029,
       "Wind": 0.0889
-    },
-    "2024": {
-      "Bioenergy": 0.0038,
-      "Coal": 0.3737,
-      "Gas": 0.0308,
-      "Hydro": 0.4291,
-      "Nuclear": 0.0285,
+    },
+    "2024": {
+      "Bioenergy": 0.0039,
+      "Coal": 0.3767,
+      "Gas": 0.0311,
+      "Hydro": 0.4324,
+      "Nuclear": 0.0288,
       "Other Fossil": 0.0029,
       "Other Renewables": 0.0009,
-      "Solar": 0.0397,
-      "Wind": 0.0904
+      "Solar": 0.0316,
+      "Wind": 0.0917
     },
     "2025": {
-      "Bioenergy": 0.0032,
-      "Coal": 0.3581,
-      "Gas": 0.0302,
-      "Hydro": 0.4724,
-      "Nuclear": 0.023,
-      "Other Fossil": 0.0024,
-      "Other Renewables": 0.0007,
-      "Solar": 0.0267,
-      "Wind": 0.0832
+      "Bioenergy": 0.0038,
+      "Coal": 0.4091,
+      "Gas": 0.0368,
+      "Hydro": 0.4107,
+      "Nuclear": 0.0285,
+      "Other Fossil": 0.0029,
+      "Other Renewables": 0.0008,
+      "Solar": 0.0039,
+      "Wind": 0.1035
     }
   },
   "MG": {
@@ -9596,7 +9596,7 @@
       "Bioenergy": 0.0123,
       "Coal": 0.436,
       "Gas": 0.1882,
-      "Hydro": 0.2296,
+      "Hydro": 0.2297,
       "Nuclear": 0.0414,
       "Other Fossil": 0.0396,
       "Other Renewables": 0.0013,
@@ -9616,25 +9616,25 @@
     },
     "2024": {
       "Bioenergy": 0.0177,
-      "Coal": 0.3856,
-      "Gas": 0.2606,
-      "Hydro": 0.2373,
-      "Nuclear": 0.0058,
-      "Other Fossil": 0.0006,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0534,
-      "Wind": 0.0387
+      "Coal": 0.4007,
+      "Gas": 0.2387,
+      "Hydro": 0.2353,
+      "Nuclear": 0.0154,
+      "Other Fossil": 0.0015,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0477,
+      "Wind": 0.0426
     },
     "2025": {
-      "Bioenergy": 0.0208,
-      "Coal": 0.3333,
-      "Gas": 0.375,
-      "Hydro": 0.1667,
-      "Nuclear": 0,
-      "Other Fossil": 0,
-      "Other Renewables": 0,
-      "Solar": 0.0625,
-      "Wind": 0.0417
+      "Bioenergy": 0.0182,
+      "Coal": 0.3952,
+      "Gas": 0.2989,
+      "Hydro": 0.1605,
+      "Nuclear": 0.0378,
+      "Other Fossil": 0.0039,
+      "Other Renewables": 0.0011,
+      "Solar": 0.0315,
+      "Wind": 0.0531
     }
   },
   "ML": {
@@ -9901,7 +9901,7 @@
       "Bioenergy": 0.054,
       "Coal": 0.4897,
       "Gas": 0.1727,
-      "Hydro": 0.1117,
+      "Hydro": 0.1116,
       "Nuclear": 0.0457,
       "Other Fossil": 0.0375,
       "Other Renewables": 0.0042,
@@ -9931,26 +9931,26 @@
       "Wind": 0.06
     },
     "2024": {
-      "Bioenergy": 0.055,
-      "Coal": 0.4675,
-      "Gas": 0.1607,
-      "Hydro": 0.1044,
+      "Bioenergy": 0.0552,
+      "Coal": 0.4686,
+      "Gas": 0.161,
+      "Hydro": 0.103,
       "Nuclear": 0.0449,
-      "Other Fossil": 0.0341,
+      "Other Fossil": 0.0342,
       "Other Renewables": 0.0045,
-      "Solar": 0.0668,
-      "Wind": 0.0622
+      "Solar": 0.0663,
+      "Wind": 0.0624
     },
     "2025": {
-      "Bioenergy": 0.0554,
-      "Coal": 0.4763,
-      "Gas": 0.16,
-      "Hydro": 0.088,
-      "Nuclear": 0.0478,
-      "Other Fossil": 0.034,
-      "Other Renewables": 0.0045,
-      "Solar": 0.0665,
-      "Wind": 0.0677
+      "Bioenergy": 0.0571,
+      "Coal": 0.4867,
+      "Gas": 0.1616,
+      "Hydro": 0.0782,
+      "Nuclear": 0.0473,
+      "Other Fossil": 0.0343,
+      "Other Renewables": 0.0044,
+      "Solar": 0.0609,
+      "Wind": 0.0695
     }
   },
   "MQ": {
@@ -10233,7 +10233,7 @@
       "Other Fossil": 0.0277,
       "Other Renewables": 0.0011,
       "Solar": 0.0417,
-      "Wind": 0.019
+      "Wind": 0.0191
     },
     "2023": {
       "Bioenergy": 0.0043,
@@ -10243,30 +10243,30 @@
       "Nuclear": 0.0311,
       "Other Fossil": 0.008,
       "Other Renewables": 0.001,
-      "Solar": 0.1211,
+      "Solar": 0.121,
       "Wind": 0.0199
     },
     "2024": {
-      "Bioenergy": 0.0065,
-      "Coal": 0.0312,
-      "Gas": 0.6943,
-      "Hydro": 0.0419,
-      "Nuclear": 0.0472,
-      "Other Fossil": 0.007,
-      "Other Renewables": 0.0015,
-      "Solar": 0.142,
-      "Wind": 0.0284
+      "Bioenergy": 0.0062,
+      "Coal": 0.0295,
+      "Gas": 0.7049,
+      "Hydro": 0.0401,
+      "Nuclear": 0.0451,
+      "Other Fossil": 0.0068,
+      "Other Renewables": 0.0014,
+      "Solar": 0.1386,
+      "Wind": 0.0274
     },
     "2025": {
-      "Bioenergy": 0.007,
-      "Coal": 0.0377,
-      "Gas": 0.7053,
-      "Hydro": 0.0393,
-      "Nuclear": 0.0507,
-      "Other Fossil": 0.0052,
-      "Other Renewables": 0.0016,
-      "Solar": 0.12,
-      "Wind": 0.0331
+      "Bioenergy": 0.005,
+      "Coal": 0.0264,
+      "Gas": 0.7755,
+      "Hydro": 0.0285,
+      "Nuclear": 0.0373,
+      "Other Fossil": 0.0038,
+      "Other Renewables": 0.0011,
+      "Solar": 0.096,
+      "Wind": 0.0264
     }
   },
   "MU": {
@@ -10564,25 +10564,25 @@
     },
     "2024": {
       "Bioenergy": 0.0002,
-      "Coal": 0.0568,
-      "Gas": 0.6132,
-      "Hydro": 0.0712,
-      "Nuclear": 0.0333,
-      "Other Fossil": 0.1068,
-      "Other Renewables": 0.0097,
-      "Solar": 0.0533,
-      "Wind": 0.0554
+      "Coal": 0.0548,
+      "Gas": 0.6148,
+      "Hydro": 0.0676,
+      "Nuclear": 0.034,
+      "Other Fossil": 0.1088,
+      "Other Renewables": 0.01,
+      "Solar": 0.0529,
+      "Wind": 0.0568
     },
     "2025": {
-      "Bioenergy": 0,
-      "Coal": 0.0567,
-      "Gas": 0.5928,
-      "Hydro": 0.09,
-      "Nuclear": 0.0379,
-      "Other Fossil": 0.102,
-      "Other Renewables": 0.0084,
-      "Solar": 0.0527,
-      "Wind": 0.0594
+      "Bioenergy": 0.0008,
+      "Coal": 0.0438,
+      "Gas": 0.6054,
+      "Hydro": 0.0542,
+      "Nuclear": 0.0454,
+      "Other Fossil": 0.1144,
+      "Other Renewables": 0.0116,
+      "Solar": 0.0502,
+      "Wind": 0.0741
     }
   },
   "MY": {
@@ -11050,8 +11050,8 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.7402,
-      "Hydro": 0.2598,
+      "Gas": 0.7534,
+      "Hydro": 0.2466,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -11116,26 +11116,26 @@
       "Wind": 0.1534
     },
     "2024": {
-      "Bioenergy": 0.1686,
+      "Bioenergy": 0.1685,
       "Coal": 0.0032,
-      "Gas": 0.0215,
-      "Hydro": 0.0839,
-      "Nuclear": 0.0018,
-      "Other Fossil": 0.3984,
+      "Gas": 0.0212,
+      "Hydro": 0.0842,
+      "Nuclear": 0.0019,
+      "Other Fossil": 0.3985,
       "Other Renewables": 0.1562,
       "Solar": 0.0123,
       "Wind": 0.1541
     },
     "2025": {
-      "Bioenergy": 0.1686,
-      "Coal": 0.0032,
-      "Gas": 0.0208,
-      "Hydro": 0.083,
-      "Nuclear": 0.0012,
-      "Other Fossil": 0.3984,
-      "Other Renewables": 0.1561,
-      "Solar": 0.0133,
-      "Wind": 0.1552
+      "Bioenergy": 0.1683,
+      "Coal": 0.0028,
+      "Gas": 0.019,
+      "Hydro": 0.0856,
+      "Nuclear": 0.0016,
+      "Other Fossil": 0.398,
+      "Other Renewables": 0.1562,
+      "Solar": 0.0137,
+      "Wind": 0.1549
     }
   },
   "NL": {
@@ -11195,26 +11195,26 @@
       "Wind": 0.2525
     },
     "2024": {
-      "Bioenergy": 0.0498,
-      "Coal": 0.0848,
-      "Gas": 0.3677,
-      "Hydro": 0.0019,
-      "Nuclear": 0.0294,
-      "Other Fossil": 0.0112,
+      "Bioenergy": 0.053,
+      "Coal": 0.0782,
+      "Gas": 0.3594,
+      "Hydro": 0.0017,
+      "Nuclear": 0.0293,
+      "Other Fossil": 0.0117,
       "Other Renewables": 0.0048,
-      "Solar": 0.1891,
-      "Wind": 0.2615
+      "Solar": 0.1866,
+      "Wind": 0.2752
     },
     "2025": {
-      "Bioenergy": 0.0608,
-      "Coal": 0.1558,
-      "Gas": 0.4535,
-      "Hydro": 0.0009,
-      "Nuclear": 0.0323,
-      "Other Fossil": 0.0065,
-      "Other Renewables": 0.0046,
-      "Solar": 0.0396,
-      "Wind": 0.2461
+      "Bioenergy": 0.0782,
+      "Coal": 0.1388,
+      "Gas": 0.4244,
+      "Hydro": 0,
+      "Nuclear": 0.0316,
+      "Other Fossil": 0.0114,
+      "Other Renewables": 0.0044,
+      "Solar": 0.0448,
+      "Wind": 0.2663
     }
   },
   "NO": {
@@ -11255,7 +11255,7 @@
       "Bioenergy": 0.0002,
       "Coal": 0.001,
       "Gas": 0.0101,
-      "Hydro": 0.8789,
+      "Hydro": 0.879,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0018,
       "Other Renewables": 0.0027,
@@ -11287,13 +11287,13 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.0084,
-      "Hydro": 0.8747,
+      "Gas": 0.0071,
+      "Hydro": 0.9062,
       "Nuclear": 0,
-      "Other Fossil": 0.0013,
-      "Other Renewables": 0.0026,
+      "Other Fossil": 0.0006,
+      "Other Renewables": 0.0024,
       "Solar": 0,
-      "Wind": 0.113
+      "Wind": 0.0837
     }
   },
   "NP": {
@@ -11323,7 +11323,7 @@
       "Bioenergy": 0.004,
       "Coal": 0.1193,
       "Gas": 0.0232,
-      "Hydro": 0.8072,
+      "Hydro": 0.8071,
       "Nuclear": 0.0111,
       "Other Fossil": 0.002,
       "Other Renewables": 0.001,
@@ -11354,25 +11354,25 @@
     },
     "2024": {
       "Bioenergy": 0.0042,
-      "Coal": 0.1139,
-      "Gas": 0.0203,
-      "Hydro": 0.8054,
+      "Coal": 0.1142,
+      "Gas": 0.0204,
+      "Hydro": 0.805,
       "Nuclear": 0.0109,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.0011,
-      "Solar": 0.0266,
-      "Wind": 0.0164
+      "Solar": 0.0264,
+      "Wind": 0.0165
     },
     "2025": {
-      "Bioenergy": 0.0043,
-      "Coal": 0.116,
-      "Gas": 0.0201,
-      "Hydro": 0.8014,
-      "Nuclear": 0.0117,
-      "Other Fossil": 0.0012,
+      "Bioenergy": 0.0047,
+      "Coal": 0.1186,
+      "Gas": 0.0205,
+      "Hydro": 0.799,
+      "Nuclear": 0.0115,
+      "Other Fossil": 0.0013,
       "Other Renewables": 0.0011,
-      "Solar": 0.0265,
-      "Wind": 0.0178
+      "Solar": 0.0251,
+      "Wind": 0.0182
     }
   },
   "NR": {
@@ -12143,26 +12143,26 @@
       "Wind": 0.0338
     },
     "2024": {
-      "Bioenergy": 0.0061,
-      "Coal": 0.1707,
-      "Gas": 0.2743,
-      "Hydro": 0.3201,
-      "Nuclear": 0.1809,
-      "Other Fossil": 0.0116,
+      "Bioenergy": 0.0065,
+      "Coal": 0.1659,
+      "Gas": 0.2822,
+      "Hydro": 0.3127,
+      "Nuclear": 0.1839,
+      "Other Fossil": 0.0111,
       "Other Renewables": 0,
       "Solar": 0.0093,
-      "Wind": 0.0269
+      "Wind": 0.0282
     },
     "2025": {
-      "Bioenergy": 0.0065,
-      "Coal": 0.1945,
-      "Gas": 0.2037,
-      "Hydro": 0.3473,
-      "Nuclear": 0.218,
-      "Other Fossil": 0.0078,
+      "Bioenergy": 0.0129,
+      "Coal": 0.1171,
+      "Gas": 0.3308,
+      "Hydro": 0.2291,
+      "Nuclear": 0.2664,
+      "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0091,
-      "Wind": 0.0131
+      "Solar": 0.0103,
+      "Wind": 0.0335
     }
   },
   "PL": {
@@ -12222,26 +12222,26 @@
       "Wind": 0.1447
     },
     "2024": {
-      "Bioenergy": 0.0154,
-      "Coal": 0.5563,
-      "Gas": 0.1079,
-      "Hydro": 0.0155,
+      "Bioenergy": 0.0152,
+      "Coal": 0.5574,
+      "Gas": 0.1068,
+      "Hydro": 0.0156,
       "Nuclear": 0.0037,
-      "Other Fossil": 0.0412,
+      "Other Fossil": 0.0415,
       "Other Renewables": 0.001,
-      "Solar": 0.1113,
-      "Wind": 0.1477
+      "Solar": 0.1101,
+      "Wind": 0.1488
     },
     "2025": {
-      "Bioenergy": 0.0207,
-      "Coal": 0.584,
-      "Gas": 0.1401,
-      "Hydro": 0.0079,
+      "Bioenergy": 0.0166,
+      "Coal": 0.5696,
+      "Gas": 0.1213,
+      "Hydro": 0.0096,
       "Nuclear": 0,
-      "Other Fossil": 0.0558,
-      "Other Renewables": 0.0014,
-      "Solar": 0.0315,
-      "Wind": 0.1587
+      "Other Fossil": 0.0536,
+      "Other Renewables": 0.0019,
+      "Solar": 0.0275,
+      "Wind": 0.1999
     }
   },
   "PM": {
@@ -12523,41 +12523,41 @@
       "Nuclear": 0.038,
       "Other Fossil": 0.0081,
       "Other Renewables": 0.0013,
-      "Solar": 0.066,
-      "Wind": 0.276
+      "Solar": 0.0659,
+      "Wind": 0.2761
     },
     "2023": {
-      "Bioenergy": 0.0633,
+      "Bioenergy": 0.0634,
       "Coal": 0.0292,
-      "Gas": 0.2461,
-      "Hydro": 0.232,
-      "Nuclear": 0.0419,
+      "Gas": 0.2464,
+      "Hydro": 0.2323,
+      "Nuclear": 0.042,
       "Other Fossil": 0.008,
       "Other Renewables": 0.0014,
-      "Solar": 0.0973,
-      "Wind": 0.2808
+      "Solar": 0.096,
+      "Wind": 0.2812
     },
     "2024": {
-      "Bioenergy": 0.066,
-      "Coal": 0.027,
-      "Gas": 0.1401,
-      "Hydro": 0.2785,
-      "Nuclear": 0.0418,
-      "Other Fossil": 0.009,
-      "Other Renewables": 0.0013,
-      "Solar": 0.1301,
-      "Wind": 0.3062
+      "Bioenergy": 0.0664,
+      "Coal": 0.0288,
+      "Gas": 0.1455,
+      "Hydro": 0.2732,
+      "Nuclear": 0.0444,
+      "Other Fossil": 0.0092,
+      "Other Renewables": 0.0014,
+      "Solar": 0.1288,
+      "Wind": 0.3023
     },
     "2025": {
-      "Bioenergy": 0.0605,
-      "Coal": 0.029,
-      "Gas": 0.19,
-      "Hydro": 0.2172,
-      "Nuclear": 0.0389,
-      "Other Fossil": 0.0088,
-      "Other Renewables": 0.0012,
-      "Solar": 0.0787,
-      "Wind": 0.3755
+      "Bioenergy": 0.0549,
+      "Coal": 0.0163,
+      "Gas": 0.1708,
+      "Hydro": 0.277,
+      "Nuclear": 0.023,
+      "Other Fossil": 0.0065,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0612,
+      "Wind": 0.3897
     }
   },
   "PY": {
@@ -12839,41 +12839,41 @@
       "Nuclear": 0.2011,
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0002,
-      "Solar": 0.0279,
+      "Solar": 0.028,
       "Wind": 0.1244
     },
     "2023": {
       "Bioenergy": 0.0065,
       "Coal": 0.1428,
       "Gas": 0.1684,
-      "Hydro": 0.3179,
-      "Nuclear": 0.1966,
+      "Hydro": 0.318,
+      "Nuclear": 0.1967,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.0378,
+      "Solar": 0.0377,
       "Wind": 0.1299
     },
     "2024": {
-      "Bioenergy": 0.0097,
-      "Coal": 0.1326,
-      "Gas": 0.1947,
-      "Hydro": 0.2622,
-      "Nuclear": 0.2043,
+      "Bioenergy": 0.0096,
+      "Coal": 0.1312,
+      "Gas": 0.1951,
+      "Hydro": 0.2619,
+      "Nuclear": 0.2035,
       "Other Fossil": 0.0014,
       "Other Renewables": 0.0004,
-      "Solar": 0.0794,
-      "Wind": 0.1152
+      "Solar": 0.078,
+      "Wind": 0.1188
     },
     "2025": {
-      "Bioenergy": 0.0097,
-      "Coal": 0.1424,
-      "Gas": 0.2494,
-      "Hydro": 0.1987,
-      "Nuclear": 0.223,
-      "Other Fossil": 0.0026,
-      "Other Renewables": 0.0008,
-      "Solar": 0.0456,
-      "Wind": 0.1278
+      "Bioenergy": 0.0116,
+      "Coal": 0.1435,
+      "Gas": 0.2776,
+      "Hydro": 0.1997,
+      "Nuclear": 0.2221,
+      "Other Fossil": 0.0024,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0222,
+      "Wind": 0.1202
     }
   },
   "RS": {
@@ -12934,25 +12934,25 @@
     },
     "2024": {
       "Bioenergy": 0.0086,
-      "Coal": 0.6058,
+      "Coal": 0.6057,
       "Gas": 0.0332,
-      "Hydro": 0.2897,
-      "Nuclear": 0.0113,
+      "Hydro": 0.2896,
+      "Nuclear": 0.0114,
       "Other Fossil": 0.008,
       "Other Renewables": 0.0004,
-      "Solar": 0.0057,
-      "Wind": 0.0374
+      "Solar": 0.0055,
+      "Wind": 0.0376
     },
     "2025": {
-      "Bioenergy": 0.0082,
-      "Coal": 0.6458,
-      "Gas": 0.054,
-      "Hydro": 0.227,
-      "Nuclear": 0.0166,
-      "Other Fossil": 0.0076,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0029,
-      "Wind": 0.0373
+      "Bioenergy": 0.0063,
+      "Coal": 0.615,
+      "Gas": 0.0772,
+      "Hydro": 0.2561,
+      "Nuclear": 0.0041,
+      "Other Fossil": 0.0062,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0006,
+      "Wind": 0.0346
     }
   },
   "RU": {
@@ -13486,26 +13486,26 @@
       "Wind": 0.2198
     },
     "2024": {
-      "Bioenergy": 0.0374,
+      "Bioenergy": 0.0375,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4046,
-      "Nuclear": 0.3007,
+      "Hydro": 0.4011,
+      "Nuclear": 0.2998,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0111,
-      "Wind": 0.2462
+      "Solar": 0.011,
+      "Wind": 0.2507
     },
     "2025": {
-      "Bioenergy": 0.0351,
+      "Bioenergy": 0.0393,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.3804,
-      "Nuclear": 0.2764,
+      "Hydro": 0.4173,
+      "Nuclear": 0.2609,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0014,
-      "Wind": 0.3068
+      "Solar": 0.0006,
+      "Wind": 0.282
     }
   },
   "SG": {
@@ -13701,47 +13701,47 @@
       "Wind": 0.0044
     },
     "2022": {
-      "Bioenergy": 0.0089,
-      "Coal": 0.2247,
-      "Gas": 0.0587,
-      "Hydro": 0.2392,
-      "Nuclear": 0.4128,
-      "Other Fossil": 0.0111,
+      "Bioenergy": 0.0088,
+      "Coal": 0.2235,
+      "Gas": 0.0584,
+      "Hydro": 0.238,
+      "Nuclear": 0.4107,
+      "Other Fossil": 0.011,
       "Other Renewables": 0.0007,
-      "Solar": 0.0308,
+      "Solar": 0.0358,
       "Wind": 0.0131
     },
     "2023": {
-      "Bioenergy": 0.0052,
-      "Coal": 0.204,
-      "Gas": 0.037,
-      "Hydro": 0.3355,
-      "Nuclear": 0.3702,
-      "Other Fossil": 0.0091,
+      "Bioenergy": 0.0051,
+      "Coal": 0.2013,
+      "Gas": 0.0365,
+      "Hydro": 0.3312,
+      "Nuclear": 0.3655,
+      "Other Fossil": 0.009,
       "Other Renewables": 0.0003,
-      "Solar": 0.0329,
-      "Wind": 0.0057
+      "Solar": 0.0453,
+      "Wind": 0.0056
     },
     "2024": {
-      "Bioenergy": 0.0082,
-      "Coal": 0.212,
-      "Gas": 0.0326,
-      "Hydro": 0.3338,
-      "Nuclear": 0.3533,
-      "Other Fossil": 0.0036,
+      "Bioenergy": 0.0081,
+      "Coal": 0.2056,
+      "Gas": 0.0344,
+      "Hydro": 0.3229,
+      "Nuclear": 0.3497,
+      "Other Fossil": 0.0028,
       "Other Renewables": 0.0001,
-      "Solar": 0.0542,
+      "Solar": 0.0742,
       "Wind": 0.0022
     },
     "2025": {
-      "Bioenergy": 0.0076,
-      "Coal": 0.2977,
-      "Gas": 0.0458,
-      "Hydro": 0.2366,
-      "Nuclear": 0.3817,
-      "Other Fossil": 0.0076,
+      "Bioenergy": 0.0082,
+      "Coal": 0.2213,
+      "Gas": 0.0738,
+      "Hydro": 0.2623,
+      "Nuclear": 0.4262,
+      "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0229,
+      "Solar": 0.0082,
       "Wind": 0
     }
   },
@@ -13802,25 +13802,25 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.0314,
-      "Coal": 0.008,
-      "Gas": 0.0872,
-      "Hydro": 0.1628,
-      "Nuclear": 0.6293,
-      "Other Fossil": 0.0445,
-      "Other Renewables": 0.0165,
-      "Solar": 0.0201,
+      "Bioenergy": 0.0312,
+      "Coal": 0.0079,
+      "Gas": 0.0855,
+      "Hydro": 0.1632,
+      "Nuclear": 0.6309,
+      "Other Fossil": 0.045,
+      "Other Renewables": 0.0164,
+      "Solar": 0.0197,
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.029,
-      "Coal": 0.0041,
-      "Gas": 0.1369,
-      "Hydro": 0.0913,
-      "Nuclear": 0.668,
-      "Other Fossil": 0.0456,
-      "Other Renewables": 0.0166,
-      "Solar": 0.0083,
+      "Bioenergy": 0.0261,
+      "Coal": 0.0037,
+      "Gas": 0.1157,
+      "Hydro": 0.1045,
+      "Nuclear": 0.6828,
+      "Other Fossil": 0.0485,
+      "Other Renewables": 0.0149,
+      "Solar": 0.0037,
       "Wind": 0
     }
   },
@@ -14810,7 +14810,7 @@
       "Bioenergy": 0.068,
       "Coal": 0.253,
       "Gas": 0.5526,
-      "Hydro": 0.0523,
+      "Hydro": 0.0522,
       "Nuclear": 0.0082,
       "Other Fossil": 0.0096,
       "Other Renewables": 0.0008,
@@ -14829,26 +14829,26 @@
       "Wind": 0.0263
     },
     "2024": {
-      "Bioenergy": 0.0605,
-      "Coal": 0.2254,
-      "Gas": 0.5985,
-      "Hydro": 0.0435,
-      "Nuclear": 0.0078,
-      "Other Fossil": 0.0019,
+      "Bioenergy": 0.0597,
+      "Coal": 0.223,
+      "Gas": 0.6012,
+      "Hydro": 0.0441,
+      "Nuclear": 0.0076,
+      "Other Fossil": 0.002,
       "Other Renewables": 0.0008,
-      "Solar": 0.0367,
-      "Wind": 0.0249
+      "Solar": 0.0364,
+      "Wind": 0.0253
     },
     "2025": {
-      "Bioenergy": 0.059,
-      "Coal": 0.2631,
-      "Gas": 0.5677,
-      "Hydro": 0.0339,
-      "Nuclear": 0.0098,
-      "Other Fossil": 0.001,
-      "Other Renewables": 0.0009,
-      "Solar": 0.0379,
-      "Wind": 0.0266
+      "Bioenergy": 0.0558,
+      "Coal": 0.2436,
+      "Gas": 0.5902,
+      "Hydro": 0.036,
+      "Nuclear": 0.0077,
+      "Other Fossil": 0.0014,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0349,
+      "Wind": 0.0296
     }
   },
   "TJ": {
@@ -14865,9 +14865,9 @@
     },
     "2020": {
       "Bioenergy": 0,
-      "Coal": 0.0706,
+      "Coal": 0.0702,
       "Gas": 0.0143,
-      "Hydro": 0.9151,
+      "Hydro": 0.9155,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -14876,9 +14876,9 @@
     },
     "2021": {
       "Bioenergy": 0,
-      "Coal": 0.0644,
-      "Gas": 0.0112,
-      "Hydro": 0.9244,
+      "Coal": 0.0695,
+      "Gas": 0.0121,
+      "Hydro": 0.9184,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -14887,9 +14887,9 @@
     },
     "2022": {
       "Bioenergy": 0,
-      "Coal": 0.0586,
-      "Gas": 0.0099,
-      "Hydro": 0.9315,
+      "Coal": 0.0631,
+      "Gas": 0.0142,
+      "Hydro": 0.9227,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -14898,9 +14898,9 @@
     },
     "2023": {
       "Bioenergy": 0,
-      "Coal": 0.0485,
-      "Gas": 0.0083,
-      "Hydro": 0.9432,
+      "Coal": 0.0509,
+      "Gas": 0.0123,
+      "Hydro": 0.9367,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -14909,9 +14909,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.0438,
-      "Gas": 0.0079,
-      "Hydro": 0.9483,
+      "Coal": 0.0414,
+      "Gas": 0.0087,
+      "Hydro": 0.9499,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -15304,25 +15304,25 @@
     },
     "2024": {
       "Bioenergy": 0.0254,
-      "Coal": 0.3549,
-      "Gas": 0.1853,
-      "Hydro": 0.2184,
+      "Coal": 0.3551,
+      "Gas": 0.1855,
+      "Hydro": 0.2185,
       "Nuclear": 0.0004,
       "Other Fossil": 0.0029,
       "Other Renewables": 0.0299,
-      "Solar": 0.0758,
-      "Wind": 0.1069
+      "Solar": 0.0753,
+      "Wind": 0.107
     },
     "2025": {
-      "Bioenergy": 0.0243,
-      "Coal": 0.3709,
-      "Gas": 0.2652,
-      "Hydro": 0.1449,
-      "Nuclear": 0.0004,
-      "Other Fossil": 0.003,
-      "Other Renewables": 0.0321,
-      "Solar": 0.0414,
-      "Wind": 0.1176
+      "Bioenergy": 0.0248,
+      "Coal": 0.3688,
+      "Gas": 0.2707,
+      "Hydro": 0.1614,
+      "Nuclear": 0.0002,
+      "Other Fossil": 0.0037,
+      "Other Renewables": 0.0335,
+      "Solar": 0.0419,
+      "Wind": 0.095
     }
   },
   "TT": {
@@ -15778,25 +15778,25 @@
     },
     "2024": {
       "Bioenergy": 0.0106,
-      "Coal": 0.1489,
-      "Gas": 0.4265,
-      "Hydro": 0.0532,
-      "Nuclear": 0.1787,
-      "Other Fossil": 0.0059,
+      "Coal": 0.149,
+      "Gas": 0.4256,
+      "Hydro": 0.0537,
+      "Nuclear": 0.1782,
+      "Other Fossil": 0.0067,
       "Other Renewables": 0.004,
-      "Solar": 0.0684,
-      "Wind": 0.1038
+      "Solar": 0.0687,
+      "Wind": 0.1036
     },
     "2025": {
-      "Bioenergy": 0.011,
-      "Coal": 0.1724,
-      "Gas": 0.4022,
-      "Hydro": 0.0525,
-      "Nuclear": 0.1977,
-      "Other Fossil": 0.0011,
-      "Other Renewables": 0.0041,
-      "Solar": 0.0461,
-      "Wind": 0.1128
+      "Bioenergy": 0.0099,
+      "Coal": 0.2049,
+      "Gas": 0.3865,
+      "Hydro": 0.0536,
+      "Nuclear": 0.1777,
+      "Other Fossil": 0.0082,
+      "Other Renewables": 0.0035,
+      "Solar": 0.0503,
+      "Wind": 0.1054
     }
   },
   "UY": {
@@ -15867,15 +15867,15 @@
       "Wind": 0.3322
     },
     "2025": {
-      "Bioenergy": 0.1078,
-      "Coal": 0,
-      "Gas": 0,
-      "Hydro": 0.4608,
-      "Nuclear": 0,
-      "Other Fossil": 0,
-      "Other Renewables": 0,
-      "Solar": 0.049,
-      "Wind": 0.3824
+      "Bioenergy": 0.1551,
+      "Coal": 0.0024,
+      "Gas": 0.0434,
+      "Hydro": 0.3973,
+      "Nuclear": 0.0013,
+      "Other Fossil": 0.0131,
+      "Other Renewables": 0.0004,
+      "Solar": 0.0519,
+      "Wind": 0.335
     }
   },
   "UZ": {
@@ -15946,14 +15946,14 @@
       "Wind": 0.0015
     },
     "2025": {
-      "Bioenergy": 0.0004,
-      "Coal": 0.0701,
+      "Bioenergy": 0.0005,
+      "Coal": 0.0704,
       "Gas": 0.8122,
-      "Hydro": 0.1016,
+      "Hydro": 0.1014,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
-      "Solar": 0.0018,
+      "Solar": 0.0016,
       "Wind": 0.0016
     }
   },
@@ -16561,32 +16561,32 @@
       "Gas": 0.0326,
       "Hydro": 0.0751,
       "Nuclear": 0.0264,
-      "Other Fossil": 0.0028,
+      "Other Fossil": 0.0027,
       "Other Renewables": 0.0008,
-      "Solar": 0.0065,
+      "Solar": 0.0064,
       "Wind": 0.0739
     },
     "2024": {
-      "Bioenergy": 0.0025,
-      "Coal": 0.8382,
-      "Gas": 0.0214,
-      "Hydro": 0.0463,
-      "Nuclear": 0.018,
-      "Other Fossil": 0.0018,
+      "Bioenergy": 0.0028,
+      "Coal": 0.8393,
+      "Gas": 0.0253,
+      "Hydro": 0.045,
+      "Nuclear": 0.0206,
+      "Other Fossil": 0.0021,
       "Other Renewables": 0.0006,
-      "Solar": 0.0047,
-      "Wind": 0.0666
+      "Solar": 0.0046,
+      "Wind": 0.0598
     },
     "2025": {
-      "Bioenergy": 0.0037,
-      "Coal": 0.8023,
-      "Gas": 0.0346,
-      "Hydro": 0.0422,
-      "Nuclear": 0.0264,
-      "Other Fossil": 0.0027,
-      "Other Renewables": 0.0008,
-      "Solar": 0.0046,
-      "Wind": 0.0825
+      "Bioenergy": 0.0059,
+      "Coal": 0.7747,
+      "Gas": 0.0573,
+      "Hydro": 0.0474,
+      "Nuclear": 0.0443,
+      "Other Fossil": 0.0046,
+      "Other Renewables": 0.0013,
+      "Solar": 0.006,
+      "Wind": 0.0584
     }
   },
   "YE": {