diff --git a/mknewersmb.sh b/mknewersmb.sh
index a6f9d9a..2cbb1f8 100755
--- a/mknewersmb.sh
+++ b/mknewersmb.sh
@@ -1,239 +1,46 @@
 #!/bin/bash
 #
-# create newer SMB image, based on dmms work
+# create wbfs image from riivolution patch
 #
 # Christopher Roy Bratusek <nano@tuxfamily.org>
 #
 # License: GPL v3
 
-place_files() {
+source ./script.d/common.sh
 
-	NEW_DIRS=( nsmb.d/files/LevelSamples nsmb.d/files/NewerRes nsmb.d/files/Sound/new/sfx nsmb.d/files/Maps )
-	for dir in ${NEW_DIRS[@]}; do
-		mkdir -p ${dir}
-	done
+optparse "${@}"
 
-	case ${VERSION} in
-		EUR* )
-			LANGDIRS=( EngEU FraEU GerEU ItaEU SpaEU NedEU )
-			for dir in ${LANGDIRS[@]}; do
-				cp -r ./NewerFiles/NewerSMBW/{Font,Message}/ ./nsmb.d/files/EU/${dir}/
-			done
-			cp ./NewerFiles/NewerSMBW/OthersP/* ./nsmb.d/files/EU/Layout/openingTitle/
-		;;
-
-		USAv* )
-			LANGDIRS=( FraUS EngUS SpaUS )
-			for dir in ${LANGDIRS[@]}; do
-				cp -r ./NewerFiles/NewerSMBW/{Font,Message}/ ./nsmb.d/files/US/${dir}/
-			done
-			cp ./NewerFiles/NewerSMBW/OthersE/* ./nsmb.d/files/US/Layout/openingTitle/
-		;;
-
-		JPNv1 )
-			cp ./NewerFiles/NewerSMBW/Font/* ./nsmb.d/files/JP/Font/
-			cp ./NewerFiles/NewerSMBW/Message/* ./nsmb.d/files/JP/Message/
-			cp ./NewerFiles/NewerSMBW/OthersJ/* ./nsmb.d/files/JP/Layout/openingTitle/
-		;;
-	esac
-
-	cp ./NewerFiles/NewerSMBW/Tilesets/* ./nsmb.d/files/Stage/Texture/
-	cp ./NewerFiles/NewerSMBW/TitleReplay/* ./nsmb.d/files/Replay/title/
-	cp ./NewerFiles/NewerSMBW/BGs/* ./nsmb.d/files/Object/
-	cp ./NewerFiles/NewerSMBW/SpriteTex/* ./nsmb.d/files/Object/
-	cp ./NewerFiles/NewerSMBW/Layouts/* ./nsmb.d/files/Layout/
-	cp -r ./NewerFiles/NewerSMBW/Music/*.er ./nsmb.d/files/Sound/new/
-	cp ./NewerFiles/NewerSMBW/Music/sfx/* ./nsmb.d/files/Sound/new/sfx/
-	cp ./NewerFiles/NewerSMBW/Music/stream/* ./nsmb.d/files/Sound/stream/
-	cp ./NewerFiles/NewerSMBW/Music/rsar/* ./nsmb.d/files/Sound/
-	cp ./NewerFiles/NewerSMBW/NewerRes/* ./nsmb.d/files/NewerRes/
-	cp ./NewerFiles/NewerSMBW/LevelSamples/* ./nsmb.d/files/LevelSamples/
-	cp ./NewerFiles/NewerSMBW/Others/charaChangeSelectContents.arc ./nsmb.d/files/Layout/charaChangeSelectContents/charaChangeSelectContents.arc
-	cp ./NewerFiles/NewerSMBW/Others/characterChange.arc ./nsmb.d/files/Layout/characterChange/characterChange.arc
-	cp ./NewerFiles/NewerSMBW/Others/continue.arc ./nsmb.d/files/Layout/continue/continue.arc
-	cp ./NewerFiles/NewerSMBW/Others/controllerInformation.arc ./nsmb.d/files/Layout/controllerInformation/controllerInformation.arc
-	cp ./NewerFiles/NewerSMBW/Others/corseSelectMenu.arc ./nsmb.d/files/Layout/corseSelectMenu/corseSelectMenu.arc
-	cp ./NewerFiles/NewerSMBW/Others/corseSelectUIGuide.arc ./nsmb.d/files/Layout/corseSelectUIGuide/corseSelectUIGuide.arc
-	cp ./NewerFiles/NewerSMBW/Others/dateFile.arc ./nsmb.d/files/Layout/dateFile/dateFile.arc
-	cp ./NewerFiles/NewerSMBW/Others/dateFile_OLD.arc ./nsmb.d/files/Layout/dateFile/dateFile_OLD.arc
-	cp ./NewerFiles/NewerSMBW/Others/easyPairing.arc ./nsmb.d/files/Layout/easyPairing/easyPairing.arc
-	cp ./NewerFiles/NewerSMBW/Others/extensionControllerNunchuk.arc ./nsmb.d/files/Layout/extensionControllerNunchuk/extensionControllerNunchuk.arc
-	cp ./NewerFiles/NewerSMBW/Others/extensionControllerYokomochi.arc ./nsmb.d/files/Layout/extensionControllerYokomochi/extensionControllerYokomochi.arc
-	cp ./NewerFiles/NewerSMBW/Others/fileSelectBase.arc ./nsmb.d/files/Layout/fileSelectBase/fileSelectBase.arc
-	cp ./NewerFiles/NewerSMBW/Others/fileSelectBase_OLD.arc ./nsmb.d/files/Layout/fileSelectBase/fileSelectBase_OLD.arc
-	cp ./NewerFiles/NewerSMBW/Others/fileSelectPlayer.arc ./nsmb.d/files/Layout/fileSelectPlayer/fileSelectPlayer.arc
-	cp ./NewerFiles/NewerSMBW/Others/gameScene.arc ./nsmb.d/files/Layout/gameScene/gameScene.arc
-	cp ./NewerFiles/NewerSMBW/Others/infoWindow.arc ./nsmb.d/files/Layout/infoWindow/infoWindow.arc
-	cp ./NewerFiles/NewerSMBW/Others/miniGameCannon.arc ./nsmb.d/files/Layout/miniGameCannon/miniGameCannon.arc
-	cp ./NewerFiles/NewerSMBW/Others/miniGameWire.arc ./nsmb.d/files/Layout/miniGameWire/miniGameWire.arc
-	cp ./NewerFiles/NewerSMBW/Others/pauseMenu.arc ./nsmb.d/files/Layout/pauseMenu/pauseMenu.arc
-	cp ./NewerFiles/NewerSMBW/Others/pointResultDateFile.arc ./nsmb.d/files/Layout/pointResultDateFile/pointResultDateFile.arc
-	cp ./NewerFiles/NewerSMBW/Others/pointResultDateFileFree.arc ./nsmb.d/files/Layout/pointResultDateFileFree/pointResultDateFileFree.arc
-	cp ./NewerFiles/NewerSMBW/Others/preGame.arc ./nsmb.d/files/Layout/preGame/preGame.arc
-	cp ./NewerFiles/NewerSMBW/Others/select_cursor.arc ./nsmb.d/files/Layout/select_cursor/select_cursor.arc
-	cp ./NewerFiles/NewerSMBW/Others/sequenceBG.arc ./nsmb.d/files/Layout/sequenceBG/sequenceBG.arc
-	cp ./NewerFiles/NewerSMBW/Others/staffCredit.arc ./nsmb.d/files/Layout/staffCredit/staffCredit.arc
-	cp ./NewerFiles/NewerSMBW/Others/stockItem.arc ./nsmb.d/files/Layout/stockItem/stockItem.arc
-	cp ./NewerFiles/NewerSMBW/Others/stockItemShadow.arc ./nsmb.d/files/Layout/stockItemShadow/stockItemShadow.arc
-	cp ./NewerFiles/NewerSMBW/Others/yesnoWindow.arc ./nsmb.d/files/Layout/yesnoWindow/yesnoWindow.arc
-	cp -r ./NewerFiles/NewerSMBW/Maps/* ./nsmb.d/files/Maps/
-	cp ./NewerFiles/NewerSMBW/Stages/* ./nsmb.d/files/Stage/
-}
-
-rm -rf ./nsmb.d
-rm -f ./*.wbfs
-
-AMD64=$(uname -m)
-if [[ ${AMD64} == "x86_64" ]]; then
-	WIT=./wit.64
-	PPF=./applyppf3.64
-else
-	WIT=./wit.32
-	PPF=./applyppf3.32
+if [[ ! ${GAME} ]]; then
+	ask_game
 fi
 
-TMD_OPTS="--ticket-id=K --tmd-id=K"
+case ${GAME} in
 
-xcount=0
-pcount=$#
+	A | NewerSMB )
+		source ./script.d/newersmb.sh
+	;;
 
-while [[ $xcount -lt $pcount ]]; do
-	case $1 in
-
-		--iso* )
-			ISO_PATH=${1/*=}
-			ISO_EXT=${ISO_PATH//*./}
-
-			if [[ -e "${ISO_PATH}" ]]; then
-				ln -sf "${ISO_PATH}" ./BASE.${ISO_EXT}
-				IMAGE=./BASE.${ISO_EXT}
-			else
-				echo -e "ISO not found"
-				exit1
-			fi
-		;;
-
-		--newerfiles* )
-			NEWERFILES=${1/*=}
-			if [[ -e "${NEWERFILES}" ]]; then
-				unzip "${NEWERFILES}" >/dev/null
-			else
-				echo -e "NewerFiles not found."
-				exit1
-			fi
-		;;
-
-		--customid* )
-			CUSTOMID=${1/*=}
-			if [[ ${#CUSTOMID} != 6 ]]; then
-				echo -e "CustomID ${CUSTOMID} needs to have 6 digits"
-				exit 1
-			fi
-		;;
-
-		--version=* )
-			VERSION=${1/*=}
-			case ${VERSION} in
-				EURv1 )
-					PATCH=./patches/EURv1.ppf
-					REG_LETTER=P
-				;;
-
-				EURv2 )
-					PATCH=./patches/EURv2.ppf
-					REG_LETTER=P
-				;;
-
-				USAv1 )
-					PATCH=./patches/USAv1.ppf
-					REG_LETTER=E
-				;;
-
-				USAv2 )
-					PATCH=./patches/USAv2.ppf
-					REG_LETTER=E
-				;;
-
-				JPNv1 )
-					PATCH=./patches/JPNv1.ppf
-					REG_LETTER=J
-				;;
-
-				* )
-					echo -e "unrecognized game version: ${VERSION}"
-					exit 1
-				;;
-			esac
-		;;
-
-		--sharesave )
-			TMD_OPTS=""
-		;;
-
-		"" | --help )
-			echo -e "create newer super mario bros. wbfs image.\n
-***** using this script is only allowed, if you own an original copy of the game.
-***** if you don't, no one can be blamed but you. Shame on you.\n
---iso=/home/test/SMNP01.wbfs		| specify which ISO to use for building
---newerfiles=/home/test/NewerSMB.zip	| specify path to NewerSMB files
---customdid=SMNP02			| specify a custom ID to use for the game
---sharesave				| if passed, NewerSMB shares the savegame with the original game"
-			exit 0
-		;;
-	esac
-	shift
-	xcount=$(($xcount+1))
-done
-
-if [[ -e ./BASE.wbfs && ! ${IMAGE} ]]; then
-	IMAGE=./BASE.wbfs
-elif [[ -e ./BASE.iso && ! ${IMAGE} ]]; then
-	IMAGE=./BASE.iso
-elif [[ ! ${IMAGE} ]]; then
-	echo -e "please specify image to use with --iso=<path>"
-	exit 1
-fi
-
-if [[ -e ./NewerSMB.zip && ! ${NEWERFILES} ]]; then
-	unzip ./NewerSMB.zip >/dev/null
-elif [[ ! -d ./NewerFiles/ && ! ${NEWERFILES} ]]; then
-	echo -e "please specify zip to use with --newerfiles=<path>"
-	exit 1
-fi
-
-if [[ ${IMAGE} ]]; then
-	${WIT} extract "${IMAGE}" nsmb.d --psel=DATA -vv || exit 1
-
-	if [[ -f ./nsmb.d/files/COPYDATE_LAST_2009-10-03_232911 ]]; then
-		VERSION=EURv1
-		PATCH=./patches/EURv1.ppf
-		REG_LETTER=P
-	elif [[ -f ./nsmb.d/files/COPYDATE_LAST_2010-01-05_152101 ]]; then
-		VERSION=EURv2
-		PATCH=./patches/EURv2.ppf
-		REG_LETTER=P
-	elif [[ -f ./nsmb.d/files/COPYDATE_LAST_2009-10-03_232303 ]]; then
-		VERSION=USAv1
-		PATCH=./patches/USAv1.ppf
-		REG_LETTER=E
-	elif [[ -f ./nsmb.d/files/COPYDATE_LAST_2010-01-05_143554 ]]; then
-		VERSION=USAv2
-		PATCH=./patches/USAv2.ppf
-		REG_LETTER=E
-	elif [[ -f ./nsmb.d/files/COPYDATE_LAST_2009-10-03_231655 ]]; then
-		VERSION=JPNv1
-		PATCH=./patches/JPNv1.ppf
-		REG_LETTER=J
-	elif [[ ! ${VERSION} ]]; then
-		echo -e "please specify your games version using --version={EURv1,EURv2,USAv1,USAv2,JPNv1}"
+	* )
+		echo -e "specified Game ${GAME} not recognized"
 		exit 1
-	fi
+	;;
 
-	place_files
-	${PPF} a ./nsmb.d/sys/main.dol ${PATCH}
-	if [[ ${CUSTOMID} ]]; then
-		${WIT} cp -v -B ./nsmb.d ./${CUSTOMID}.wbfs -vv --disc-id=${CUSTOMID} ${TMD_OPTS} --name "Newer SMBW"
-	else
-		${WIT} cp -v -B ./nsmb.d ./SMN${REG_LETTER}02.wbfs -vv --disc-id=SMN${REG_LETTER}02 ${TMD_OPTS} --name "Newer SMBW"
-	fi
+esac
+
+cleanup_prebuild
+check_input_image
+check_input_image_special
+check_riivolution_patch
+
+${WIT} extract "${IMAGE}" ${WORKDIR} --psel=DATA -vv || exit 1
+
+detect_game_version
+place_files
+
+${PPF} a ${DOL} ${PATCH}
+
+if [[ ${CUSTOMID} ]]; then
+	${WIT} cp -v -B ${WORKDIR} ./${CUSTOMID}.wbfs -vv --disc-id=${CUSTOMID} ${TMD_OPTS} --name "${GAMENAME}"
+else
+	${WIT} cp -v -B ${WORKDIR} ./${GAMEID}.wbfs -vv --disc-id=${GAMEID} ${TMD_OPTS} --name "${GAMENAME}"
 fi
diff --git a/patches/EURv1.ppf b/patches/EURv1.ppf
deleted file mode 100644
index 729ed0b..0000000
Binary files a/patches/EURv1.ppf and /dev/null differ
diff --git a/patches/EURv2.ppf b/patches/EURv2.ppf
deleted file mode 100644
index d187cf4..0000000
Binary files a/patches/EURv2.ppf and /dev/null differ
diff --git a/patches/JPNv1.ppf b/patches/JPNv1.ppf
deleted file mode 100644
index d31f09d..0000000
Binary files a/patches/JPNv1.ppf and /dev/null differ
diff --git a/patches/USAv1.ppf b/patches/USAv1.ppf
deleted file mode 100644
index a88510c..0000000
Binary files a/patches/USAv1.ppf and /dev/null differ
diff --git a/patches/USAv2.ppf b/patches/USAv2.ppf
deleted file mode 100644
index c91497f..0000000
Binary files a/patches/USAv2.ppf and /dev/null differ