diff --git a/Makefile b/Makefile
index 99b83ff..b19222b 100644
--- a/Makefile
+++ b/Makefile
@@ -47,24 +47,21 @@ MACOS_APPLE_SILICON_RELEASE := $(TARGET_FILE)-$(VERSION)-macos-apple-silicon.dmg
 LINUX_RELEASE               := $(TARGET_FILE)-$(VERSION)-linux.tar.gz
 RASPI_RELEASE               := $(TARGET_FILE)-$(VERSION)-raspberry.tar.gz
 
-# Lista completa de archivos fuente (basada en estructura de ViBe3)
-APP_SOURCES := \
-    source/ball.cpp \
-    source/engine.cpp \
-    source/main.cpp \
-    source/resource_pack.cpp \
-    source/external/mouse.cpp \
-    source/external/sprite.cpp \
-    source/external/texture.cpp \
-    source/shapes/atom_shape.cpp \
-    source/shapes/cube_shape.cpp \
-    source/shapes/cylinder_shape.cpp \
-    source/shapes/helix_shape.cpp \
-    source/shapes/icosahedron_shape.cpp \
-    source/shapes/png_shape.cpp \
-    source/shapes/sphere_shape.cpp \
-    source/shapes/torus_shape.cpp \
-    source/shapes/wave_grid_shape.cpp
+# Lista completa de archivos fuente (detección automática con wildcards, como CMakeLists.txt)
+APP_SOURCES := $(wildcard source/*.cpp) \
+               $(wildcard source/external/*.cpp) \
+               $(wildcard source/shapes/*.cpp) \
+               $(wildcard source/themes/*.cpp) \
+               $(wildcard source/state/*.cpp) \
+               $(wildcard source/input/*.cpp) \
+               $(wildcard source/scene/*.cpp) \
+               $(wildcard source/shapes_mgr/*.cpp) \
+               $(wildcard source/boids_mgr/*.cpp) \
+               $(wildcard source/text/*.cpp) \
+               $(wildcard source/ui/*.cpp)
+
+# Excluir archivos antiguos si existen
+APP_SOURCES := $(filter-out source/main_old.cpp, $(APP_SOURCES))
 
 # Includes
 INCLUDES := -Isource -Isource/external
@@ -185,7 +182,9 @@ macos_release: resources.pack
 # Copia carpetas y ficheros
 	cp resources.pack "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Resources"
 	cp -R release/frameworks/SDL3.xcframework "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Frameworks"
+	cp -R release/frameworks/SDL3_ttf.xcframework "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Frameworks"
 	cp -R release/frameworks/SDL3.xcframework Frameworks
+	cp -R release/frameworks/SDL3_ttf.xcframework Frameworks
 	cp release/*.icns "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Resources"
 	cp release/Info.plist "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents"
 	cp LICENSE "$(RELEASE_FOLDER)"