diff --git a/streams/de_rakuten.m3u b/streams/de_rakuten.m3u
new file mode 100644
index 0000000000..7719030ad7
--- /dev/null
+++ b/streams/de_rakuten.m3u
@@ -0,0 +1,19 @@
+#EXTM3U
+#EXTINF:-1 tvg-id="Revry.us" status="online",Revry (720p)
+https://revry-revry-3-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Top Free Germany (720p)
+https://rakuten-topfree-3-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Action Movies Germany (720p)
+https://rakuten-actionmovies-3-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Comedy Movies Germany (720p)
+https://rakuten-comedymovies-3-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Spotlight Germany (720p)
+https://rakuten-spotlight-3-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten TV Shows Germany (720p)
+https://rakuten-tvshows-3-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Comedy Movies Germany 2 (720p)
+https://rakuten-comedymovies-5-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Spotlight Germany 2 (720p)
+https://rakuten-spotlight-5-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten TV Shows Germany 2 (720p)
+https://rakuten-tvshows-5-eu.rakuten.wurl.tv/playlist.m3u8
diff --git a/streams/es_rakuten.m3u b/streams/es_rakuten.m3u
index bb6ae381e4..5bb32a5ecd 100644
--- a/streams/es_rakuten.m3u
+++ b/streams/es_rakuten.m3u
@@ -1,30 +1,18 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="BloombergQuicktake.us" status="error",Bloomberg Quicktake (1080p)
-https://bloomberg-quicktake-2-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="BloombergTV.us" status="error",Bloomberg TV US (1080p)
-https://bloomberg-bloomberg-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="BloombergQuicktake.us" status="online",Bloomberg Quicktake (1080p)
+https://bloomberg-quicktake-2-eu.rakuten.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="BratTV.us" status="online",Brat TV (1080p)
 https://brat-rakuten.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="ClubbingTV.fr" status="online",Clubbing TV (720p)
 https://clubbingtv-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="CNNInternationalEurope.us" status="error",CNN International Europe (720p)
-https://cnn-cnninternational-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="ComedyDynamics.us" status="online",Comedy Dynamics (1080p)
 https://comedydynamics-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="DestinationTV.us" status="error",Destination TV (720p)
-https://makingitmedia-destinationtv-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="DuckTV.sk" status="error",Duck TV (720p)
-https://mmm-ducktv-4-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="FailArmy.us" status="error",FailArmy International (720p)
-https://failarmy-international-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="FilmStreams.us" status="error",FilmStreams (720p)
-https://spi-filmstream-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="FrootTV.us" status="error",Froot TV (720p)
-https://outtv-froottv-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="DuckTV.sk" status="online",Duck TV (720p)
+https://mmm-ducktv-4-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="FailArmy.us" status="online",FailArmy International (720p)
+https://failarmy-international-eu.rakuten.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="FuelTV.us" status="online",Fuel TV (1080p)
-https://fueltv-fueltv-10-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="HappyKids.us" status="error",HappyKids (1080p)
-https://futuretoday-happykids-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
+https://fueltv-fueltv-10-eu.rakuten.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="InsightTV.nl" status="online",Insight TV (720p)
 https://insighttv-eng-rakuten.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="InsightTV.nl" status="online",Insight TV (720p)
@@ -39,97 +27,33 @@ https://inwonder-eng-rakuten.amagi.tv/playlist.m3u8
 https://inwonder-ger-rakuten.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="LoneStar.us" status="online",Lone Star (1080p)
 https://lonestar-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="LSN.us" status="error",LSN (720p)
-https://asermedia-lacrossesportsnetwork-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="MavTVSelect.us" status="online",MavTV Select (720p)
-https://mavtv-mavtvglobal-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="MovieSphere.us" status="online",MovieSphere (1080p)
 https://moviesphereuk-rakuten.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="MyTimemovienetworkSpain.us" status="online",MyTime movie network Spain (1080p)
 https://appletree-mytimespain-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="PeopleareAwesomeUS.us" status="error",People are Awesome (720p)
