diff --git a/data/gfx/controllers/controllers.png b/data/gfx/controllers/controllers.png
deleted file mode 100644
index e8775b5..0000000
Binary files a/data/gfx/controllers/controllers.png and /dev/null differ
diff --git a/source/director.cpp b/source/director.cpp
index ee779b2..da93e7b 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -307,6 +307,7 @@ void Director::setFileList()
 	Asset::get()->add(prefix + "/data/sound/stage_change.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/tabe.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/title.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/voice_byebye.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/voice_coffee.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/voice_get_ready.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/voice_no.wav", AssetType::SOUND);
@@ -320,121 +321,102 @@ void Director::setFileList()
 	Asset::get()->add(prefix + "/data/shaders/crtpi_256.glsl", AssetType::DATA);
 	Asset::get()->add(prefix + "/data/shaders/crtpi_240.glsl", AssetType::DATA);
 
-	// Texturas
+	// Texturas - Balloons
+	Asset::get()->add(prefix + "/data/gfx/balloon/balloon1.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/balloon/balloon1.ani", AssetType::ANIMATION);
+	Asset::get()->add(prefix + "/data/gfx/balloon/balloon2.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/balloon/balloon2.ani", AssetType::ANIMATION);
+	Asset::get()->add(prefix + "/data/gfx/balloon/balloon3.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/balloon/balloon3.ani", AssetType::ANIMATION);
+	Asset::get()->add(prefix + "/data/gfx/balloon/balloon4.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/balloon/balloon4.ani", AssetType::ANIMATION);
 
-	{ // Controllers
-		Asset::get()->add(prefix + "/data/gfx/controllers/controllers.png", AssetType::BITMAP);
-	}
+	//  Texturas - Explosiones
+	Asset::get()->add(prefix + "/data/gfx/balloon/explosion1.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/balloon/explosion1.ani", AssetType::ANIMATION);
+	Asset::get()->add(prefix + "/data/gfx/balloon/explosion2.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/balloon/explosion2.ani", AssetType::ANIMATION);
+	Asset::get()->add(prefix + "/data/gfx/balloon/explosion3.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/balloon/explosion3.ani", AssetType::ANIMATION);
+	Asset::get()->add(prefix + "/data/gfx/balloon/explosion4.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/balloon/explosion4.ani", AssetType::ANIMATION);
 
-	{ // Balloons
-		Asset::get()->add(prefix + "/data/gfx/balloon/balloon1.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/balloon/balloon1.ani", AssetType::ANIMATION);
-		Asset::get()->add(prefix + "/data/gfx/balloon/balloon2.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/balloon/balloon2.ani", AssetType::ANIMATION);
-		Asset::get()->add(prefix + "/data/gfx/balloon/balloon3.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/balloon/balloon3.ani", AssetType::ANIMATION);
-		Asset::get()->add(prefix + "/data/gfx/balloon/balloon4.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/balloon/balloon4.ani", AssetType::ANIMATION);
-	}
+	//  Texturas - Power Ball
+	Asset::get()->add(prefix + "/data/gfx/balloon/powerball.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/balloon/powerball.ani", AssetType::ANIMATION);
 
-	{ // Explosions
-		Asset::get()->add(prefix + "/data/gfx/balloon/explosion1.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/balloon/explosion1.ani", AssetType::ANIMATION);
-		Asset::get()->add(prefix + "/data/gfx/balloon/explosion2.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/balloon/explosion2.ani", AssetType::ANIMATION);
-		Asset::get()->add(prefix + "/data/gfx/balloon/explosion3.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/balloon/explosion3.ani", AssetType::ANIMATION);
-		Asset::get()->add(prefix + "/data/gfx/balloon/explosion4.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/balloon/explosion4.ani", AssetType::ANIMATION);
-	}
+	//  Texturas - Bala
+	Asset::get()->add(prefix + "/data/gfx/bullet/bullet.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/bullet/bullet.ani", AssetType::ANIMATION);
 
