diff --git a/.gitignore b/.gitignore
index 9ba08a3b..cc281eeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,61 +1,40 @@
-/ORBIS_Debug
-/ORBIS_Release
-/PS3_Debug
-/PS3_Release
-/PSVita_Debug
-/PSVita_Release
-/PSVita_ContentPackage
-/X360_Debug
-/X360_Release
-/Release
-/Debug
+/*Debug
+/*Release
+/*ContentPackage
+/*ContentPackage_NO_TU
+/*ContentPackage_SYMBOLS
 /x64
 /ipch
 .vs/
 
-/Minecraft.Client/ORBIS_Debug
-/Minecraft.Client/ORBIS_Release
-/Minecraft.Client/PS3_Debug
-/Minecraft.Client/PS3_Release
-/Minecraft.Client/PSVita_Debug
-/Minecraft.Client/PSVita_Release
-/Minecraft.Client/PSVita_ContentPackage
-/Minecraft.Client/X360_Debug
-/Minecraft.Client/X360_Release
-/Minecraft.Client/Debug
-/Minecraft.Client/Release
+# Minecraft.Client
+/Minecraft.Client/*Debug
+/Minecraft.Client/*Release
+/Minecraft.Client/*ContentPackage
+/Minecraft.Client/*ContentPackage_NO_TU
+/Minecraft.Client/*ContentPackage_SYMBOLS
 /Minecraft.Client/x64
 /Minecraft.Client/Windows64/GameHDD
 
-/Minecraft.World/ORBIS_Debug
-/Minecraft.World/ORBIS_Release
-/Minecraft.World/PS3_Debug
-/Minecraft.World/PS3_Release
-/Minecraft.World/PSVita_Debug
-/Minecraft.World/PSVita_Release
-/Minecraft.World/PSVita_ContentPackage
-/Minecraft.World/X360_Debug
-/Minecraft.World/X360_Release
-/Minecraft.World/Debug
-/Minecraft.World/Release
-/Minecraft.World/x64_Debug
-/Minecraft.World/x64_Release
-MinecraftConsoles.opensdf
-MinecraftConsoles.v11.suo
-MinecraftConsoles.sdf
+# Minecraft.world
+/Minecraft.World/*Debug
+/Minecraft.World/*Release
+/Minecraft.World/*ContentPackage
+/Minecraft.World/*ContentPackage_NO_TU
+/Minecraft.World/*ContentPackage_SYMBOLS
+
+# PS3 SPU
+/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/PS3*
+/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/PS3*
+/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/PS3*
+/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/PS3*
+/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/PS3*
+/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PS3*
+
+# Misc
 *.pkg
-/CUSA00283-app
-CUSA00283-app.gp4
-cafeberry.pkg.for_disc0.gp4
-/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/PS3_Debug
-/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/PS3_Debug
-/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/PS3_Debug
-/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/PS3_Debug
-/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/PS3_Debug
-/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PS3_Debug
-/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/PS3_Release
-/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/PS3_Release
-/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/PS3_Release
-/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/PS3_Release
-/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/PS3_Release
-/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PS3_Release
+/*.gp4
+*-app
+*.sdf
+*.opensdf
+*.v11.suo
\ No newline at end of file