-https://jukin-peopleareawesome-2-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="QwestTVClassical.fr" status="error",Qwest TV Classical (720p)
-https://qwestclassic-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="QwestTVJazzBeyond.fr" status="error",Qwest TV Jazz & Beyond (720p)
-https://qwestjazz-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="QwestTVMix.fr" status="error",Qwest TV Mix (720p)
-https://qwestmix-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="ReutersTV.uk" status="timeout",Reuters TV (720p)
-https://reuters-reuters-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="Revry.us" status="error",Revry (720p)
-https://revry-revry-3-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="RevryNews.us" status="error",Revry News (720p)
-https://revry-revrynews-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="RuntimeSpain.us" status="error",Runtime (Spain) (720p)
+#EXTINF:-1 tvg-id="PeopleareAwesomeUS.us" status="online",People are Awesome (720p)
+https://jukin-peopleareawesome-2-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="RuntimeSpain.us" status="online",Runtime (Spain) (720p)
 https://runtime-espana-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="RushStreet.us" status="error",Rush Street (720p)
-https://rushstreet-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="SofyTV.ch" status="error",Sofy TV (1080p)
-https://sofytv-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="TheDesignNetwork.us" status="error",The Design Network (720p)
-https://thedesignnetwork-tdn-6-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="ThePetCollectiveSpain.us" status="error",The Pet Collective Europe (720p)
-https://the-pet-collective-international-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="WeatherSpyEurope.us" status="error",WeatherSpy Europe (720p)
-https://jukin-weatherspy-2-eu.rakuten.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="ThePetCollectiveSpain.us" status="online",The Pet Collective Europe (720p)
+https://the-pet-collective-international-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="WeatherSpyEurope.us" status="online",WeatherSpy Europe (720p)
+https://jukin-weatherspy-2-eu.rakuten.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Wonder.uk" status="online",Wonder (1080p)
 https://lds-wonder-rakuten.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="YoungHollywood.us" status="online",Young Hollywood (720p)
 https://younghollywood-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="ZooMoo.nz" status="error",Zoo Moo (720p)
-https://rockentertainment-zoomoo-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",EDGEsport (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="EDGEsport.us" status="online",EDGEsport (1080p) [Not 24/7]
 https://edgesports-row-rakuten.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",ESTV (1080p)
 https://estv-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fashion TV (1080p)
-https://fashiontv-fashiontv-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Rakuten Top Free 1 (720p)
-https://rakuten-topfree-1-eu.rakuten.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Rakuten Top Free 2 (720p)
+#EXTINF:-1 tvg-id="" status="online",Rakuten Top Free Spain (720p)
 https://rakuten-topfree-2-eu.rakuten.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Rakuten Top Free 3 (720p)