-	{ // Power Ball
-		Asset::get()->add(prefix + "/data/gfx/balloon/powerball.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/balloon/powerball.ani", AssetType::ANIMATION);
-	}
+	//  Texturas - Tabe
+	Asset::get()->add(prefix + "/data/gfx/tabe/tabe.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/tabe/tabe.ani", AssetType::ANIMATION);
 
-	{ // Bala
-		Asset::get()->add(prefix + "/data/gfx/bullet/bullet.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/bullet/bullet.ani", AssetType::ANIMATION);
-	}
+	//  Texturas - Juego
+	Asset::get()->add(prefix + "/data/gfx/game/game_buildings.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/game/game_clouds1.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/game/game_clouds2.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/game/game_grass.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/game/game_power_meter.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/game/game_sky_colors.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/game/game_sun.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/game/game_moon.png", AssetType::BITMAP);
 
-	{ // Tabe
-		Asset::get()->add(prefix + "/data/gfx/tabe/tabe.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/tabe/tabe.ani", AssetType::ANIMATION);
-	}
+	//  Texturas - Intro
+	Asset::get()->add(prefix + "/data/gfx/intro/intro1.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/intro/intro2.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/intro/intro3.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/intro/intro4.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/intro/intro5.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/intro/intro6.png", AssetType::BITMAP);
 
-	{ // Juego
-		Asset::get()->add(prefix + "/data/gfx/game/game_buildings.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/game/game_clouds1.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/game/game_clouds2.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/game/game_grass.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/game/game_power_meter.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/game/game_sky_colors.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/game/game_sun.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/game/game_moon.png", AssetType::BITMAP);
-	}
+	//  Texturas - Logo
+	Asset::get()->add(prefix + "/data/gfx/logo/logo_jailgames.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/logo/logo_jailgames_mini.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/logo/logo_since_1998.png", AssetType::BITMAP);
 
-	{ // Intro
-		Asset::get()->add(prefix + "/data/gfx/intro/intro1.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/intro/intro2.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/intro/intro3.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/intro/intro4.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/intro/intro5.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/intro/intro6.png", AssetType::BITMAP);
-	}
+	//  Texturas - Items
+	Asset::get()->add(prefix + "/data/gfx/item/item_points1_disk.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/item/item_points1_disk.ani", AssetType::ANIMATION);
+	Asset::get()->add(prefix + "/data/gfx/item/item_points2_gavina.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/item/item_points2_gavina.ani", AssetType::ANIMATION);
+	Asset::get()->add(prefix + "/data/gfx/item/item_points3_pacmar.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/item/item_points3_pacmar.ani", AssetType::ANIMATION);
+	Asset::get()->add(prefix + "/data/gfx/item/item_clock.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/item/item_clock.ani", AssetType::ANIMATION);
+	Asset::get()->add(prefix + "/data/gfx/item/item_coffee.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/item/item_coffee.ani", AssetType::ANIMATION);
+	Asset::get()->add(prefix + "/data/gfx/item/item_debian.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/item/item_debian.ani", AssetType::ANIMATION);
+	Asset::get()->add(prefix + "/data/gfx/item/item_coffee_machine.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/item/item_coffee_machine.ani", AssetType::ANIMATION);
 
