diff --git a/src/services/__pycache__/Radio_Player.cpython-312.pyc b/src/services/__pycache__/Radio_Player.cpython-312.pyc
new file mode 100644
index 0000000..42f58a0
Binary files /dev/null and b/src/services/__pycache__/Radio_Player.cpython-312.pyc differ
diff --git a/src/services/__pycache__/scrapper.cpython-312.pyc b/src/services/__pycache__/scrapper.cpython-312.pyc
index 38c4ff1..eae5671 100644
Binary files a/src/services/__pycache__/scrapper.cpython-312.pyc and b/src/services/__pycache__/scrapper.cpython-312.pyc differ
diff --git a/src/services/__pycache__/threads_manager.cpython-312.pyc b/src/services/__pycache__/threads_manager.cpython-312.pyc
index c7e6f2f..16b6699 100644
Binary files a/src/services/__pycache__/threads_manager.cpython-312.pyc and b/src/services/__pycache__/threads_manager.cpython-312.pyc differ
diff --git a/src/services/scrapper.py b/src/services/scrapper.py
index 22a1486..4dfa30b 100644
--- a/src/services/scrapper.py
+++ b/src/services/scrapper.py
@@ -4,6 +4,7 @@ from bs4 import BeautifulSoup
 from urllib.parse import urljoin
 import mysql.connector
 from queue import Queue
+from services.threaden_task import ThreadenTask
 
 #http://books.toscrape.com/ test scrap web
 
@@ -11,7 +12,7 @@ class Scrapper:
     def __init__(self, ui_instance):
         self.ui_instance = ui_instance
         self.visited_links = set()
-        self.running=False
+        self.running = False
         self.lock = threading.Lock()
         self.link_queue = Queue()
 
@@ -31,6 +32,10 @@ class Scrapper:
         except Exception as e:
             print(f"Error al conectar a la base de datos: {e}")
 
+        #Tareas para el scrapping y la base de datos
+        self.scraping_task = ThreadenTask()
+        self.db_task = ThreadenTask()
+
     def start_scraping(self):
         """Inicia el proceso de scraping"""
         if self.running:
@@ -38,20 +43,24 @@ class Scrapper:
             return
 
         self.running = True
+        self.visited_links.clear()
+        self.link_queue.queue.clear()
+
         url = self.get_url_from_ui()
         if url:  
             print(f"Iniciando scraping en: {url}")
-            threading.Thread(target=self.scrape_page, args=(url,), daemon=True).start()
-            threading.Thread(target=self.insert_links_to_db, daemon=True).start()
+            self.scraping_task.start(self.scrape_page, url)
+            self.db_task.start(self.insert_links_to_db)
         else:  
             print("No se proporcionó una URL válida.")  
             
     def stop_scraping(self):  
         """Detiene el proceso de scraping"""  
-        print("Deteniendo el proceso de scraping...")  
+        print("Deteniendo el proceso de scraping...") 
+        self.running = False 
         # Detener las tareas  
-        self.scraping_task.stop_thread()  
-        self.db_task.stop()  
+        self.scraping_task.stop()
+        self.db_task.stop()
 
         # Inserta un sentinel (None) en la cola para detener el hilo de inserción  
         self.link_queue.put(None)  
@@ -79,7 +88,8 @@ class Scrapper:
             if response.status_code == 200:  
                 soup = BeautifulSoup(response.text, "html.parser")  
                 links = [urljoin(url, a.get("href")) for a in soup.find_all("a", href=True)]  
-                self.update_ui(url, links)  
+                if self.running:
+                    self.update_ui(url, links)  
 
                 for link in links:  
                     if not self.running:  
@@ -112,7 +122,7 @@ class Scrapper:
 
     def insert_links_to_db(self):  
         """Inserta los enlaces en la base de datos desde la cola"""  
-        while True:  
+        while self.db_task.running:  
             try:  
                 # Obtener un enlace de la cola  
                 item = self.link_queue.get(timeout=1)  
diff --git a/src/ui/__pycache__/centered_window.cpython-312.pyc b/src/ui/__pycache__/centered_window.cpython-312.pyc
index 6918e9d..1081e5a 100644
Binary files a/src/ui/__pycache__/centered_window.cpython-312.pyc and b/src/ui/__pycache__/centered_window.cpython-312.pyc differ
diff --git a/src/ui/centered_window.py b/src/ui/centered_window.py
index d24d90d..bea818b 100644
--- a/src/ui/centered_window.py
+++ b/src/ui/centered_window.py
@@ -64,6 +64,9 @@ class CenteredWindow(ctk.CTk):
         if "tetris_game" in self.thread_manager.tasks:  
             self.thread_manager.tasks["tetris_game"].stop()
 
+        if hasattr(self.thread_manager, "scrapper"):
+            self.thread_manager.scrapper.stop_scraping()
+
         self.destroy()
 
 
@@ -112,11 +115,10 @@ class CenteredWindow(ctk.CTk):
         self.left_panel = left_panel
         self.left_panel.url_entry = url_entry
         self.left_panel.url_entry_chrome = url_entry_chrome
-        start_button = ctk.CTkButton(left_panel, text="Iniciar Scrapping", command=lambda:
-                                     self.thread_manager.tasks["scrapper"].start(self.thread_manager.scrapper.start_scraping))
+        start_button = ctk.CTkButton(left_panel, text="Iniciar Scrapping", command=self.thread_manager.scrapper.start_scraping)
         start_button.pack(pady=5, padx=10)
 
-        stop_button = ctk.CTkButton(left_panel, text="Detener Scrapping", command=self.thread_manager.tasks["scrapper"].stop)
+        stop_button = ctk.CTkButton(left_panel, text="Detener Scrapping", command=self.thread_manager.scrapper.stop_scraping)
         stop_button.pack(pady=5, padx=10)
 
 
@@ -177,10 +179,10 @@ class CenteredWindow(ctk.CTk):
                 self.tetris_game = TetrisGame(game_frame)
                 self.tetris_game.pack()
 
-            else:
+           # else:
                 # Agregar contenido genérico a otras pestañas
-                label = ctk.CTkLabel(tab, text=f"Contenido de {tab_name}", font=("Arial", 12))
-                label.pack(pady=10)
+                #label = ctk.CTkLabel(tab, text=f"Contenido de {tab_name}", font=("Arial", 12))
+                #label.pack(pady=10)