diff --git a/.gitignore b/.gitignore
index 8377dcb..693d85d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,7 @@
 thumbs.db
 *.exe
 *_macos
-*_linux
\ No newline at end of file
+*_linux
+*.dmg
+*.tar.gz
+*.zip
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 7cdc588..ea11dd3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,23 @@
 executable = jaildoctors_dilemma
 source = source/*.cpp source/common/*.cpp
 appName = JailDoctor's Dilemma
-macosReleaseFolder = ../jaildoctors_dilemma_release
-linuxReleaseFolder = jdd_release_linux
+releaseFolder = jdd_release
 
 windows:
 	@echo off
-	if not exist data\config (mkdir data\config)
+	if exist data\config (Remove-Item data\config -Recurse -Force)
+	if not exist data\config (New-Item data\config -ItemType Directory)
 	g++ $(source) -std=c++11 -Wall -Os -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o $(executable).exe
 	strip -s -R .comment -R .gnu.version $(executable).exe --strip-unneeded
 
+windows_release:
+	@echo off
+# Remove data
+	if exist data\config (Remove-Item data\config -Recurse -Force)
+	if not exist data\config (New-Item data\config -ItemType Directory)
+	g++ $(source) -D RELEASE -std=c++11 -Wall -Os -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o $(executable).exe
+	strip -s -R .comment -R .gnu.version $(executable).exe --strip-unneeded
+
 macos:
 	rm -rdf data/config
 	mkdir -p data/config
@@ -18,24 +26,30 @@ macos:
 macos_release:
 # Remove data
 	rm -rdf data/config
-	rm -rdf "$(macosReleaseFolder)/$(appName).app"
+	rm -rdf "$(releaseFolder)
 # Create folders
 	mkdir -p data/config
-	mkdir -p "$(macosReleaseFolder)/$(appName).app/Contents/Frameworks"
-	mkdir -p "$(macosReleaseFolder)/$(appName).app/Contents/MacOS"
-	mkdir -p "$(macosReleaseFolder)/$(appName).app/Contents/Resources"
+	mkdir -p "$(releaseFolder)/$(appName).app/Contents/Frameworks"
+	mkdir -p "$(releaseFolder)/$(appName).app/Contents/MacOS"
+	mkdir -p "$(releaseFolder)/$(appName).app/Contents/Resources"
 	mkdir -p Frameworks
 # Copy folders
-	cp -R data "$(macosReleaseFolder)/$(appName).app/Contents/Resources"
-	cp -R /Library/Frameworks/SDL2.framework "$(macosReleaseFolder)/$(appName).app/Contents/Frameworks"
+	cp -R data "$(releaseFolder)/$(appName).app/Contents/Resources"
+	cp -R /Library/Frameworks/SDL2.framework "$(releaseFolder)/$(appName).app/Contents/Frameworks"
 	cp -R /Library/Frameworks/SDL2.framework Frameworks
 # Copy files
-	cp release/*.icns "$(macosReleaseFolder)/$(appName).app/Contents/Resources"
-	cp release/Info.plist "$(macosReleaseFolder)/$(appName).app/Contents"
+	cp release/*.icns "$(releaseFolder)/$(appName).app/Contents/Resources"
+	cp release/Info.plist "$(releaseFolder)/$(appName).app/Contents"
 # Build
-	clang++ $(source) -std=c++11 -Wall -Os -framework SDL2 -F ./Frameworks -ffunction-sections -fdata-sections -o "$(macosReleaseFolder)/$(appName).app/Contents/MacOS/$(executable)" -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.12
+	clang++ $(source) -D RELEASE -D MACOS_BUNDLE -std=c++11 -Wall -Os -framework SDL2 -F ./Frameworks -ffunction-sections -fdata-sections -o "$(releaseFolder)/$(appName).app/Contents/MacOS/$(executable)" -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.12
 # Remove folders
 	rm -rdf Frameworks
+# Build DMG
+	hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" 
+	hdiutil convert tmp.dmg -format UDZO -o "$(appName).dmg"
+# Remove data
+	rm -rdf "$(releaseFolder)"
+	rm tmp.dmg
 
 linux:
 	rm -rdf data/config
@@ -46,18 +60,18 @@ linux:
 linux_release:
 # Remove data
 	rm -rdf data/config
-	rm -rdf $(linuxReleaseFolder)
+	rm -rdf $(releaseFolder)
 # Create folders
 	mkdir -p data/config
-	mkdir -p $(linuxReleaseFolder)
+	mkdir -p $(releaseFolder)
 # Copy data
-	cp -R data $(linuxReleaseFolder)
-	cp LICENSE $(linuxReleaseFolder)
-	cp README.md $(linuxReleaseFolder)
+	cp -R data $(releaseFolder)
+	cp LICENSE $(releaseFolder)
+	cp README.md $(releaseFolder)
 # Build
-	g++ $(source) -D RELEASE -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(linuxReleaseFolder)/$(executable)
+	g++ $(source) -D RELEASE -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(releaseFolder)/$(executable)
 	strip -s -R .comment -R .gnu.version $(executable)_linux --strip-unneeded
 # Pack files
-	cd $(linuxReleaseFolder) &&	tar -czvf ../$(executable).tar.gz *
+	cd $(releaseFolder) &&	tar -czvf ../$(executable).tar.gz *
 # Remove data
-	rm -rdf $(linuxReleaseFolder)
\ No newline at end of file
+	rm -rdf $(releaseFolder)
\ No newline at end of file
diff --git a/source/const.h b/source/const.h
index 8500904..7de58b1 100644
--- a/source/const.h
+++ b/source/const.h
@@ -7,9 +7,6 @@
 #ifndef CONST_H
 #define CONST_H
 
-//#define MACOS_BUNDLE
-//#define RELEASE
-
 // Textos
 #define WINDOW_CAPTION "JailDoctor's Dilemma"
 #define TEXT_COPYRIGHT "@2022 JailDesigner"