-https://rakuten-topfree-3-eu.rakuten.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Rakuten Top Free 6 (720p)
-https://rakuten-topfree-6-eu.rakuten.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Rakuten Top Free 7 (720p)
-https://rakuten-topfree-7-eu.rakuten.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten Action Movies 1 (720p)
-https://rakuten-actionmovies-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten Action Movies 2 (720p)
-https://rakuten-actionmovies-2-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten Action Movies 3 (720p)
-https://rakuten-actionmovies-3-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten Comedy Movies 1 (720p)
-https://rakuten-comedymovies-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten Comedy Movies 2 (720p)
-https://rakuten-comedymovies-2-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten Comedy Movies 3 (720p)
-https://rakuten-comedymovies-3-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten Comedy Movies 6 (720p)
-https://rakuten-comedymovies-6-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten Comedy Movies 7 (720p)
-https://rakuten-comedymovies-7-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten Spotlight 1 (720p)
-https://rakuten-spotlight-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten Spotlight 2 (720p)
-https://rakuten-spotlight-2-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten Spotlight 3 (720p)
-https://rakuten-spotlight-3-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten Spotlight 6 (720p)
-https://rakuten-spotlight-6-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten Spotlight 7 (720p)
-https://rakuten-spotlight-7-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten TV Shows 1 (720p)
-https://rakuten-tvshows-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten TV Shows 2 (720p)
-https://rakuten-tvshows-2-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten TV Shows 3 (720p)
-https://rakuten-tvshows-3-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten TV Shows 6 (720p)
-https://rakuten-tvshows-6-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Rakuten TV Shows 7 (720p)
-https://rakuten-tvshows-7-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Travel XP (720p)
-https://travelxp-travelxp-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Action Movies Spain (720p)
+https://rakuten-actionmovies-2-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Comedy Movies Spain (720p)
+https://rakuten-comedymovies-2-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Spotlight Spain (720p)
+https://rakuten-spotlight-2-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten TV Shows Spain (720p)
+https://rakuten-tvshows-2-eu.rakuten.wurl.tv/playlist.m3u8
diff --git a/streams/fr_rakuten.m3u b/streams/fr_rakuten.m3u
new file mode 100644
index 0000000000..5473ae062f
--- /dev/null
+++ b/streams/fr_rakuten.m3u
@@ -0,0 +1,21 @@
+#EXTM3U
+#EXTINF:-1 tvg-id="" status="online",Rakuten Top Free France (720p)
+https://rakuten-topfree-7-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Comedy Movies France (720p)
+https://rakuten-comedymovies-7-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Spotlight France (720p)
+https://rakuten-spotlight-7-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten TV Shows France (720p)
+https://rakuten-tvshows-7-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="",Rakuten TV Top Films
+https://rakuten-topfree-7-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="",Rakuten TV Films Action
+https://rakuten-actionmovies-7-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="",Rakuten TV Films Drames
+https://rakuten-tvshows-7-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="",Rakuten TV Films Rakuten Stories
+https://rakuten-spotlight-7-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="",Rakuten TV Films Français
+https://rakuten-films-francais-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="",Rakuten TV Films Thriller
+https://rakuten-thriller-7-eu.rakuten.wurl.tv/playlist.m3u8
diff --git a/streams/it_rakuten.m3u b/streams/it_rakuten.m3u
new file mode 100644
index 0000000000..ec1e58ee99
--- /dev/null
+++ b/streams/it_rakuten.m3u
@@ -0,0 +1,11 @@
+#EXTM3U
+#EXTINF:-1 tvg-id="TheDesignNetwork.us" status="online",The Design Network (720p)
+https://thedesignnetwork-tdn-6-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Top Free Italy (720p)
+https://rakuten-topfree-6-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Comedy Movies Italy (720p)
+https://rakuten-comedymovies-6-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Spotlight Italy (720p)
+https://rakuten-spotlight-6-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten TV Shows Italy (720p)
+https://rakuten-tvshows-6-eu.rakuten.wurl.tv/playlist.m3u8
diff --git a/streams/uk_rakuten.m3u b/streams/uk_rakuten.m3u
new file mode 100644
index 0000000000..398ff17ce7
--- /dev/null
+++ b/streams/uk_rakuten.m3u
@@ -0,0 +1,35 @@
+#EXTM3U
+#EXTINF:-1 tvg-id="BloombergTV.us" status="online",Bloomberg TV (1080p)
+https://bloomberg-bloomberg-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="CNNInternationalEurope.us" status="online",CNN International Europe (720p)
+https://cnn-cnninternational-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="DestinationTV.us" status="online",Destination TV (720p)
+https://makingitmedia-destinationtv-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="FilmStreams.us" status="online",FilmStreams (720p)
+https://spi-filmstream-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="FrootTV.us" status="online",Froot TV (720p)
+https://outtv-froottv-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="HappyKids.us" status="online",HappyKids (1080p)
+https://futuretoday-happykids-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="LSN.us" status="online",LSN (720p)
+https://asermedia-lacrossesportsnetwork-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="MavTVSelect.us" status="online",MavTV Select (720p)
+https://mavtv-mavtvglobal-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="RevryNews.us" status="online",Revry News (720p)
+https://revry-revrynews-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="ZooMoo.nz" status="online",Zoo Moo (720p)
+https://rockentertainment-zoomoo-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="FashionTVEurope.fr" status="online",Fashion TV (1080p)
+https://fashiontv-fashiontv-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Top Free UK (720p)
+https://rakuten-topfree-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Action Movies UK (720p)
+https://rakuten-actionmovies-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Comedy Movies UK (720p)
+https://rakuten-comedymovies-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten Spotlight UK (720p)
+https://rakuten-spotlight-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="" status="online",Rakuten TV Shows UK (720p)
+https://rakuten-tvshows-1-eu.rakuten.wurl.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="TravelxpEurope.in" status="online",Travel XP (720p)
+https://travelxp-travelxp-1-eu.rakuten.wurl.tv/playlist.m3u8