-	{ // Logo
-		Asset::get()->add(prefix + "/data/gfx/logo/logo_jailgames.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/logo/logo_jailgames_mini.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/logo/logo_since_1998.png", AssetType::BITMAP);
-	}
+	//  Texturas - Titulo
+	Asset::get()->add(prefix + "/data/gfx/title/title_bg_tile.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/title/title_coffee.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/title/title_crisis.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/title/title_arcade_edition.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/title/title_dust.png", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/title/title_dust.ani", AssetType::ANIMATION);
 
-	{ // Items
-		Asset::get()->add(prefix + "/data/gfx/item/item_points1_disk.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/item/item_points1_disk.ani", AssetType::ANIMATION);
-		Asset::get()->add(prefix + "/data/gfx/item/item_points2_gavina.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/item/item_points2_gavina.ani", AssetType::ANIMATION);
-		Asset::get()->add(prefix + "/data/gfx/item/item_points3_pacmar.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/item/item_points3_pacmar.ani", AssetType::ANIMATION);
-		Asset::get()->add(prefix + "/data/gfx/item/item_clock.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/item/item_clock.ani", AssetType::ANIMATION);
-		Asset::get()->add(prefix + "/data/gfx/item/item_coffee.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/item/item_coffee.ani", AssetType::ANIMATION);
-		Asset::get()->add(prefix + "/data/gfx/item/item_debian.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/item/item_debian.ani", AssetType::ANIMATION);
-		Asset::get()->add(prefix + "/data/gfx/item/item_coffee_machine.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/item/item_coffee_machine.ani", AssetType::ANIMATION);
-	}
+	//  Texturas - Jugador 1
+	Asset::get()->add(prefix + "/data/gfx/player/player1.gif", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/player/player1_1_coffee_palette.gif", AssetType::PALETTE);
+	Asset::get()->add(prefix + "/data/gfx/player/player1_2_coffee_palette.gif", AssetType::PALETTE);
+	Asset::get()->add(prefix + "/data/gfx/player/player1_invencible_palette.gif", AssetType::PALETTE);
+	Asset::get()->add(prefix + "/data/gfx/player/player1_power.png", AssetType::BITMAP);
 
-	{ // Titulo
-		Asset::get()->add(prefix + "/data/gfx/title/title_bg_tile.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/title/title_coffee.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/title/title_crisis.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/title/title_arcade_edition.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/title/title_dust.png", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/title/title_dust.ani", AssetType::ANIMATION);
-	}
+	//  Texturas - Jugador 2
+	Asset::get()->add(prefix + "/data/gfx/player/player2.gif", AssetType::BITMAP);
+	Asset::get()->add(prefix + "/data/gfx/player/player2_1_coffee_palette.gif", AssetType::PALETTE);
+	Asset::get()->add(prefix + "/data/gfx/player/player2_2_coffee_palette.gif", AssetType::PALETTE);
+	Asset::get()->add(prefix + "/data/gfx/player/player2_invencible_palette.gif", AssetType::PALETTE);
+	Asset::get()->add(prefix + "/data/gfx/player/player2_power.png", AssetType::BITMAP);
 
-	{ // Jugador 1
-		Asset::get()->add(prefix + "/data/gfx/player/player1.gif", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/player/player1_1_coffee_palette.gif", AssetType::PALETTE);
-		Asset::get()->add(prefix + "/data/gfx/player/player1_2_coffee_palette.gif", AssetType::PALETTE);
-		Asset::get()->add(prefix + "/data/gfx/player/player1_invencible_palette.gif", AssetType::PALETTE);
-		Asset::get()->add(prefix + "/data/gfx/player/player1_power.png", AssetType::BITMAP);
-	}
-
-	{ // Jugador 2
-		Asset::get()->add(prefix + "/data/gfx/player/player2.gif", AssetType::BITMAP);
-		Asset::get()->add(prefix + "/data/gfx/player/player2_1_coffee_palette.gif", AssetType::PALETTE);
-		Asset::get()->add(prefix + "/data/gfx/player/player2_2_coffee_palette.gif", AssetType::PALETTE);
-		Asset::get()->add(prefix + "/data/gfx/player/player2_invencible_palette.gif", AssetType::PALETTE);
-		Asset::get()->add(prefix + "/data/gfx/player/player2_power.png", AssetType::BITMAP);
-	}
-
-	{ // Animaciones del jugador
-		Asset::get()->add(prefix + "/data/gfx/player/player.ani", AssetType::ANIMATION);
-		Asset::get()->add(prefix + "/data/gfx/player/player_power.ani", AssetType::ANIMATION);
-	}
+	// Animaciones del jugador
+	Asset::get()->add(prefix + "/data/gfx/player/player.ani", AssetType::ANIMATION);
+	Asset::get()->add(prefix + "/data/gfx/player/player_power.ani", AssetType::ANIMATION);
 
 	// Fuentes de texto
 	Asset::get()->add(prefix + "/data/font/8bithud.png", AssetType::BITMAP);