Commit: 0132d66580f9c76ac8af6ab41fef17c962f3f4ed - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• Revision: 0132d66580f9c76ac8af6ab41fef17c962f3f4ed (tree)
• Zeit: 2020-01-15 01:44:06
• Autor: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Log Message

K4thos氏の更新に合流
変更点が多いので注意

Ändern Zusammenfassung

• modified: get.sh
• modified: script/main.lua
• modified: script/motif.lua
• modified: script/options.lua
• modified: script/randomtest.lua
• modified: script/screenpack.lua
• modified: script/select.lua
• modified: script/storyboard.lua
• add: src/bgdef.go
• modified: src/bytecode.go
• modified: src/char.go
• modified: src/common.go
• modified: src/compiler.go
• modified: src/font.go
• modified: src/image.go
• modified: src/input.go
• modified: src/lifebar.go
• modified: src/main.go
• modified: src/render.go
• modified: src/script.go
• modified: src/stage.go
• modified: src/system.go

Diff

--- a/get.sh
+++ b/get.sh
@@ -10,4 +10,6 @@ go get -u github.com/faiface/beep
 go get -u github.com/hajimehoshi/oto
 go get -u github.com/hajimehoshi/go-mp3
 go get -u github.com/pkg/errors
-go get -u github.com/jfreymuth/oggvorbis
\ No newline at end of file
+go get -u github.com/jfreymuth/oggvorbis
+go get -u github.com/kbinani/screenshot
+go get -u github.com/sqweek/dialog
\ No newline at end of file

--- a/script/main.lua
+++ b/script/main.lua
@@ -1,29 +1,30 @@
--------------------------------------------------------------
--- Disable GC during the initial load so it does not crash.
+--;===========================================================
+--; INITIALIZE DATA
+--;===========================================================
+--Disable GC during the initial load so it does not crash
 SetGCPercent(-1)
--------------------------------------------------------------
+
+--nClock = os.clock()
+--print("Elapsed time: " .. os.clock() - nClock)
+
 main = {}
 
 refresh()
 math.randomseed(os.time())
 
---;===========================================================
---; COMMON SECTION
---;===========================================================
-
 --One-time load of the json routines
 json = (loadfile 'script/dkjson.lua')()
 
--- Data loading from config.json
+--Data loading from config.json
 local file = io.open("save/config.json","r")
 config = json.decode(file:read("*all"))
 file:close()
 
+--Input stuff
 main.p1In = 1
 main.p2In = 2
 --main.inputDialog = inputDialogNew()
 
--------------------------------------------------------------
 function main.f_setCommand(c)
 	commandAdd(c, 'u', '$U')
 	commandAdd(c, 'd', '$D')
@@ -49,6 +50,15 @@ main.f_setCommand(main.p1Cmd)
 main.p2Cmd = commandNew()
 main.f_setCommand(main.p2Cmd)
 
+main.p3Cmd = commandNew()
+main.f_setCommand(main.p3Cmd)
+
+main.p4Cmd = commandNew()
+main.f_setCommand(main.p4Cmd)
+
+--;===========================================================
+--; COMMON FUNCTIONS
+--;===========================================================
 function main.f_cmdInput()
 	commandInput(main.p1Cmd, main.p1In)
 	commandInput(main.p2Cmd, main.p2In)
@@ -69,96 +79,6 @@ function main.f_btnPalNo(cmd)
 	return 0
 end
 
--- Check if files exists.
-function main.file_exists(name)
-   local f=io.open(name,"r")
-   if f~=nil then io.close(f) return true else return false end
-end
-
---prints "t" table content into "toFile" file
-function main.f_printTable(t, toFile)
-	local toFile = toFile or 'debug/table_print.txt'
-	local txt = ''
-	local print_t_cache = {}
-	local function sub_print_t(t, indent)
-		if print_t_cache[tostring(t)] then
-			txt = txt .. indent .. '*' .. tostring(t) .. '\n'
-		else
-			print_t_cache[tostring(t)] = true
-			if type(t) == 'table' then
-				for pos, val in pairs(t) do
-					if type(val) == 'table' then
-						txt = txt .. indent .. '[' .. pos .. '] => ' .. tostring(t) .. ' {' .. '\n'
-						sub_print_t(val, indent .. string.rep(' ', string.len(tostring(pos)) + 8))
-						txt = txt .. indent .. string.rep(' ', string.len(tostring(pos)) + 6) .. '}' .. '\n'
-					elseif type(val) == 'string' then
-						txt = txt .. indent .. '[' .. pos .. '] => "' .. val .. '"' .. '\n'
-					else
-						txt = txt .. indent .. '[' .. pos .. '] => ' .. tostring(val) ..'\n'
-					end
-				end
-			else
-				txt = txt .. indent .. tostring(t) .. '\n'
-			end
-		end
-	end
-	if type(t) == 'table' then
-		txt = txt .. tostring(t) .. ' {' .. '\n'
-		sub_print_t(t, '  ')
-		txt = txt .. '}' .. '\n'
-	else
-		sub_print_t(t, '  ')
-	end
-	local file = io.open(toFile,"w+")
-	if file == nil then return end
-	file:write(txt)
-	file:close()
-end
-
--- Prints "v" variable into "toFile" file
-function main.f_printVar(v, toFile)
-	local toFile = toFile or 'debug/var_print.txt'
-	local file = io.open(toFile,"w+")
-	file:write(v)
-	file:close()
-end
-
--- Split strings.
-function main.f_strsplit(delimiter, text)
-	local list = {}
-	local pos = 1
-	if string.find('', delimiter, 1) then
-		if string.len(text) == 0 then
-			table.insert(list, text)
-		else
-			for i = 1, string.len(text) do
-				table.insert(list, string.sub(text, i, i))
-			end
-		end
-	else
-		while true do
-			local first, last = string.find(text, delimiter, pos)
-			if first then
-				table.insert(list, string.sub(text, pos, first - 1))
-				pos = last + 1
-			else
-				table.insert(list, string.sub(text, pos))
-				break
-			end
-		end
-	end
-	return list
-end
-
--------------------------------------------------------------
--- Int localcoord
-require "script/screenpack"
-main.IntLocalcoordValues()
-main.CalculateLocalcoordValues()
-main.IntLifebarScale()
-main.SetScaleValues()
--------------------------------------------------------------
-
 --animDraw at specified coordinates
 function main.f_animPosDraw(a, x, y)
 	animSetPos(a, x, y)
@@ -176,16 +96,14 @@ function main.f_textImgPosDraw(ti, x, y, align)
 end
 
 --shortcut for creating new text with several parameters
-function main.f_createTextImg(font, bank, align, text, x, y, scaleX, scaleY, colorR, colorG, colorB)
+function main.f_createTextImg(font, bank, align, text, x, y, scaleX, scaleY, r, g, b, src, dst)
 	local ti = textImgNew()
 	if font ~= nil then
 		textImgSetFont(ti, font)
 		textImgSetBank(ti, bank)
 		textImgSetAlign(ti, align)
 		textImgSetText(ti, text)
-		if colorR ~= nil and colorG ~= nil and colorB ~= nil then
-			textImgSetColor(ti, colorR, colorG, colorB)
-		end
+		textImgSetColor(ti, r, g, b, src, dst)
 		if align == -1 then x = x + 1 end --fix for wrong offset after flipping text
 		textImgSetPos(ti, x, y)
 		textImgSetScale(ti, scaleX, scaleY)
@@ -194,20 +112,18 @@ function main.f_createTextImg(font, bank, align, text, x, y, scaleX, scaleY, col
 end
 
 --shortcut for updating text with several parameters
-function main.f_updateTextImg(animName, font, bank, align, text, x, y, scaleX, scaleY, colorR, colorG, colorB)
+function main.f_updateTextImg(ti, font, bank, align, text, x, y, scaleX, scaleY, r, g, b, src, dst)
 	if font ~= nil then
-		textImgSetFont(animName, font)
-		textImgSetBank(animName, bank)
-		textImgSetAlign(animName, align)
-		textImgSetText(animName, text)
-		if colorR ~= nil and colorG ~= nil and colorB ~= nil then
-			textImgSetColor(animName, colorR, colorG, colorB)
-		end
+		textImgSetFont(ti, font)
+		textImgSetBank(ti, bank)
+		textImgSetAlign(ti, align)
+		textImgSetText(ti, text)
+		textImgSetColor(ti, r, g, b, src, dst)
 		if align == -1 then x = x + 1 end --fix for wrong offset after flipping text
-		textImgSetPos(animName, x, y)
-		textImgSetScale(animName, scaleX, scaleY)
+		textImgSetPos(ti, x, y)
+		textImgSetScale(ti, scaleX, scaleY)
 	end
-	return animName
+	return ti
 end
 
 --dynamically adjusts alpha blending each time called based on specified values
@@ -215,7 +131,7 @@ local alpha1cur = 0
 local alpha2cur = 0
 local alpha1add = true
 local alpha2add = true
-function main.f_dynamicAlpha(animName, r1min, r1max, r1step, r2min, r2max, r2step)
+function main.f_boxcursorAlpha(r1min, r1max, r1step, r2min, r2max, r2step)
 	if r1step == 0 then alpha1cur = r1max end
 	if alpha1cur < r1max and alpha1add then
 		alpha1cur = alpha1cur + r1step
@@ -240,55 +156,7 @@ function main.f_dynamicAlpha(animName, r1min, r1max, r1step, r2min, r2max, r2ste
 			alpha2add = true
 		end
 	end
-	animSetAlpha(animName, alpha1cur, alpha2cur)
-end
-
---generate fading animation
---currently only black when average of RGB <= 128 and white if >128 colors supported
-function main.f_fadeAnim(fadeType, ticks, r, g, b)
-	local anim = ''
-	if (r + g + b)/3 > 128 then --white
-		if fadeType == 0 then --fadeout
-			for i = 1, ticks do
-				anim = anim .. '0,1, 0,0, 1, 0, AS' .. math.floor(256 / ticks * i) .. 'D256\n'
-			end
-			anim = anim .. '0,1, 0,0, -1, 0, AS256D256'
-		elseif fadeType == 1 then --fadein
-			for i = ticks, 1, -1 do
-				anim = anim .. '0,1, 0,0, 1, 0, AS' .. math.floor(256 / ticks * i) .. 'D256\n'
-			end
-			anim = anim .. '0,1, 0,0, -1, 0, AS0D256'
-		end
-	else --black
-		if fadeType == 0 then --fadeout
-			for i = ticks, 1, -1 do
-				anim = anim .. '0,0, 0,0, 1, 0, AS256D' .. math.floor(256 / ticks * i) .. '\n'
-			end
-			anim = anim .. '0,0, 0,0, -1, 0, AS256D0'
-		elseif fadeType == 1 then --fadein
-			for i = 1, ticks do
-				anim = anim .. '0,0, 0,0, 1, 0, AS256D' .. math.floor(256 / ticks * i) .. '\n'
-			end
-			anim = anim .. '0,0, 0,0, -1, 0, AS256D256'
-		end
-	end
-	anim = animNew(main.fadeSff, anim)
-	animUpdate(anim)
-	return anim, ticks
-end
-
---generate clearcolor animation
---currently only black when average of RGB <= 128 and white if >128 colors supported
-function main.f_clearColor(r, g, b)
-	local anim = ''
-	if (r + g + b)/3 > 128 then
-		anim = '0,1, 0,0, -1' --white
-	else
-		anim = '0,0, 0,0, -1' --black
-	end
-	anim = animNew(main.fadeSff, anim)
-	animUpdate(anim)
-	return anim
+	return alpha1cur, alpha2cur
 end
 
 --generate anim from table
@@ -305,7 +173,7 @@ function main.f_animFromTable(t, sff, x, y, scaleX, scaleY, facing, infFrame)
 	for i = 1, #t do
 		local t_anim = {}
 		for j, c in ipairs(main.f_strsplit(',', t[i])) do --split using "," delimiter
-			t_anim[#t_anim + 1] = c
+			table.insert(t_anim, c)
 		end
 		if #t_anim > 1 then
 			--required parameters
@@ -341,15 +209,28 @@ end
 --Convert number to name and get rid of the ""
 function main.f_getName(cell)
 	local tmp = getCharName(cell)
-	tmp = tmp:gsub('^["%s]*(.-)["%s]*$', '%1') --needed for s-size ikemen
 	if main.t_selChars[cell + 1].hidden == 3 then
 		tmp = 'Random'
-	elseif main.t_selChars[cell + 1].hidden == 2 or main.t_selChars[cell + 1].hidden == 1 then
+	elseif main.t_selChars[cell + 1].hidden == 2 then
 		tmp = ''
 	end
 	return tmp
 end
 
+--copy table content into new table
+function main.f_copyTable(t)
+	t = t or {}
+	local t2 = {}
+	for k, v in pairs(t) do
+		if type(v) == "table" then
+			t2[k] = main.f_copyTable(v)
+		else
+			t2[k] = v
+		end
+	end
+	return t2
+end
+
 --randomizes table content
 function main.f_shuffleTable(t)
 	local rand = math.random
@@ -374,7 +255,7 @@ end
 function main.f_sortKeys(t, order)
 	-- collect the keys
 	local keys = {}
-	for k in pairs(t) do keys[#keys + 1] = k end
+	for k in pairs(t) do table.insert(keys, k) end
 	-- if order function given, sort it by passing the table and keys a, b,
 	-- otherwise just sort the keys 
 	if order then
@@ -392,12 +273,60 @@ function main.f_sortKeys(t, order)
 	end
 end
 
+--prints "t" table content into "toFile" file
+function main.f_printTable(t, toFile)
+	local toFile = toFile or 'debug/table_print.txt'
+	local txt = ''
+	local print_t_cache = {}
+	local function sub_print_t(t, indent)
+		if print_t_cache[tostring(t)] then
+			txt = txt .. indent .. '*' .. tostring(t) .. '\n'
+		else
+			print_t_cache[tostring(t)] = true
+			if type(t) == 'table' then
+				for pos, val in pairs(t) do
+					if type(val) == 'table' then
+						txt = txt .. indent .. '[' .. pos .. '] => ' .. tostring(t) .. ' {' .. '\n'
+						sub_print_t(val, indent .. string.rep(' ', string.len(tostring(pos)) + 8))
+						txt = txt .. indent .. string.rep(' ', string.len(tostring(pos)) + 6) .. '}' .. '\n'
+					elseif type(val) == 'string' then
+						txt = txt .. indent .. '[' .. pos .. '] => "' .. val .. '"' .. '\n'
+					else
+						txt = txt .. indent .. '[' .. pos .. '] => ' .. tostring(val) ..'\n'
+					end
+				end
+			else
+				txt = txt .. indent .. tostring(t) .. '\n'
+			end
+		end
+	end
+	if type(t) == 'table' then
+		txt = txt .. tostring(t) .. ' {' .. '\n'
+		sub_print_t(t, '  ')
+		txt = txt .. '}' .. '\n'
+	else
+		sub_print_t(t, '  ')
+	end
+	local file = io.open(toFile,"w+")
+	if file == nil then return end
+	file:write(txt)
+	file:close()
+end
+
+--prints "v" variable into "toFile" file
+function main.f_printVar(v, toFile)
+	local toFile = toFile or 'debug/var_print.txt'
+	local file = io.open(toFile,"w+")
+	file:write(v)
+	file:close()
+end
+
 --remove duplicated string pattern
 function main.f_uniq(str, pattern, subpattern)
 	local out = {}
 	for s in str:gmatch(pattern) do
 		local s2 = s:match(subpattern)
-		if not main.f_contains(out, s2) then out[#out + 1] = s end
+		if not main.f_contains(out, s2) then table.insert(out, s) end
 	end
 	return table.concat(out)
 end
@@ -436,7 +365,7 @@ function main.f_textRender(data, str, counter, x, y, spacing, delay, limit)
 	local subEnd = math.floor(#str - (#str - counter / delay))
 	local t = {}
 	for line in str:gmatch('([^\r\n]*)[\r\n]?') do
-		t[#t + 1] = line
+		table.insert(t, line)
 	end
 	local lengthCnt = 0
 	for i = 1, #t do
@@ -569,165 +498,6 @@ function main.f_strsplit(delimiter, text)
 	return list
 end
 
---expand background table with background controllers data
-function main.f_ctrlBG(t_bg, t_ctrl)
-	local t = {}
-	for k, v in pairs(t_ctrl) do
-		local t1 = t_ctrl[k].ctrl
-		for i = 1, #t1 do
-			for k2, v2 in pairs(t1[i].ctrlid) do
-				local t2 = t1[i].type
-				if t1[i].ctrlid[k2] == t_bg.id and t2 ~= 'null' then
-					if t[t2] == nil then
-						t[t2] = {}
-					end
-					t[t2][#t[t2] + 1] = {}
-					local t3 = t[t2][#t[t2]]
-					t3.time = {t1[i].time[1], t1[i].time[2], t1[i].time[3]}
-					t3.timer = {t1[i].time[1], t1[i].time[2], t1[i].time[3]}
-					if t2 == 'visible' or t2 == 'enable' or t2 == 'anim' or t2 == 'gamemode' then
-						t3.value = t1[i].value
-					elseif t2 == 'sinx' or t2 == 'siny' then
-						t3.value = {t1[i].value[1], t1[i].value[2], t1[i].value[3]}
-					elseif t2 == 'velset' or t2 == 'veladd' or t2 == 'posset' or t2 == 'posadd' then
-						if t1[i].x ~= nil then
-							t3.x = t1[i].x
-						end
-						if t1[i].y ~= nil then
-							t3.y = t1[i].y
-						end
-					end
-				end
-			end
-		end
-	end
-	return t
-end
-
---draw background layers
-function main.f_drawBG(data, info, layerno, timer, localcoord)
-	timer = timer or 0
-	--loop through all backgrounds
-	for i = 1, #data do
-		--skip if layerno is not matched
-		if info[i].layerno == layerno then
-			local x = 0
-			local y = 0
-			--loop through controllers
-			for k, v in pairs(info[i].ctrl) do
-				for j = 1, #info[i].ctrl[k] do
-					local t = info[i].ctrl[k][j]
-					--reset internal timer
-					if t.time[3] ~= -1 and timer >= t.timer[3] then
-						t.timer[1] = timer + t.time[1]
-						t.timer[2] = timer + t.time[2]
-						t.timer[3] = timer + t.time[3]
-					end
-					--check if time condition allows controller to run
-					if timer >= t.timer[1] and timer <= t.timer[2] then
-						x = 0
-						y = 0
-						if k == 'gamemode' then --Ikemen feature
-							for m = 1, #t.enabled do
-								info[i].ctrl_flags.enabled = 0
-								if t.enabled[m] == main.gameMode then
-									info[i].ctrl_flags.enabled = 1
-									m = #t.enabled
-								end
-							end
-						elseif k == 'visible' then
-							info[i].ctrl_flags.visible = t.value
-						elseif k == 'enable' then
-							info[i].ctrl_flags.enabled = t.value
-						elseif k == 'velset' or k == 'posset' then
-							if t.x ~= nil then
-								info[i].ctrl_flags.velx = 0 - info[i].velocity[1] + t.x * 320/localcoord[1]
-							end
-							if t.y ~= nil then
-								info[i].ctrl_flags.vely = 0 - info[i].velocity[2] + t.y * 240/localcoord[2]
-							end
-						elseif k == 'veladd'  then --or k == 'posadd' then
-							if t.x ~= nil then
-								info[i].ctrl_flags.velx = info[i].ctrl_flags.velx + t.x * 320/localcoord[1]
-							end
-							if t.y ~= nil then
-								info[i].ctrl_flags.vely = info[i].ctrl_flags.vely + t.y * 240/localcoord[2]
-							end
-						elseif k == 'posadd' then
-							if t.x ~= nil then x = t.x * 320/localcoord[1] end
-							if t.y ~= nil then y = t.y * 240/localcoord[2] end
-							animAddPos(data[i], x, y)
-						--[[elseif k == 'posset' then
-							if t.x ~= nil then
-								x = t.x * 320/localcoord[1]
-							else
-								x = info[i].start[1]
-							end
-							if t.y ~= nil then
-								y = t.y * 240/localcoord[2]
-							else
-								y = info[i].start[2]
-							end
-							animSetPos(data[i], x, y)
-							animAddPos(data[i], 160, 0) --for some reason needed in ikemen
-						elseif k == 'posadd' then
-							if t.x ~= nil then x = t.x * 320/localcoord[1] end
-							if t.y ~= nil then y = t.y * 240/localcoord[2] end
-							animAddPos(data[i], x, y)]]
-						--elseif k == 'anim' then --not supported yet
-						--elseif k == 'sinx' then --not supported yet
-						--elseif k == 'siny' then --not supported yet
-						end
-					end
-				end
-			end
-			--animation
-			if info[i].ctrl_flags.enabled == 1 then
-				x = (info[i].ctrl_flags.velx + info[i].velocity[1]) * info[i].delta[1]
-				y = (info[i].ctrl_flags.vely + info[i].velocity[2]) * info[i].delta[2]
-				info[i].ctrl_flags.x = info[i].ctrl_flags.x + x
-				info[i].ctrl_flags.y = info[i].ctrl_flags.y + y
-				animAddPos(data[i], x, y)
-				animUpdate(data[i])
-				if info[i].ctrl_flags.visible == 1 then
-					animDraw(data[i])
-				end
-			end
-		end
-	end
-end
-
---reset screenpack data
-function main.f_resetBG(info, bgdef, bgm, bgmLoop, bgmVolume, bgmloopstart, bgmloopend)
-	bgm = bgm or nil
-	animReset(info.fadein_data)
-	animUpdate(info.fadein_data)
-	animReset(info.fadeout_data)
-	animUpdate(info.fadeout_data)
-	bgdef.timer = 0
-	for i = 1, #bgdef.bg do
-		bgdef.bg[i].ctrl_flags.visible = 1
-		bgdef.bg[i].ctrl_flags.enabled = 1
-		bgdef.bg[i].ctrl_flags.velx = 0
-		bgdef.bg[i].ctrl_flags.vely = 0
-		animReset(bgdef.bg_data[i])
-		animAddPos(bgdef.bg_data[i], 0 - bgdef.bg[i].ctrl_flags.x, 0 - bgdef.bg[i].ctrl_flags.y)
-		animUpdate(bgdef.bg_data[i])
-		bgdef.bg[i].ctrl_flags.x = 0
-		bgdef.bg[i].ctrl_flags.y = 0
-		for k, v in pairs(bgdef.bg[i].ctrl) do
-			for j = 1, #bgdef.bg[i].ctrl[k] do
-				bgdef.bg[i].ctrl[k][j].timer[1] = bgdef.bg[i].ctrl[k][j].time[1]
-				bgdef.bg[i].ctrl[k][j].timer[2] = bgdef.bg[i].ctrl[k][j].time[2]
-				bgdef.bg[i].ctrl[k][j].timer[3] = bgdef.bg[i].ctrl[k][j].time[3]
-			end
-		end
-	end
-	if bgm ~= nil then
-		playBGM(bgm, true, bgmLoop, bgmVolume, bgmloopstart or "0", bgmloopend or "0")
-	end
-end
-
 --return table with reversed keys
 function main.f_reversedTable(t)
 	local reversedTable = {}
@@ -738,38 +508,60 @@ function main.f_reversedTable(t)
 	return reversedTable
 end
 
---return table without rows disabled in screenpack
-function main.f_cleanTable(t)
+--return table with proper order and without rows disabled in screenpack
+function main.f_cleanTable(t, t_sort)
 	local t_clean = {}
+	local t_added = {}
+	--first we add all entries existing in screenpack file in correct order
+	for i = 1, #t_sort do
+		for j = 1, #t do
+			if t_sort[i] == t[j].itemname and t[j].displayname ~= '' then
+				table.insert(t_clean, t[j])
+				t_added[t[j].itemname] = 1
+				break
+			end
+		end
+	end
+	--then we add remaining default entries if not existing yet and not disabled (by default or via screenpack)
 	for i = 1, #t do
-		if t[i].displayname ~= '' then
-			t_clean[#t_clean + 1] = t[i]
+		if t_added[t[i].itemname] == nil and t[i].displayname ~= '' then
+			table.insert(t_clean, t[i])
 		end
 	end
 	return t_clean
 end
 
+--odd value rounding
+function main.f_oddRounding(v)
+	if v % 2 ~= 0 then
+		return 1
+	else
+		return 0
+	end
+end
+
 --warning display
 local txt_warning = textImgNew()
-function main.f_warning(t, info, background, font_info, title, box)
+function main.f_warning(t, info, background, font_info, title, coords, col, alpha)
 	font_info = font_info or motif.warning_info
 	title = title or main.txt_warningTitle
-	box = box or main.warningBox
+	coords = coords or motif.warning_info.boxbg_coords
+	col = col or motif.warning_info.boxbg_col
+	alpha = alpha or motif.warning_info.boxbg_alpha
 	main.f_cmdInput()
-	box = box or false
 	while true do
 		if main.f_btnPalNo(main.p1Cmd) > 0 or esc() then
 			sndPlay(motif.files.snd_data, info.cursor_move_snd[1], info.cursor_move_snd[2])
 			break
 		end
 		--draw clearcolor
-		animDraw(background.bgclearcolor_data)
+		clearColor(background.bgclearcolor[1], background.bgclearcolor[2], background.bgclearcolor[3])
 		--draw layerno = 0 backgrounds
-		main.f_drawBG(background.bg_data, background.bg, 0, background.timer, {320,240})
+		bgDraw(background.bg, false)
 		--draw layerno = 1 backgrounds
-		main.f_drawBG(background.bg_data, background.bg, 1, background.timer, {320,240})
+		bgDraw(background.bg, true)
 		--draw menu box
-		animDraw(box)
+		fillRect(coords[1], coords[2], coords[3] - coords[1] + 1, coords[4] - coords[2] + 1, col[1], col[2], col[3], alpha[1], alpha[2])
 		--draw title
 		textImgDraw(title)
 		--draw text
@@ -786,12 +578,12 @@ function main.f_warning(t, info, background, font_info, title, box)
 				font_info.text_font_scale[2],
 				font_info.text_font[4],
 				font_info.text_font[5],
-				font_info.text_font[6]
+				font_info.text_font[6],
+				font_info.text_font[7],
+				font_info.text_font[8]
 			)
 			textImgDraw(txt_warning)
 		end
-		--update timer
-		background.timer = background.timer + 1
 		--end loop
 		main.f_cmdInput()
 		refresh()
@@ -800,25 +592,47 @@ end
 
 --input display
 local txt_input = textImgNew()
-function main.f_input(t, info, background, type)
+function main.f_input(t, info, background, category, controllerNo, keyBreak)
 	main.f_cmdInput()
-	type = type or 'string'
-	if type == 'string' then
-		t[#t + 1] = ''
+	category = category or 'string'
+	controllerNo = controllerNo or 0
+	keyBreak = keyBreak or ''
+	if category == 'string' then
+		table.insert(t, '')
 	end
 	local input = ''
+	local btnReleased = 0
 	resetKey()
 	while true do
 		if esc() then
 			input = ''
 			break
 		end
-		if type == 'key' then
+		if category == 'keyboard' then
 			input = getKey()
 			if input ~= '' then
 				main.f_cmdInput()
 				break
 			end
+		elseif category == 'gamepad' then
+			if getJoystickPresent(controllerNo) == false then
+				break
+			end
+			if getKey() == keyBreak then
+				input = keyBreak
+				break
+			end
+			local tmp = getKey()
+			if tonumber(tmp) == nil then --button released
+				if btnReleased == 0 then
+					btnReleased = 1
+				elseif btnReleased == 2 then
+					break
+				end
+			elseif btnReleased == 1 then --button pressed after releasing button once
+				input = tmp
+				btnReleased = 2
+			end
 		else --string
 			if getKey() == 'RETURN' then
 				main.f_cmdInput()
@@ -832,33 +646,43 @@ function main.f_input(t, info, background, type)
 			resetKey()
 		end
 		--draw clearcolor
-		animDraw(background.bgclearcolor_data)
+		clearColor(background.bgclearcolor[1], background.bgclearcolor[2], background.bgclearcolor[3])
 		--draw layerno = 0 backgrounds
-		main.f_drawBG(background.bg_data, background.bg, 0, background.timer, {320,240})
+		bgDraw(background.bg, false)
 		--draw layerno = 1 backgrounds
-		main.f_drawBG(background.bg_data, background.bg, 1, background.timer, {320,240})
+		bgDraw(background.bg, true)
 		--draw menu box
-		animDraw(main.warningBox)
+		fillRect(
+			motif.infobox.boxbg_coords[1],
+			motif.infobox.boxbg_coords[2],
+			motif.infobox.boxbg_coords[3] - motif.infobox.boxbg_coords[1] + 1,
+			motif.infobox.boxbg_coords[4] - motif.infobox.boxbg_coords[2] + 1,
+			motif.infobox.boxbg_col[1],
+			motif.infobox.boxbg_col[2],
+			motif.infobox.boxbg_col[3],
+			motif.infobox.boxbg_alpha[1],
+			motif.infobox.boxbg_alpha[2]
+		)
 		--draw text
 		for i = 1, #t do
 			main.f_updateTextImg(
 				txt_input,
-				motif.font_data[motif.warning_info.text_font[1]],
-				motif.warning_info.text_font[2],
-				motif.warning_info.text_font[3],
+				motif.font_data[motif.infobox.text_font[1]],
+				motif.infobox.text_font[2],
+				motif.infobox.text_font[3],
 				t[i],
-				motif.warning_info.text_pos[1],
-				motif.warning_info.text_pos[2] - motif.warning_info.text_spacing[2] + i * motif.warning_info.text_spacing[2],
-				motif.warning_info.text_font_scale[1],
-				motif.warning_info.text_font_scale[2],
-				motif.warning_info.text_font[4],
-				motif.warning_info.text_font[5],
-				motif.warning_info.text_font[6]
+				motif.infobox.text_pos[1],
+				motif.infobox.text_pos[2] - motif.infobox.text_spacing[2] + i * motif.infobox.text_spacing[2],
+				motif.infobox.text_font_scale[1],
+				motif.infobox.text_font_scale[2],
+				motif.infobox.text_font[4],
+				motif.infobox.text_font[5],
+				motif.infobox.text_font[6],
+				motif.infobox.text_font[7],
+				motif.infobox.text_font[8]
 			)
 			textImgDraw(txt_input)
 		end
-		--update timer
-		background.timer = background.timer + 1
 		--end loop
 		main.f_cmdInput()
 		refresh()
@@ -866,6 +690,7 @@ function main.f_input(t, info, background, type)
 	return input
 end
 
+--refresh screen every 0.02 during initial loading
 main.nextRefresh = os.clock() + 0.02
 function main.loadingRefresh(txt)
 	if os.clock() >= main.nextRefresh then
@@ -878,21 +703,33 @@ function main.loadingRefresh(txt)
 end
 
 --;===========================================================
+--; LOCALCOORD
+--;===========================================================
+require('script.screenpack')
+main.IntLocalcoordValues()
+main.CalculateLocalcoordValues()
+main.IntLifebarScale()
+main.SetScaleValues()
+
+--;===========================================================
 --; COMMAND LINE QUICK VS
 --;===========================================================
 main.flags = getCommandLineFlags()
 if main.flags['-p1'] ~= nil and main.flags['-p2'] ~= nil then
 	--load lifebar
-	local sp = config.Motif
+	local def = config.Motif
 	if main.flags['-r'] ~= nil then
-		if main.f_fileExists(main.flags['-r']) then
-			sp = main.flags['-r']
+		local case = main.flags['-r']:lower()
+		if case:match('^data[/\\]') and main.f_fileExists(main.flags['-r']) then
+			def = main.flags['-r']
+		elseif case:match('%.def$') and main.f_fileExists('data/' .. main.flags['-r']) then
+			def = 'data/' .. main.flags['-r']
 		elseif main.f_fileExists('data/' .. main.flags['-r'] .. '/system.def') then
-			sp = 'data/' .. main.flags['-r'] .. '/system.def'
+			def = 'data/' .. main.flags['-r'] .. '/system.def'
 		end
 	end
-	local fileDir = sp:match('^(.-)[^/\\]+$')
-	local file = io.open(sp,"r")
+	local fileDir = def:match('^(.-)[^/\\]+$')
+	local file = io.open(def,"r")
 	local s = file:read("*all")
 	file:close()
 	local lifebar = s:match('fight%s*=%s*(.-%.def)%s*')
@@ -906,6 +743,16 @@ if main.flags['-p1'] ~= nil and main.flags['-p2'] ~= nil then
 		loadLifebar('data/fight.def')
 	end
 	refresh()
+	--set settings
+	setAutoguard(1, config.AutoGuard)
+	setAutoguard(2, config.AutoGuard)
+	setPowerShare(1, config.TeamPowerShare)
+	setPowerShare(2, config.TeamPowerShare)
+	setLifeShare(config.TeamLifeShare)
+	setRoundTime(math.max(-1, config.RoundTime * getFramesPerCount()))
+	setLifeMul(config.LifeMul / 100)
+	setTeam1VS2Life(config.Team1VS2Life / 100)
+	setTurnsRecoveryRate(config.TurnsRecoveryBase / 100, config.TurnsRecoveryBonus / 100)
 	--add chars
 	local p1NumChars = 0
 	local p2NumChars = 0
@@ -923,14 +770,36 @@ if main.flags['-p1'] ~= nil and main.flags['-p2'] ~= nil then
 			end
 			local pal = 1
 			if main.flags['-p' .. num .. '.pal'] ~= nil then
-				pal = main.flags['-p' .. num .. '.pal']
+				pal = tonumber(main.flags['-p' .. num .. '.pal'])
 			end
 			local ai = 0
 			if main.flags['-p' .. num .. '.ai'] ~= nil then
-				ai = main.flags['-p' .. num .. '.ai']
+				ai = tonumber(main.flags['-p' .. num .. '.ai'])
+			end
+			table.insert(t, {character = v, player = player, num = num, pal = pal, ai = ai, overwrite = {}})
+			if main.flags['-p' .. num .. '.power'] ~= nil then
+				t[#t].overwrite['power'] = tonumber(main.flags['-p' .. num .. '.power'])
+			end
+			if main.flags['-p' .. num .. '.life'] ~= nil then
+				t[#t].overwrite['life'] = tonumber(main.flags['-p' .. num .. '.life'])
+			end
+			if main.flags['-p' .. num .. '.lifeMax'] ~= nil then
+				t[#t].overwrite['lifeMax'] = tonumber(main.flags['-p' .. num .. '.lifeMax'])
+			end
+			if main.flags['-p' .. num .. '.lifeRatio'] ~= nil then
+				t[#t].overwrite['lifeRatio'] = tonumber(main.flags['-p' .. num .. '.lifeRatio'])
+			end
+			if main.flags['-p' .. num .. '.attackRatio'] ~= nil then
+				t[#t].overwrite['attackRatio'] = tonumber(main.flags['-p' .. num .. '.attackRatio'])
+			end
+			if main.flags['-p' .. num .. '.defenceRatio'] ~= nil then
+				t[#t].overwrite['defenceRatio'] = tonumber(main.flags['-p' .. num .. '.defenceRatio'])
 			end
-			t[#t + 1] = {player = player, num = num - 1, pal = tonumber(pal), ai = tonumber(ai)}
 			refresh()
+		elseif k:match('^-rounds$') then
+			setMatchWins(tonumber(v))
+		elseif k:match('^-draws$') then
+			setMatchMaxDrawGames(tonumber(v))
 		end
 	end
 	local p1TeamMode = 0
@@ -952,17 +821,20 @@ if main.flags['-p1'] ~= nil and main.flags['-p2'] ~= nil then
 	end
 	addStage(stage)
 	--load data
-	loadDebugFont('font/f-6x9.fnt')
+	loadDebugFont('f-6x9.fnt')
 	setDebugScript('script/debug.lua')
-	setMatchNo(1)
 	selectStart()
+	setMatchNo(1)
 	setStage(0)
 	selectStage(0)
 	setTeamMode(1, p1TeamMode, p1NumChars)
 	setTeamMode(2, p2TeamMode, p2NumChars)
-	for i = 1, #t do
-		selectChar(t[i].player, t[i].num, t[i].pal)
-		setCom(t[i].player, t[i].ai)
+	main.f_printTable(t, 'debug/t_quickvs.txt')
+	--iterate over the table in -p order ascending
+	for k, v in main.f_sortKeys(t, function(t, a, b) return t[b].num > t[a].num end) do
+		selectChar(v.player, k - 1, v.pal)
+		setCom(v.num, v.ai)
+		overwriteCharData(v.num, v.overwrite)
 	end
 	local winner, t_gameStats = game()
 	if main.flags['-log'] ~= nil then
@@ -975,31 +847,14 @@ end
 --;===========================================================
 --; LOAD DATA
 --;===========================================================
-main.fadeSff = sffNew('data/fade.sff')
-
 motif = require('script.motif')
 
+setMotifDir(motif.fileDir)
 setPortrait(motif.select_info.p1_face_spr[1], motif.select_info.p1_face_spr[2], 1) --Big portrait
 setPortrait(motif.select_info.portrait_spr[1], motif.select_info.portrait_spr[2], 2) --Small portrait
 setPortrait(motif.vs_screen.p1_spr[1], motif.vs_screen.p1_spr[2], 3) --Versus portrait
 setPortrait(motif.victory_screen.p1_spr[1], motif.victory_screen.p1_spr[2], 4) --Victory portrait
-
-main.cursorBox = animNew(main.fadeSff, '0,1, 0,0, -1')
-animSetTile(main.cursorBox, 1, 1)
-animUpdate(main.cursorBox)
-
-main.warningBox = animNew(main.fadeSff, '0,0, 0,0, -1')
-animSetTile(main.warningBox, 1, 1)
-animSetAlpha(main.warningBox, motif.warning_info.background_alpha[1], motif.warning_info.background_alpha[2])
-animSetWindow(main.warningBox, 0, 0, motif.info.localcoord[1], motif.info.localcoord[2])
-animUpdate(main.warningBox)
-
-main.infoBox = animNew(main.fadeSff, '0,0, 0,0, -1')
-animSetTile(main.infoBox, 1, 1)
-animSetAlpha(main.infoBox, motif.infobox.background_alpha[1], motif.infobox.background_alpha[2])
-animSetWindow(main.infoBox, 0, 0, motif.info.localcoord[1], motif.info.localcoord[2])
-animUpdate(main.infoBox)
-
+setPortrait(motif.select_info.stage_portrait_spr[1], motif.select_info.stage_portrait_spr[2], 5) --Stage portrait
 
 main.txt_warningTitle = main.f_createTextImg(
 	motif.font_data[motif.warning_info.title_font[1]],
@@ -1012,25 +867,11 @@ main.txt_warningTitle = main.f_createTextImg(
 	motif.warning_info.title_font_scale[2],
 	motif.warning_info.title_font[4],
 	motif.warning_info.title_font[5],
-	motif.warning_info.title_font[6]
+	motif.warning_info.title_font[6],
+	motif.warning_info.title_font[7],
+	motif.warning_info.title_font[8]
 )
 
-main.SetDefaultScale()
-
-local footerBox = animNew(main.fadeSff, '0,2, 0,0, -1')
-animSetTile(footerBox, 1, 1)
-animSetWindow(
-	footerBox,
-	motif.title_info.footer_boxbackground_coords[1],
-	motif.title_info.footer_boxbackground_coords[2],
-	motif.title_info.footer_boxbackground_coords[3] - motif.title_info.footer_boxbackground_coords[1] + 1,
-	motif.title_info.footer_boxbackground_coords[4] - motif.title_info.footer_boxbackground_coords[2] + 1
-)
-animSetAlpha(footerBox, motif.title_info.footer_boxbackground_alpha[1], motif.title_info.footer_boxbackground_alpha[2])
-animUpdate(footerBox)
-
-main.SetScaleValues()
-
 --add characters and stages using select.def instead of select.lua
 local txt_loading = main.f_createTextImg(
 	motif.font_data[motif.title_info.loading_font[1]],
@@ -1043,101 +884,175 @@ local txt_loading = main.f_createTextImg(
 	motif.title_info.loading_font_scale[2],
 	motif.title_info.loading_font[4],
 	motif.title_info.loading_font[5],
-	motif.title_info.loading_font[6]
+	motif.title_info.loading_font[6],
+	motif.title_info.loading_font[7],
+	motif.title_info.loading_font[8]
 )
 textImgDraw(txt_loading)
 refresh()
 
-function main.f_addChar(line, row)
+function main.f_charParam(t, c)
+	if c:match('music[al]?[li]?[tf]?[e]?%s*=') then --music / musicalt / musiclife
+		local bgmvolume, bgmloopstart, bgmloopend = 100, 0, 0
+		c = c:gsub('%s+([0-9%s]+)$', function(m1)
+			for i, c in ipairs(main.f_strsplit('%s+', m1)) do --split using whitespace delimiter
+				if i == 1 then
+					bgmvolume = tonumber(c)
+				elseif i == 2 then
+					bgmloopstart = tonumber(c)
+				elseif i == 3 then
+					bgmloopend = tonumber(c)
+				else
+					break
+				end
+			end
+			return ''
+		end)
+		c = c:gsub('\\', '/')
+		local bgtype, bgmusic = c:match('^(music[al]?[li]?[tf]?[e]?)%s*=%s*(.-)%s*$')
+		if t[bgtype] == nil then t[bgtype] = {} end
+		table.insert(t[bgtype], {bgmusic = bgmusic, bgmvolume = bgmvolume, bgmloopstart = bgmloopstart, bgmloopend = bgmloopend})
+	elseif c:match('lifebar%s*=') then --lifebar
+		if t.lifebar == nil then
+			t.lifebar = c:match('=%s*(.-)%s*$')
+		end
+	elseif c:match('[0-9]+%s*=%s*[^%s]') then --num = string (unused)
+		local var1, var2 = c:match('([0-9]+)%s*=%s*(.+)%s*$')
+		t[tonumber(var1)] = var2
+	elseif c:match('%.[Dd][Ee][Ff]') or c:match('^random$') then --stage
+		c = c:gsub('\\', '/')
+		if t.stage == nil then
+			t.stage = {}
+		end
+		table.insert(t.stage, c)
+	else --param = value
+		local param, value = c:match('^(.-)%s*=%s*(.-)$')
+		if param ~= nil and value ~= nil and param ~= '' and value ~= '' then
+			t[param] = tonumber(value)
+			if t[param] == nil then
+				t[param] = value
+			end
+		end
+	end
+end
+
+function main.f_addChar(line, row, playable)
 	local tmp = ''
-	local order = false
-	local hidden = 0
-	for i, c in ipairs(main.f_strsplit(',', line)) do
+	main.t_selChars[row] = {}
+	--parse 'rivals' param and get rid of it if exists
+	for num, str in line:gmatch('([0-9]+)%s*=%s*{([^%}]-)}') do
+		num = tonumber(num)
+		if main.t_selChars[row].rivals == nil then
+			main.t_selChars[row].rivals = {}
+		end
+		for i, c in ipairs(main.f_strsplit(',', str)) do --split using "," delimiter
+			c = c:match('^%s*(.-)%s*$')
+			if i == 1 then
+				c = c:gsub('\\', '/')
+				c = tostring(c)
+				main.t_selChars[row].rivals[num] = {char = c}
+			else
+				main.f_charParam(main.t_selChars[row].rivals[num], c)
+			end
+		end
+		line = line:gsub(',%s*' .. num .. '%s*=%s*{([^%}]-)}', '')
+	end
+	--parse rest of the line
+	for i, c in ipairs(main.f_strsplit(',', line)) do --split using "," delimiter
 		c = c:match('^%s*(.-)%s*$')
 		if i == 1 then
 			c = c:gsub('\\', '/')
 			c = tostring(c)
-			main.t_selChars[row] = {}
 			addChar(c)
-			tmp = getCharName(row - 1):match('^["%s]*(.-)["%s]*$') --needed for s-size ikemen
+			tmp = getCharName(row - 1)
 			if tmp == '' then
+				playable = false
 				break
 			end
-			main.t_charDef[c] = row - 1
+			main.t_charDef[c:lower()] = row - 1
 			main.t_selChars[row].char = c
-			if tmp ~= 'Random' then
-				main.t_selChars[row].displayname = tmp
-				main.t_selChars[row].def = getCharFileName(row - 1)
-				main.t_selChars[row].dir = main.t_selChars[row].def:gsub('[^/]+%.def$', '')
-				main.t_selChars[row].pal = getCharPalettes(row - 1)
-				if tmp ~= 'Training' then
-					tmp = getCharIntro(row - 1)
-					if tmp ~= '' then
-						main.t_selChars[row].intro = main.t_selChars[row].dir .. tmp:gsub('\\', '/')
-					end
-					tmp = getCharEnding(row - 1)
-					if tmp ~= '' then
-						main.t_selChars[row].ending = main.t_selChars[row].dir .. tmp:gsub('\\', '/')
-					end
-					main.t_selChars[row].order = 1
-					order = true
-				end
-			else
+			if tmp == 'Random' then
+				playable = false
 				break
 			end
-		elseif c:match('music%s*=%s*') then
-			c = c:gsub('\\', '/')
-			local bgmvolume = c:match('%s([0-9]+)$')
-			if bgmvolume == nil then
-				bgmvolume = 100
-			else
-				bgmvolume = tonumber(bgmvolume)
-				c = c:gsub('%s*[0-9]+$','')
-			end
-			local bgmusic = c:match('^music%s*=%s*(.-)%s*$')
-			if main.t_selChars[row].music == nil then
-				main.t_selChars[row].music = {}
-			end
-			main.t_selChars[row].music[#main.t_selChars[row].music + 1] = {}
-			main.t_selChars[row].music[#main.t_selChars[row].music].bgmusic = bgmusic
-			main.t_selChars[row].music[#main.t_selChars[row].music].bgmvolume = bgmvolume
-		elseif c:match('[0-9]+%s*=%s*[^%s]') then
-			local var1, var2 = c:match('([0-9]+)%s*=%s*(.+)%s*$')
-			main.t_selChars[row][tonumber(var1)] = var2:lower()
-		elseif c:match('%.def') or c:match('^random$') then
-			c = c:gsub('\\', '/')
-			if main.t_selChars[row].stage == nil then
-				main.t_selChars[row].stage = {}
+			main.t_selChars[row].playable = playable
+			main.t_selChars[row].displayname = tmp
+			main.t_selChars[row].def = getCharFileName(row - 1)
+			main.t_selChars[row].dir = main.t_selChars[row].def:gsub('[^/]+%.def$', '')
+			main.t_selChars[row].pal, main.t_selChars[row].pal_defaults, main.t_selChars[row].pal_keymap = getCharPalettes(row - 1)
+			if playable then
+				tmp = getCharIntro(row - 1)
+				if tmp ~= '' then
+					main.t_selChars[row].intro = main.t_selChars[row].dir .. tmp:gsub('\\', '/')
+				end
+				tmp = getCharEnding(row - 1)
+				if tmp ~= '' then
+					main.t_selChars[row].ending = main.t_selChars[row].dir .. tmp:gsub('\\', '/')
+				end
+				main.t_selChars[row].order = 1
 			end
-			main.t_selChars[row].stage[#main.t_selChars[row].stage + 1] = c
 		else
-			local param, value = c:match('^(.-)%s*=%s*(.-)$')
-			if param ~= '' and value ~= '' and param ~= nil and value ~= nil then
-				main.t_selChars[row][param] = tonumber(value)
-			end
+			main.f_charParam(main.t_selChars[row], c)
 		end
 	end
 	if main.t_selChars[row].hidden == nil then
-		main.t_selChars[row].hidden = hidden
-	end
-	if main.t_selChars[row].exclude == nil then
-		main.t_selChars[row].exclude = 0
+		main.t_selChars[row].hidden = 0
 	end
-	if order then
+	if playable then
+		--order param
 		if main.t_orderChars[main.t_selChars[row].order] == nil then
 			main.t_orderChars[main.t_selChars[row].order] = {}
 		end
-		main.t_orderChars[main.t_selChars[row].order][#main.t_orderChars[main.t_selChars[row].order] + 1] = row - 1
+		table.insert(main.t_orderChars[main.t_selChars[row].order], row - 1)
+		--ordersurvival param
+		local num = 1
+		if main.t_selChars[row].ordersurvival ~= nil then
+			num = main.t_selChars[row].ordersurvival
+		end
+		if main.t_orderSurvival[num] == nil then
+			main.t_orderSurvival[num] = {}
+		end
+		table.insert(main.t_orderSurvival[num], row - 1)
 	end
 	main.loadingRefresh(txt_loading)
 end
 
---start_time = os.time()
-main.t_includeStage = {}
+function main.f_addStage(file)
+	file = file:gsub('\\', '/')
+	--if not main.f_fileExists(file) or file:match('^stages/$') then
+	--	return #main.t_selStages
+	--end
+	addStage(file)
+	local stageNo = #main.t_selStages + 1
+	local tmp = getStageName(stageNo)
+	--if tmp == '' then
+	--	return stageNo
+	--end
+	main.t_stageDef[file:lower()] = stageNo
+	main.t_selStages[stageNo] = {name = tmp, stage = file}
+	local _, _, t_bgmusic = getStageInfo(stageNo)
+	for k = 1, #t_bgmusic do
+		if t_bgmusic[k].bgmusic ~= '' then
+			if k == 1 then
+				tmp = 'music'
+			elseif k == 2 then
+				tmp = 'musicalt'
+			else
+				tmp = 'musiclife'
+			end
+			main.t_selStages[stageNo][tmp] = {[1] = {bgmusic = t_bgmusic[k].bgmusic:gsub('\\', '/'), bgmvolume = t_bgmusic[k].bgmvolume, bgmloopstart = t_bgmusic[k].bgmloopstart, bgmloopend = t_bgmusic[k].bgmloopend}}
+		end
+	end
+	return stageNo
+end
+
+main.t_includeStage = {{}, {}} --includestage = 1, includestage = -1
 main.t_orderChars = {}
+main.t_orderStages = {}
+main.t_orderSurvival = {}
 main.t_stageDef = {['random'] = 0}
 main.t_charDef = {}
-local t_exlude = {}
+local t_addExluded = {}
 local chars = 0
 local stages = 0
 local tmp = ''
@@ -1149,20 +1064,20 @@ file:close()
 content = content:gsub('([^\r\n;]*)%s*;[^\r\n]*', '%1')
 content = content:gsub('\n%s*\n', '\n')
 for line in content:gmatch('[^\r\n]+') do
+--for line in io.lines("data/select.def") do
 	if chars + stages == 100 then
 		SetGCPercent(100)
 	end
---for line in io.lines("data/select.def") do
-	line = line:lower()
-	if line:match('^%s*%[%s*characters%s*%]') then
+	local lineCase = line:lower()
+	if lineCase:match('^%s*%[%s*characters%s*%]') then
 		main.t_selChars = {}
 		row = 0
 		section = 1
-	elseif line:match('^%s*%[%s*extrastages%s*%]') then
+	elseif lineCase:match('^%s*%[%s*extrastages%s*%]') then
 		main.t_selStages = {}
 		row = 0
 		section = 2
-	elseif line:match('^%s*%[%s*options%s*%]') then
+	elseif lineCase:match('^%s*%[%s*options%s*%]') then
 		main.t_selOptions = {
 			arcadestart = {wins = 0, offset = 0},
 			arcadeend = {wins = 0, offset = 0},
@@ -1174,73 +1089,71 @@ for line in content:gmatch('[^\r\n]+') do
 		row = 0
 		section = 3
 	elseif section == 1 then --[Characters]
-		if line:match(',%s*exclude%s*=%s*1') then --character should be added after all slots are filled
-			t_exlude[#t_exlude + 1] = line
+		if lineCase:match(',%s*exclude%s*=%s*1') then --character should be added after all slots are filled
+			table.insert(t_addExluded, line)
 		else
 			chars = chars + 1
-			main.f_addChar(line, chars)
+			main.f_addChar(line, chars, true)
 		end
 	elseif section == 2 then --[ExtraStages]
-		row = #main.t_selStages + 1
-		for i, c in ipairs(main.f_strsplit(',', line)) do
+		for i, c in ipairs(main.f_strsplit(',', line)) do --split using "," delimiter
 			c = c:gsub('^%s*(.-)%s*$', '%1')
 			if i == 1 then
+				row = main.f_addStage(c)
+				table.insert(main.t_includeStage[1], row)
+				table.insert(main.t_includeStage[2], row)
+			elseif c:match('music[al]?[li]?[tf]?[e]?%s*=') then
+				local bgmvolume, bgmloopstart, bgmloopend = 100, 0, 0
+				c = c:gsub('%s+([0-9%s]+)$', function(m1)
+					for i, c in ipairs(main.f_strsplit('%s+', m1)) do --split using whitespace delimiter
+						if i == 1 then
+							bgmvolume = tonumber(c)
+						elseif i == 2 then
+							bgmloopstart = tonumber(c)
+						elseif i == 3 then
+							bgmloopend = tonumber(c)
+						else
+							break
+						end
+					end
+					return ''
+				end)
 				c = c:gsub('\\', '/')
-				if not main.f_fileExists(c) or c:match('^stages/$') then
-					break
-				end
-				addStage(c)
-				tmp = getStageName(row):match('^["%s]*(.-)["%s]*$') --needed for s-size ikemen
-				if tmp == '' then
-					break
-				end
-				main.t_selStages[row] = {name = tmp, stage = c}
-				local zoomout, zoomin, bgmusic, bgmvolume, bgmloopstart, bgmloopend  = getStageInfo(row)
-				if zoomout ~= '' then
-					main.t_selStages[row].zoommin = tonumber(zoomout)
-				end
-				if zoomin ~= '' then
-					main.t_selStages[row].zoommax = tonumber(zoomin)
-				end
-				if bgmusic ~= '' then
-					bgmusic = bgmusic:gsub('\\', '/')
-					main.t_selStages[row].music = {[1] = {bgmusic = bgmusic, bgmvolume = tonumber(bgmvolume), bgmloopstart = bgmloopstart, bgmloopend = bgmloopend}}
-				end
-				main.t_includeStage[#main.t_includeStage + 1] = row
-				main.t_stageDef[c] = row
-			elseif c:match('music%s*=%s*') then
-				c = c:gsub('\\', '/')
-				local bgmvolume = c:match('%s([0-9]+)$')
-				if bgmvolume == nil then
-					bgmvolume = 100
-				else
-					bgmvolume = tonumber(bgmvolume)
-					c = c:gsub('%s*[0-9]+$','')
-				end
-				local bgmusic = c:match('^music%s*=%s*(.-)%s*$')
-				if main.t_selStages[row].music == nil then
-					main.t_selStages[row].music = {}
-				end
-				main.t_selStages[row].music[#main.t_selStages[row].music+1] = {bgmusic = bgmusic, bgmvolume = bgmvolume}
+				local bgtype, bgmusic = c:match('^(music[al]?[li]?[tf]?[e]?)%s*=%s*(.-)%s*$')
+				if main.t_selStages[row][bgtype] == nil then main.t_selStages[row][bgtype] = {} end
+				table.insert(main.t_selStages[row][bgtype], {bgmusic = bgmusic, bgmvolume = bgmvolume, bgmloopstart = bgmloopstart, bgmloopend = bgmloopend})
 			else
 				local param, value = c:match('^(.-)%s*=%s*(.-)$')
-				main.t_selStages[row][param] = tonumber(value)
+				if param ~= nil and value ~= nil and param ~= '' and value ~= '' then
+					main.t_selStages[row][param] = tonumber(value)
+					if param:match('order') then
+						if main.t_orderStages[main.t_selStages[row].order] == nil then
+							main.t_orderStages[main.t_selStages[row].order] = {}
+						end
+						table.insert(main.t_orderStages[main.t_selStages[row].order], row)
+					end
+				end
 			end
 		end
 	elseif section == 3 then --[Options]
-		if line:match('^%s*.-%.maxmatches%s*=%s*') then
-			local rowName, line = line:match('^%s*(.-)%.maxmatches%s*=%s*(.+)')
+		if lineCase:match('%.maxmatches%s*=') then
+			local rowName, line = lineCase:match('^%s*(.-)%.maxmatches%s*=%s*(.+)')
+			rowName = rowName:gsub('%.', '_')
 			main.t_selOptions[rowName .. 'maxmatches'] = {}
-			for i, c in ipairs(main.f_strsplit(',', line:gsub('%s*(.-)%s*', '%1'))) do
+			for i, c in ipairs(main.f_strsplit(',', line:gsub('%s*(.-)%s*', '%1'))) do --split using "," delimiter
 				main.t_selOptions[rowName .. 'maxmatches'][i] = tonumber(c)
 			end
-		elseif line:match('^%s*.-%.airamp%..-%s*=%s*') then
-			local rowName, rowName2, wins, offset = line:match('^%s*(.-)%.airamp%.(.-)%s*=%s*([0-9]+)%s*,%s*([0-9-]+)')
+		elseif lineCase:match('%.airamp%.') then
+			local rowName, rowName2, wins, offset = lineCase:match('^%s*(.-)%.airamp%.(.-)%s*=%s*([0-9]+)%s*,%s*([0-9-]+)')
 			main.t_selOptions[rowName .. rowName2] = {wins = tonumber(wins), offset = tonumber(offset)}
 		end
 	end
 end
---main.f_printVar(os.difftime(os.time(), start_time))
+
+--add default maxmatches values if config is missing in select.def
+if main.t_selOptions.arcademaxmatches == nil then main.t_selOptions.arcademaxmatches = {6, 1, 1, 0, 0, 0, 0, 0, 0, 0} end
+if main.t_selOptions.teammaxmatches == nil then main.t_selOptions.teammaxmatches = {4, 1, 1, 0, 0, 0, 0, 0, 0, 0} end
+if main.t_selOptions.survivalmaxmatches == nil then main.t_selOptions.survivalmaxmatches = {-1, 0, 0, 0, 0, 0, 0, 0, 0, 0} end
 
 --add excluded characters once all slots are filled
 for i = chars, (motif.select_info.rows + motif.select_info.rows_scrolling) * motif.select_info.columns - 1 do
@@ -1248,14 +1161,15 @@ for i = chars, (motif.select_info.rows + motif.select_info.rows_scrolling) * mot
 	main.t_selChars[chars] = {}
 	addChar('dummyChar')
 end
-for i = 1, #t_exlude do
+for i = 1, #t_addExluded do
 	chars = chars + 1
-	main.f_addChar(t_exlude[i], chars)
+	main.f_addChar(t_addExluded[i], chars, true)
 end
+
 --add Training by stupa if not included in select.def
 if main.t_charDef.training == nil and main.f_fileExists('chars/training/training.def') then
 	chars = chars + 1
-	main.f_addChar('training, exclude = 1, order = 0', chars)
+	main.f_addChar('training, exclude = 1', chars, false)
 end
 
 --add remaining character parameters
@@ -1264,35 +1178,48 @@ main.t_bonusChars = {}
 main.t_randomChars = {}
 --for each character loaded
 for i = 1, #main.t_selChars do
-	if main.t_selChars[i].stage ~= nil then
-		for j = 1, #main.t_selChars[i].stage do
-			if main.t_stageDef[main.t_selChars[i].stage[j]] == nil and main.file_exists(main.t_selChars[i].stage[j]) then
-				row = #main.t_selStages + 1
-				addStage(main.t_selChars[i].stage[j])
-				tmp = getStageName(row):match('^["%s]*(.-)["%s]*$') --needed for s-size ikemen
-				if tmp == '' then
-					break
-				end
-				main.t_selStages[row] = {name = tmp, stage = main.t_selChars[i].stage[j]}
-				local zoomout, zoomin, bgmusic, bgmvolume, bgmloopstart, bgmloopend = getStageInfo(row)
-				if zoomout ~= '' then
-					main.t_selStages[row].zoommin = tonumber(zoomout)
-				end
-				if zoomin ~= '' then
-					main.t_selStages[row].zoommax = tonumber(zoomin)
+	--add char_ref entry
+	if main.t_selChars[i].char ~= nil then
+		main.t_selChars[i].char_ref = main.t_charDef[main.t_selChars[i].char:lower()]
+	end
+	--change character 'rivals' param char and stage string file paths to reference values
+	if main.t_selChars[i].rivals ~= nil then
+		for j = 1, #main.t_selChars[i].rivals do
+			--add 'rivals' param character if needed or reference existing one
+			if main.t_selChars[i].rivals[j].char ~= nil then
+				if main.t_charDef[main.t_selChars[i].rivals[j].char:lower()] == nil then --new char
+					chars = chars + 1
+					main.f_addChar(main.t_selChars[i].rivals[j].char .. ', exclude = 1', chars, false)
+					main.t_selChars[i].rivals[j].char_ref = chars
+				else --already added
+					main.t_selChars[i].rivals[j].char_ref = main.t_charDef[main.t_selChars[i].rivals[j].char:lower()]
 				end
-				if bgmusic ~= '' then
-					bgmusic = bgmusic:gsub('\\', '/')
-					main.t_selStages[row].music = {}
-					main.t_selStages[row].music[1] = {bgmusic = bgmusic, bgmvolume = tonumber(bgmvolume), bgmloopstart = bgmloopstart, bgmloopend = bgmloopend}
+			end
+			--add 'rivals' param stages if needed or reference existing ones
+			if main.t_selChars[i].rivals[j].stage ~= nil then
+				for k = 1, #main.t_selChars[i].rivals[j].stage do
+					if main.t_stageDef[main.t_selChars[i].rivals[j].stage[k]:lower()] == nil then
+						main.t_selChars[i].rivals[j].stage[k] = main.f_addStage(main.t_selChars[i].rivals[j].stage[k])
+					else --already added
+						main.t_selChars[i].rivals[j].stage[k] = main.t_stageDef[main.t_selChars[i].rivals[j].stage[k]:lower()]
+					end
 				end
-				if main.t_selChars[i].includestage == nil or main.t_selChars[i].includestage == 1 then
-					main.t_includeStage[#main.t_includeStage + 1] = row
+			end
+		end
+	end
+	--character stage param
+	if main.t_selChars[i].stage ~= nil then
+		for j = 1, #main.t_selChars[i].stage do
+			--add 'stage' param stages if needed or reference existing ones
+			if main.t_stageDef[main.t_selChars[i].stage[j]:lower()] == nil then
+				main.t_selChars[i].stage[j] = main.f_addStage(main.t_selChars[i].stage[j])
+				if main.t_selChars[i].includestage == nil or main.t_selChars[i].includestage == 1 then --stage available all the time
+					table.insert(main.t_includeStage[1], main.t_selChars[i].stage[j])
+				elseif main.t_selChars[i].includestage == -1 then --excluded stage that can be still manually selected
+					table.insert(main.t_includeStage[2], main.t_selChars[i].stage[j])
 				end
-				main.t_selChars[i].stage[j] = row
-				--main.t_stageDef[main.t_selChars[i].stage[j]] = row
-			else
-				main.t_selChars[i].stage[j] = main.t_stageDef[main.t_selChars[i].stage[j]]
+			else --already added
+				main.t_selChars[i].stage[j] = main.t_stageDef[main.t_selChars[i].stage[j]:lower()]
 			end
 		end
 	end
@@ -1300,15 +1227,15 @@ for i = 1, #main.t_selChars do
 	if main.t_selChars[i].displayname ~= nil then
 		--generate table for boss rush mode
 		if main.t_selChars[i].boss ~= nil and main.t_selChars[i].boss == 1 then
-			main.t_bossChars[#main.t_bossChars + 1] = i - 1
+			table.insert(main.t_bossChars, i - 1)
 		end
 		--generate table for bonus games mode
 		if main.t_selChars[i].bonus ~= nil and main.t_selChars[i].bonus == 1 then
-			main.t_bonusChars[#main.t_bonusChars + 1] = i - 1
+			table.insert(main.t_bonusChars, i - 1)
 		end
 		--generate table with characters allowed to be random selected
-		if main.t_selChars[i].hidden ~= nil and main.t_selChars[i].hidden <= 1 then
-			main.t_randomChars[#main.t_randomChars + 1] = i - 1
+		if main.t_selChars[i].playable and (main.t_selChars[i].hidden == nil or main.t_selChars[i].hidden <= 1) and (main.t_selChars[i].exclude == nil or main.t_selChars[i].exclude == 0) then
+			table.insert(main.t_randomChars, i - 1)
 		end
 	end
 end
@@ -1318,12 +1245,15 @@ main.f_printTable(main.t_selChars, "debug/t_selChars.txt")
 main.f_printTable(main.t_selStages, "debug/t_selStages.txt")
 main.f_printTable(main.t_selOptions, "debug/t_selOptions.txt")
 main.f_printTable(main.t_orderChars, "debug/t_orderChars.txt")
+main.f_printTable(main.t_orderStages, "debug/t_orderStages.txt")
+main.f_printTable(main.t_orderSurvival, "debug/t_orderSurvival.txt")
 main.f_printTable(main.t_randomChars, "debug/t_randomChars.txt")
 main.f_printTable(main.t_bossChars, "debug/t_bossChars.txt")
 main.f_printTable(main.t_bonusChars, "debug/t_bonusChars.txt")
 main.f_printTable(main.t_stageDef, "debug/t_stageDef.txt")
 main.f_printTable(main.t_charDef, "debug/t_charDef.txt")
 main.f_printTable(main.t_includeStage, "debug/t_includeStage.txt")
+main.f_printTable(config, "debug/config.txt")
 
 --Debug stuff
 loadDebugFont(motif.files.debug_font)
@@ -1333,31 +1263,39 @@ setDebugScript(motif.files.debug_script)
 textImgDraw(txt_loading)
 refresh()
 loadLifebar(motif.files.fight)
+main.currentLifebar = motif.files.fight
 main.loadingRefresh(txt_loading)
 
---warnings
+--print warning if training character is missing
 if main.t_charDef.training == nil then
 	main.f_warning(main.f_extractText(motif.warning_info.text_training), motif.title_info, motif.titlebgdef)
 	os.exit()
 end
 
-if #main.t_includeStage == 0 then
+--print warning if no stages have been added
+if #main.t_includeStage[1] == 0 then
 	main.f_warning(main.f_extractText(motif.warning_info.text_stages), motif.title_info, motif.titlebgdef)
 	os.exit()
 end
 
-local t = {'arcademaxmatches', 'teammaxmatches'}
-for i = 1, #t do
-	local orderOK = false
-	for j = 1, #main.t_selOptions[t[i]] do
-		if main.t_selOptions[t[i]][j] > 0 and main.t_orderChars[j] ~= nil and #main.t_orderChars[j] > 0 then
-			orderOK = true
-			break
+--print warning if at least 1 match is not possible with the current maxmatches settings
+for k, v in pairs(main.t_selOptions) do
+	local mode = k:match('^(.+)maxmatches$')
+	if mode ~= nil then
+		local orderOK = false
+		for i = 1, #main.t_selOptions[k] do
+			if mode == 'survival' and (main.t_selOptions[k][i] > 0 or main.t_selOptions[k][i] == -1) and main.t_orderSurvival[i] ~= nil and #main.t_orderSurvival[i] > 0 then
+				orderOK = true
+				break
+			elseif main.t_selOptions[k][i] > 0 and main.t_orderChars[i] ~= nil and #main.t_orderChars[i] > 0 then
+				orderOK = true
+				break
+			end
+		end
+		if not orderOK then
+			main.f_warning(main.f_extractText(motif.warning_info.text_order), motif.title_info, motif.titlebgdef)
+			os.exit()
 		end
-	end
-	if not orderOK then
-		main.f_warning(main.f_extractText(motif.warning_info.text_order), motif.title_info, motif.titlebgdef)
-		os.exit()
 	end
 end
 
@@ -1385,7 +1323,9 @@ local txt_titleFooter1 = main.f_createTextImg(
 	motif.title_info.footer1_font_scale[2],
 	motif.title_info.footer1_font[4],
 	motif.title_info.footer1_font[5],
-	motif.title_info.footer1_font[6]
+	motif.title_info.footer1_font[6],
+	motif.title_info.footer1_font[7],
+	motif.title_info.footer1_font[8]
 )
 local txt_titleFooter2 = main.f_createTextImg(
 	motif.font_data[motif.title_info.footer2_font[1]],
@@ -1398,7 +1338,9 @@ local txt_titleFooter2 = main.f_createTextImg(
 	motif.title_info.footer2_font_scale[2],
 	motif.title_info.footer2_font[4],
 	motif.title_info.footer2_font[5],
-	motif.title_info.footer2_font[6]
+	motif.title_info.footer2_font[6],
+	motif.title_info.footer2_font[7],
+	motif.title_info.footer2_font[8]
 )
 local txt_titleFooter3 = main.f_createTextImg(
 	motif.font_data[motif.title_info.footer3_font[1]],
@@ -1411,7 +1353,9 @@ local txt_titleFooter3 = main.f_createTextImg(
 	motif.title_info.footer3_font_scale[2],
 	motif.title_info.footer3_font[4],
 	motif.title_info.footer3_font[5],
-	motif.title_info.footer3_font[6]
+	motif.title_info.footer3_font[6],
+	motif.title_info.footer3_font[7],
+	motif.title_info.footer3_font[8]
 )
 local txt_infoboxTitle = main.f_createTextImg(
 	motif.font_data[motif.infobox.title_font[1]],
@@ -1424,7 +1368,9 @@ local txt_infoboxTitle = main.f_createTextImg(
 	motif.infobox.title_font_scale[2],
 	motif.infobox.title_font[4],
 	motif.infobox.title_font[5],
-	motif.infobox.title_font[6]
+	motif.infobox.title_font[6],
+	motif.infobox.title_font[7],
+	motif.infobox.title_font[8]
 )
 
 --Enable screenpack scale again.
@@ -1441,7 +1387,9 @@ main.txt_mainSelect = main.f_createTextImg(
 	motif.select_info.title_font_scale[2],
 	motif.select_info.title_font[4],
 	motif.select_info.title_font[5],
-	motif.select_info.title_font[6]
+	motif.select_info.title_font[6],
+	motif.select_info.title_font[7],
+	motif.select_info.title_font[8]
 )
 
 --itemname: names used to distinguish modes in lua code (keep it as it is)
@@ -1450,6 +1398,8 @@ main.txt_mainSelect = main.f_createTextImg(
 local t_mainMenu = {
 	{data = textImgNew(), itemname = 'arcade', displayname = motif.title_info.menu_itemname_arcade, selectname = motif.select_info.title_text_arcade},
 	{data = textImgNew(), itemname = 'versus', displayname = motif.title_info.menu_itemname_versus, selectname = motif.select_info.title_text_versus},
+	{data = textImgNew(), itemname = 'teamarcade', displayname = motif.title_info.menu_itemname_teamarcade, selectname = motif.select_info.title_text_teamarcade},
+	{data = textImgNew(), itemname = 'teamversus', displayname = motif.title_info.menu_itemname_teamversus, selectname = motif.select_info.title_text_teamversus},
 	{data = textImgNew(), itemname = 'online', displayname = motif.title_info.menu_itemname_online},
 	{data = textImgNew(), itemname = 'teamcoop', displayname = motif.title_info.menu_itemname_teamcoop, selectname = motif.select_info.title_text_teamcoop},
 	{data = textImgNew(), itemname = 'survival', displayname = motif.title_info.menu_itemname_survival, selectname = motif.select_info.title_text_survival},
@@ -1463,22 +1413,26 @@ local t_mainMenu = {
 	{data = textImgNew(), itemname = 'options', displayname = motif.title_info.menu_itemname_options},
 	{data = textImgNew(), itemname = 'exit', displayname = motif.title_info.menu_itemname_exit},
 }
-t_mainMenu = main.f_cleanTable(t_mainMenu)
+t_mainMenu = main.f_cleanTable(t_mainMenu, main.t_sort.title_info)
 
+local demoFrameCounter = 0
+local introWaitCycles = 0
 function main.f_default()
+	demoFrameCounter = 0
 	setAutoLevel(false) --generate autolevel.txt in game dir
 	setHomeTeam(2) --P2 side considered the home team: http://mugenguild.com/forum/topics/ishometeam-triggers-169132.0.html
-	resetRemapInput()
 	--settings adjustable via options
 	setAutoguard(1, config.AutoGuard)
 	setAutoguard(2, config.AutoGuard)
 	setPowerShare(1, config.TeamPowerShare)
 	setPowerShare(2, config.TeamPowerShare)
 	setLifeShare(config.TeamLifeShare)
-	setRoundTime(config.RoundTime * options.framespercount)
+	setRoundTime(math.max(-1, config.RoundTime * getFramesPerCount()))
+	setDemoTime(motif.demo_mode.fight_endtime / 60 * getFramesPerCount())
 	setLifeMul(config.LifeMul / 100)
 	setTeam1VS2Life(config.Team1VS2Life / 100)
-	setTurnsRecoveryRate(1.0 / config.TurnsRecoveryRate)
+	setTurnsRecoveryRate(config.TurnsRecoveryBase / 100, config.TurnsRecoveryBonus / 100)
+	setGameMode('')
 	--default values for all modes
 	main.p1Char = nil --no predefined P1 character (assigned via table: {X, Y, (...)})
 	main.p2Char = nil --no predefined P2 character (assigned via table: {X, Y, (...)})
@@ -1490,18 +1444,86 @@ function main.f_default()
 	main.coop = false --P2 fighting on P1 side disabled
 	main.p2SelectMenu = true --P2 character selection enabled
 	main.versusScreen = true --versus screen enabled
+	main.f_resetCharparam()
 	main.p1In = 1 --P1 controls P1 side of the select screen
 	main.p2In = 2 --P2 controls P2 side of the select screen
-	main.gameMode = '' --additional variable used to distinguish modes in select screen
+	resetRemapInput()
+end
+
+function main.f_resetCharparam()
+	main.t_charparam = { --default character parameters support
+		stage = false,
+		music = false,
+		zoom = false,
+		ai = false,
+		winscreen = true,
+		rounds = false,
+		time = false,
+		lifebar = true,
+		onlyme = false,
+		rivals = false,
+	}
+end
+
+function main.f_demo(cursorPosY, moveTxt, item, t, fadeType)
+	if motif.demo_mode.enabled == 0 then
+		return
+	end
+	demoFrameCounter = demoFrameCounter + 1
+	if demoFrameCounter < motif.demo_mode.title_waittime then
+		return
+	end
+	main.f_default()
+	main.f_menuFade('demo_mode', 'fadeout', cursorPosY, moveTxt, item, t)
+	clearColor(motif.titlebgdef.bgclearcolor[1], motif.titlebgdef.bgclearcolor[2], motif.titlebgdef.bgclearcolor[3])
+	if motif.demo_mode.fight_playbgm == 1 or motif.demo_mode.fight_stopbgm == 1 then
+		setStopTitleBGM(true)
+	else
+		setStopTitleBGM(false)
+	end
+	if motif.demo_mode.fight_bars_display == 1 then
+		setBarsDisplay(true)
+	else
+		setBarsDisplay(false)
+	end
+	if motif.demo_mode.debuginfo == 0 and config.AllowDebugKeys then
+		setAllowDebugKeys(false)
+	end
+	setGameMode('demo')
+	randomtest.run()
+	setBarsDisplay(true)
+	setStopTitleBGM(true)
+	setAllowDebugKeys(config.AllowDebugKeys)
+	refresh()
+	--intro
+	if introWaitCycles >= motif.demo_mode.intro_waitcycles then
+		if motif.files.intro_storyboard ~= '' then
+			storyboard.f_storyboard(motif.files.intro_storyboard)
+		end
+		introWaitCycles = 0
+	else
+		introWaitCycles = introWaitCycles + 1
+	end
+	--start title BGM only if it has been interrupted
+	if motif.demo_mode.fight_stopbgm == 1 or motif.demo_mode.fight_playbgm == 1 or (introWaitCycles == 0 and motif.files.intro_storyboard ~= '') then
+		main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+	else
+		main.f_menuReset(motif.titlebgdef.bg)
+	end
+	main.f_menuFade('demo_mode', 'fadein', cursorPosY, moveTxt, item, t)
 end
 
-function main.f_menuCommon1(cursorPosY, moveTxt, item, t)
+function main.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 	if commandGetState(main.p1Cmd, 'u') or commandGetState(main.p2Cmd, 'u') then
 		sndPlay(motif.files.snd_data, motif.title_info.cursor_move_snd[1], motif.title_info.cursor_move_snd[2])
 		item = item - 1
+		demoFrameCounter = 0
+		introWaitCycles = 0
 	elseif commandGetState(main.p1Cmd, 'd') or commandGetState(main.p2Cmd, 'd') then
 		sndPlay(motif.files.snd_data, motif.title_info.cursor_move_snd[1], motif.title_info.cursor_move_snd[2])
 		item = item + 1
+		demoFrameCounter = 0
+		introWaitCycles = 0
 	end
 	--cursor position calculation
 	if item < 1 then
@@ -1514,9 +1536,9 @@ function main.f_menuCommon1(cursorPosY, moveTxt, item, t)
 	elseif item > #t then
 		item = 1
 		cursorPosY = 1
-	elseif (commandGetState(main.p1Cmd, 'u') or commandGetState(main.p2Cmd, 'u') ) and cursorPosY > 1 then
+	elseif (commandGetState(main.p1Cmd, 'u') or commandGetState(main.p2Cmd, 'u')) and cursorPosY > 1 then
 		cursorPosY = cursorPosY - 1
-	elseif (commandGetState(main.p1Cmd, 'd') or commandGetState(main.p2Cmd, 'd') ) and cursorPosY < motif.title_info.menu_window_visibleitems then
+	elseif (commandGetState(main.p1Cmd, 'd') or commandGetState(main.p2Cmd, 'd')) and cursorPosY < motif.title_info.menu_window_visibleitems then
 		cursorPosY = cursorPosY + 1
 	end
 	if cursorPosY == motif.title_info.menu_window_visibleitems then
@@ -1527,14 +1549,16 @@ function main.f_menuCommon1(cursorPosY, moveTxt, item, t)
 	return cursorPosY, moveTxt, item
 end
 
-function main.f_menuCommon2(cursorPosY, moveTxt, item, t)
+function main.f_menuCommonDraw(cursorPosY, moveTxt, item, t, fadeType, fadeData)
+	fadeType = fadeType or 'fadein'
+	fadeData = fadeData or 'title_info'
 	--draw clearcolor
-	animDraw(motif.titlebgdef.bgclearcolor_data)
+	clearColor(motif.titlebgdef.bgclearcolor[1], motif.titlebgdef.bgclearcolor[2], motif.titlebgdef.bgclearcolor[3])
 	--draw layerno = 0 backgrounds
-	main.f_drawBG(motif.titlebgdef.bg_data, motif.titlebgdef.bg, 0, motif.titlebgdef.timer, {320,240})
+	bgDraw(motif.titlebgdef.bg, false)
 	--draw menu items
 	local items_shown = item + motif.title_info.menu_window_visibleitems - cursorPosY
-	if motif.title_info.menu_window_margins_y[2] ~= 0 and items_shown < #t then
+	if motif.title_info.menu_window_visibleitems > 1 and motif.title_info.menu_window_margins_y[2] ~= 0 and items_shown < #t then
 		items_shown = items_shown + 1
 	end
 	if items_shown > #t then
@@ -1555,7 +1579,9 @@ function main.f_menuCommon2(cursorPosY, moveTxt, item, t)
 					motif.title_info.menu_item_active_font_scale[2],
 					motif.title_info.menu_item_active_font[4],
 					motif.title_info.menu_item_active_font[5],
-					motif.title_info.menu_item_active_font[6]
+					motif.title_info.menu_item_active_font[6],
+					motif.title_info.menu_item_active_font[7],
+					motif.title_info.menu_item_active_font[8]
 				))
 			else
 				textImgDraw(main.f_updateTextImg(
@@ -1570,48 +1596,103 @@ function main.f_menuCommon2(cursorPosY, moveTxt, item, t)
 					motif.title_info.menu_item_font_scale[2],
 					motif.title_info.menu_item_font[4],
 					motif.title_info.menu_item_font[5],
-					motif.title_info.menu_item_font[6]
+					motif.title_info.menu_item_font[6],
+					motif.title_info.menu_item_font[7],
+					motif.title_info.menu_item_font[8]
 				))
 			end
 		end
 	end
 	--draw menu cursor
-	if motif.title_info.menu_boxcursor_visible == 1 then
-		animSetWindow(
-			main.cursorBox,
+	if motif.title_info.menu_boxcursor_visible == 1 and not main.fadeActive then
+		local src, dst = main.f_boxcursorAlpha(
+			motif.title_info.menu_boxcursor_alpharange[1],
+			motif.title_info.menu_boxcursor_alpharange[2],
+			motif.title_info.menu_boxcursor_alpharange[3],
+			motif.title_info.menu_boxcursor_alpharange[4],
+			motif.title_info.menu_boxcursor_alpharange[5],
+			motif.title_info.menu_boxcursor_alpharange[6]
+		)
+		fillRect(
 			motif.title_info.menu_pos[1] + motif.title_info.menu_boxcursor_coords[1],
 			motif.title_info.menu_pos[2] + motif.title_info.menu_boxcursor_coords[2] + (cursorPosY - 1) * motif.title_info.menu_item_spacing[2],
 			motif.title_info.menu_boxcursor_coords[3] - motif.title_info.menu_boxcursor_coords[1] + 1,
-			motif.title_info.menu_boxcursor_coords[4] - motif.title_info.menu_boxcursor_coords[2] + 1
+			motif.title_info.menu_boxcursor_coords[4] - motif.title_info.menu_boxcursor_coords[2] + 1 + main.f_oddRounding(motif.title_info.menu_boxcursor_coords[2]),
+			motif.title_info.menu_boxcursor_col[1],
+			motif.title_info.menu_boxcursor_col[2],
+			motif.title_info.menu_boxcursor_col[3],
+			src,
+			dst
 		)
-		main.f_dynamicAlpha(main.cursorBox, 10,40,2, 255,255,0)
-		animDraw(main.cursorBox)
 	end
 	--draw layerno = 1 backgrounds
-	main.f_drawBG(motif.titlebgdef.bg_data, motif.titlebgdef.bg, 1, motif.titlebgdef.timer, {320,240})
+	bgDraw(motif.titlebgdef.bg, true)
 	--footer draw
-	if motif.title_info.footer_boxbackground_visible == 1 then
-		animDraw(footerBox)
+	if motif.title_info.footer_boxbg_visible == 1 then
+		fillRect(
+			motif.title_info.footer_boxbg_coords[1],
+			motif.title_info.footer_boxbg_coords[2],
+			motif.title_info.footer_boxbg_coords[3] - motif.title_info.footer_boxbg_coords[1] + 1,
+			motif.title_info.footer_boxbg_coords[4] - motif.title_info.footer_boxbg_coords[2] + 1,
+			motif.title_info.footer_boxbg_col[1],
+			motif.title_info.footer_boxbg_col[2],
+			motif.title_info.footer_boxbg_col[3],
+			motif.title_info.footer_boxbg_alpha[1],
+			motif.title_info.footer_boxbg_alpha[2]
+		)
 	end
 	textImgDraw(txt_titleFooter1)
 	textImgDraw(txt_titleFooter2)
 	textImgDraw(txt_titleFooter3)
-	--draw fadein
-	animDraw(motif.title_info.fadein_data)
-	animUpdate(motif.title_info.fadein_data)
-	--update timer
-	motif.titlebgdef.timer = motif.titlebgdef.timer + 1
-	--end loop
-	main.f_cmdInput()
+	--draw fadein / fadeout
+	main.fadeActive = fadeScreen(
+		fadeType,
+		main.fadeStart,
+		motif[fadeData][fadeType .. '_time'],
+		motif[fadeData][fadeType .. '_col'][1],
+		motif[fadeData][fadeType .. '_col'][2],
+		motif[fadeData][fadeType .. '_col'][3]
+	)
+	--frame transition
+	if main.fadeActive then
+		commandBufReset(main.p1Cmd)
+	elseif fadeType == 'fadeout' then
+		commandBufReset(main.p1Cmd)
+		return --skip last frame rendering
+	else
+		main.f_cmdInput()
+	end
 	refresh()
 end
 
-function main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
-	--[[for i = 1, motif.title_info.fadeout_time do
-		main.f_menuCommon2(cursorPosY, moveTxt, item, t)
-		animDraw(motif.title_info.fadeout_data)
-		animUpdate(motif.title_info.fadeout_data)
-	end]]
+main.fadeActive = false
+function main.f_menuFade(screen, fadeType, cursorPosY, moveTxt, item, t)
+	main.fadeStart = getFrameCount()
+	while true do
+		if screen == 'title_info' then
+			main.f_menuCommonDraw(cursorPosY, moveTxt, item, t, fadeType)
+		elseif screen == 'option_info' then
+			options.f_menuCommonDraw(cursorPosY, moveTxt, item, t, fadeType)
+		elseif screen == 'demo_mode' then
+			main.f_menuCommonDraw(cursorPosY, moveTxt, item, t, fadeType, 'demo_mode')
+		end
+		if not main.fadeActive then
+			break
+		end
+	end
+end
+
+function main.f_menuReset(bgNum, bgm, bgmLoop, bgmVolume, bgmLoopstart, bgmLoopend)
+	alpha1cur = 0
+	alpha2cur = 0
+	alpha1add = true
+	alpha2add = true
+	bgm = bgm or nil
+	bgReset(bgNum)
+	if bgm ~= nil then
+		playBGM(bgm, true, bgmLoop, bgmVolume, bgmLoopstart, bgmLoopend)
+	end
+	main.fadeStart = getFrameCount()
 end
 
 function main.f_mainMenu()
@@ -1626,37 +1707,64 @@ function main.f_mainMenu()
 	if motif.files.intro_storyboard ~= '' then
 		storyboard.f_storyboard(motif.files.intro_storyboard)
 	end
-	main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+	main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
 	while true do
-		cursorPosY, moveTxt, item = main.f_menuCommon1(cursorPosY, moveTxt, item, t)
+		cursorPosY, moveTxt, item = main.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 		if esc() then
 			break
 		elseif getKey() == 'F1' then
 			main.SetDefaultScale()
-			main.f_warning(main.f_extractText(motif.infobox.text), motif.title_info, motif.titlebgdef, motif.infobox, txt_infoboxTitle, main.infoBox)
+			main.f_warning(
+				main.f_extractText(motif.infobox.text),
+				motif.title_info,
+				motif.titlebgdef,
+				motif.infobox,
+				txt_infoboxTitle,
+				motif.infobox.boxbg_coords,
+				motif.infobox.boxbg_col,
+				motif.infobox.boxbg_alpha
+			)
 			main.SetScaleValues()
 		elseif main.f_btnPalNo(main.p1Cmd) > 0 then
 			main.f_default()
 			--ARCADE
-			if t[item].itemname == 'arcade' then
+			if t[item].itemname == 'arcade' or t[item].itemname == 'teamarcade' then
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
 				main.p2In = 1 --P1 controls P2 side of the select screen
 				main.p2SelectMenu = false --P2 character selection disabled
+				main.t_charparam.stage = true
+				main.t_charparam.music = true
+				main.t_charparam.zoom = true
+				main.t_charparam.ai = true
+				main.t_charparam.rounds = true
+				main.t_charparam.time = true
+				main.t_charparam.onlyme = true
+				main.t_charparam.rivals = true
 				main.credits = config.Credits - 1 --amount of continues
-				main.gameMode = t[item].itemname --mode recognized in select screen as 'arcade'
 				textImgSetText(main.txt_mainSelect, t[item].selectname) --message displayed on top of select screen
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
-				select.f_selectAdvance() --start f_selectAdvance() function from script/select.lua
+				if t[item].itemname == 'arcade' then
+					main.p1TeamMenu = {mode = 0, chars = 1} --predefined P1 team mode as Single, 1 Character
+					main.p2TeamMenu = {mode = 0, chars = 1} --predefined P2 team mode as Single, 1 Character
+				end
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				setGameMode('arcade')
+				select.f_selectArcade() --start f_selectArcade() function from script/select.lua
 			end
 			--VS MODE
-			if t[item].itemname == 'versus' then
+			if t[item].itemname == 'versus' or t[item].itemname == 'teamversus' then
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
 				setHomeTeam(1) --P1 side considered the home team
 				main.p2In = 2 --P2 controls P2 side of the select screen
 				main.stageMenu = true --stage selection enabled
 				main.p2Faces = true --additional window with P2 select screen small portraits (faces) enabled
+				--uses default main.t_charparam assignment
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
+				if t[item].itemname == 'versus' then
+					main.p1TeamMenu = {mode = 0, chars = 1} --predefined P1 team mode as Single, 1 Character
+					main.p2TeamMenu = {mode = 0, chars = 1} --predefined P2 team mode as Single, 1 Character
+				end
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				setGameMode('versus')
 				select.f_selectSimple() --start f_selectSimple() function from script/select.lua
 			end
 			--ONLINE
@@ -1670,22 +1778,35 @@ function main.f_mainMenu()
 				main.p2In = 2
 				main.p2Faces = true
 				main.coop = true --P2 fighting on P1 side enabled
+				main.t_charparam.stage = true
+				main.t_charparam.music = true
+				main.t_charparam.zoom = true
+				main.t_charparam.ai = true
+				main.t_charparam.rounds = true
+				main.t_charparam.time = true
+				main.t_charparam.onlyme = true
+				main.t_charparam.rivals = true
 				main.credits = config.Credits - 1
-				main.gameMode = t[item].itemname
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
-				select.f_selectAdvance()
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				setGameMode('teamcoop')
+				select.f_selectArcade()
 			end
 			--SURVIVAL
 			if t[item].itemname == 'survival' then
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
 				main.p2In = 1
 				main.p2SelectMenu = false
-				main.credits = 0
-				main.gameMode = t[item].itemname
+				main.t_charparam.stage = true
+				main.t_charparam.music = true
+				main.t_charparam.zoom = true
+				main.t_charparam.ai = true
+				main.t_charparam.time = true
+				main.t_charparam.onlyme = true
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
-				select.f_selectAdvance()
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				setGameMode('survival')
+				select.f_selectArranged()
 			end
 			--SURVIVAL CO-OP
 			if t[item].itemname == 'survivalcoop' then
@@ -1693,11 +1814,16 @@ function main.f_mainMenu()
 				main.p2In = 2
 				main.p2Faces = true
 				main.coop = true
-				main.credits = 0
-				main.gameMode = t[item].itemname
+				main.t_charparam.stage = true
+				main.t_charparam.music = true
+				main.t_charparam.zoom = true
+				main.t_charparam.ai = true
+				main.t_charparam.time = true
+				main.t_charparam.onlyme = true
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
-				select.f_selectAdvance()
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				setGameMode('survivalcoop')
+				select.f_selectArranged()
 			end
 			--TOURNAMENT
 			if t[item].itemname == 'tournament' then
@@ -1707,15 +1833,15 @@ function main.f_mainMenu()
 			--TRAINING
 			if t[item].itemname == 'training' then
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
-				setRoundTime(-1) --round time disabled
 				main.p2In = 2
 				main.stageMenu = true
 				main.versusScreen = false --versus screen disabled
+				--uses default main.t_charparam assignment
 				main.p2TeamMenu = {mode = 0, chars = 1} --predefined P2 team mode as Single, 1 Character
 				main.p2Char = {main.t_charDef.training} --predefined P2 character as Training by stupa
-				main.gameMode = t[item].itemname
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				setGameMode('training')
 				select.f_selectSimple()
 			end
 			--WATCH
@@ -1725,8 +1851,10 @@ function main.f_mainMenu()
 				main.aiFight = true --AI = config.Difficulty for all characters enabled
 				main.stageMenu = true
 				main.p2Faces = true
+				--uses default main.t_charparam assignment
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				setGameMode('watch')
 				select.f_selectSimple()
 			end
 			--EXTRAS
@@ -1737,7 +1865,7 @@ function main.f_mainMenu()
 			--OPTIONS
 			if t[item].itemname == 'options' then
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)				
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
 				--Disable screenpack scale on the menu text for showing the menu corectly.
 				main.SetDefaultScale()
 				options.f_mainCfg() --start f_mainCfg() function from script/options.lua
@@ -1749,7 +1877,8 @@ function main.f_mainMenu()
 				break
 			end
 		end
-		main.f_menuCommon2(cursorPosY, moveTxt, item, t)
+		main.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
+		main.f_demo(cursorPosY, moveTxt, item, t)
 	end
 end
 
@@ -1767,7 +1896,9 @@ local txt_connection = main.f_createTextImg(
 	motif.title_info.connecting_font_scale[2],
 	motif.title_info.connecting_font[4],
 	motif.title_info.connecting_font[5],
-	motif.title_info.connecting_font[6]
+	motif.title_info.connecting_font[6],
+	motif.title_info.connecting_font[7],
+	motif.title_info.connecting_font[8]
 )
 function main.f_connect(server, t)
 	local cancel = false
@@ -1779,20 +1910,28 @@ function main.f_connect(server, t)
 			break
 		end
 		--draw clearcolor
-		animDraw(motif.titlebgdef.bgclearcolor_data)
+		clearColor(motif.titlebgdef.bgclearcolor[1], motif.titlebgdef.bgclearcolor[2], motif.titlebgdef.bgclearcolor[3])
 		--draw layerno = 0 backgrounds
-		main.f_drawBG(motif.titlebgdef.bg_data, motif.titlebgdef.bg, 0, motif.titlebgdef.timer, {320,240})
+		bgDraw(motif.titlebgdef.bg, false)
 		--draw layerno = 1 backgrounds
-		main.f_drawBG(motif.titlebgdef.bg_data, motif.titlebgdef.bg, 1, motif.titlebgdef.timer, {320,240})
+		bgDraw(motif.titlebgdef.bg, true)
 		--draw menu box
-		animDraw(main.warningBox)
+		fillRect(
+			motif.title_info.connecting_boxbg_coords[1],
+			motif.title_info.connecting_boxbg_coords[2],
+			motif.title_info.connecting_boxbg_coords[3] - motif.title_info.connecting_boxbg_coords[1] + 1,
+			motif.title_info.connecting_boxbg_coords[4] - motif.title_info.connecting_boxbg_coords[2] + 1,
+			motif.title_info.connecting_boxbg_col[1],
+			motif.title_info.connecting_boxbg_col[2],
+			motif.title_info.connecting_boxbg_col[3],
+			motif.title_info.connecting_boxbg_alpha[1],
+			motif.title_info.connecting_boxbg_alpha[2]
+		)
 		--draw text
 		for i = 1, #t do
 			textImgSetText(txt_connection, t[i])
 			textImgDraw(txt_connection)
 		end
-		--update timer
-		motif.titlebgdef.timer = motif.titlebgdef.timer + 1
 		--end loop
 		refresh()
 	end
@@ -1809,7 +1948,7 @@ local t_mainNetplay = {
 	{data = textImgNew(), itemname = 'serverjoin', displayname = motif.title_info.menu_itemname_serverjoin},
 	{data = textImgNew(), itemname = 'serverback', displayname = motif.title_info.menu_itemname_serverback},
 }
-t_mainNetplay = main.f_cleanTable(t_mainNetplay)
+t_mainNetplay = main.f_cleanTable(t_mainNetplay, main.t_sort.title_info)
 
 function main.f_mainNetplay()
 	main.f_cmdInput()
@@ -1818,7 +1957,7 @@ function main.f_mainNetplay()
 	local item = 1
 	local t = t_mainNetplay
 	while true do
-		cursorPosY, moveTxt, item = main.f_menuCommon1(cursorPosY, moveTxt, item, t)
+		cursorPosY, moveTxt, item = main.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 		if esc() then
 			sndPlay(motif.files.snd_data, motif.title_info.cancel_snd[1], motif.title_info.cancel_snd[2])
 			break
@@ -1827,19 +1966,16 @@ function main.f_mainNetplay()
 			--HOST
 			if t[item].itemname == 'serverhost' then
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
-				main.f_connect("", main.f_extractText(motif.title_info.connecting_host, getListenPort()))
+				main.f_connect("", main.f_extractText(motif.title_info.connecting_host_text, getListenPort()))
 				exitNetPlay()
 				exitReplay()
-
-				-- Save replay with a new name
-				tpmFileRpl1 = io.open("save/replays/netplay.replay","r")
-				tpmFileRpl1C = tpmFileRpl1:read("*all")
-				io.close(tpmFileRpl1)
-
-				tpmFileRpl2name = os.date("%Y-%m(%b)-%d %I-%M%p-%Ss")
-				tpmFileRpl2 = io.open("save/replays/" .. tpmFileRpl2name .. ".replay","w+")
-				tpmFileRpl2:write(tpmFileRpl1C)
-				io.close(tpmFileRpl2)
+				--save replay with a new name
+				local file = io.open("save/replays/netplay.replay", "r")
+				local tpmFile = file:read("*all")
+				io.close(file)
+				file = io.open("save/replays/" .. os.date("%Y-%m(%b)-%d %I-%M%p-%Ss") .. ".replay", "w+")
+				file:write(tpmFile)
+				io.close(file)
 			end
 			--JOIN
 			if t[item].itemname == 'serverjoin' then
@@ -1852,7 +1988,7 @@ function main.f_mainNetplay()
 				break
 			end
 		end
-		main.f_menuCommon2(cursorPosY, moveTxt, item, t)
+		main.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
 	end
 end
 
@@ -1860,16 +1996,11 @@ end
 --; NETPLAY JOIN
 --;===========================================================
 local t_netplayJoin = {}
-t_netplayJoin[#t_netplayJoin + 1] = {data = textImgNew(), itemname = 'joinadd', displayname = motif.title_info.menu_itemname_joinadd}
+table.insert(t_netplayJoin, {data = textImgNew(), itemname = 'joinadd', displayname = motif.title_info.menu_itemname_joinadd})
 for k, v in pairs(config.IP) do
-	t_netplayJoin[#t_netplayJoin + 1] = {
-		data = textImgNew(),
-		itemname = k,
-		displayname = k,
-		address = v
-	}
+	table.insert(t_netplayJoin, {data = textImgNew(), itemname = k, displayname = k, address = v})
 end
-t_netplayJoin[#t_netplayJoin + 1] = {data = textImgNew(), itemname = 'joinback', displayname = motif.title_info.menu_itemname_joinback}
+table.insert(t_netplayJoin, {data = textImgNew(), itemname = 'joinback', displayname = motif.title_info.menu_itemname_joinback})
 
 function main.f_netplayJoin()
 	main.f_cmdInput()
@@ -1879,7 +2010,7 @@ function main.f_netplayJoin()
 	local t = t_netplayJoin
 	local t_tmp = {}
 	while true do
-		cursorPosY, moveTxt, item = main.f_menuCommon1(cursorPosY, moveTxt, item, t)
+		cursorPosY, moveTxt, item = main.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 		if esc() then
 			sndPlay(motif.files.snd_data, motif.title_info.cancel_snd[1], motif.title_info.cancel_snd[2])
 			break
@@ -1891,7 +2022,7 @@ function main.f_netplayJoin()
 			t_tmp = {}
 			for i = 1, #t do
 				if i ~= item then
-					t_tmp[#t_tmp + 1] = t[i]
+					table.insert(t_tmp, t[i])
 				end
 			end
 			t_netplayJoin = t_tmp
@@ -1904,10 +2035,10 @@ function main.f_netplayJoin()
 			--NEW ADDRESS
 			if t[item].itemname == 'joinadd' then
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_move_snd[1], motif.title_info.cursor_move_snd[2])
-				local name = main.f_input(main.f_extractText(motif.title_info.input_ip_name), motif.title_info, motif.titlebgdef, 'string')
+				local name = main.f_input(main.f_extractText(motif.title_info.input_ip_name_text), motif.title_info, motif.titlebgdef, 'string')
 				if name ~= '' then
 					sndPlay(motif.files.snd_data, motif.title_info.cursor_move_snd[1], motif.title_info.cursor_move_snd[2])
-					local address = main.f_input(main.f_extractText(motif.title_info.input_ip_address), motif.title_info, motif.titlebgdef, 'string')
+					local address = main.f_input(main.f_extractText(motif.title_info.input_ip_address_text), motif.title_info, motif.titlebgdef, 'string')
 					if address:match('^[0-9%.]+$') then
 						sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
 						config.IP[name] = address
@@ -1938,12 +2069,12 @@ function main.f_netplayJoin()
 			--CONNECTION
 			else
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
-				main.f_connect(t[item].address, main.f_extractText(motif.title_info.connecting_join, t[item].name, t[item].address))
+				main.f_connect(t[item].address, main.f_extractText(motif.title_info.connecting_join_text, t[item].name, t[item].address))
 				exitNetPlay()
 				exitReplay()
 			end
 		end
-		main.f_menuCommon2(cursorPosY, moveTxt, item, t)
+		main.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
 	end
 end
 
@@ -1956,7 +2087,7 @@ local t_netplayMode = {
 	{data = textImgNew(), itemname = 'netplaysurvivalcoop', displayname = motif.title_info.menu_itemname_netplaysurvivalcoop, selectname = motif.select_info.title_text_netplaysurvivalcoop},
 	{data = textImgNew(), itemname = 'netplayback', displayname = motif.title_info.menu_itemname_netplayback},
 }
-t_netplayMode = main.f_cleanTable(t_netplayMode)
+t_netplayMode = main.f_cleanTable(t_netplayMode, main.t_sort.title_info)
 
 function main.f_netplayMode()
 	main.f_cmdInput()
@@ -1965,7 +2096,7 @@ function main.f_netplayMode()
 	local item = 1
 	local t = t_netplayMode
 	while true do
-		cursorPosY, moveTxt, item = main.f_menuCommon1(cursorPosY, moveTxt, item, t)
+		cursorPosY, moveTxt, item = main.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 		if esc() then
 			sndPlay(motif.files.snd_data, motif.title_info.cancel_snd[1], motif.title_info.cancel_snd[2])
 			break
@@ -1978,7 +2109,9 @@ function main.f_netplayMode()
 				main.p2In = 2
 				main.stageMenu = true
 				main.p2Faces = true
+				--uses default main.t_charparam assignment
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
+				setGameMode('netplayversus')
 				select.f_selectSimple()
 			end
 			--TEAM CO-OP
@@ -1987,10 +2120,18 @@ function main.f_netplayMode()
 				main.p2In = 2
 				main.p2Faces = true
 				main.coop = true
+				main.t_charparam.stage = true
+				main.t_charparam.music = true
+				main.t_charparam.zoom = true
+				main.t_charparam.ai = true
+				main.t_charparam.rounds = true
+				main.t_charparam.time = true
+				main.t_charparam.onlyme = true
+				main.t_charparam.rivals = true
 				main.credits = config.Credits - 1
-				main.gameMode = t[item].itemname
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				select.f_selectAdvance()
+				setGameMode('netplayteamcoop')
+				select.f_selectArcade()
 			end
 			--SURVIVAL CO-OP
 			if t[item].itemname == 'netplaysurvivalcoop' then
@@ -1998,10 +2139,15 @@ function main.f_netplayMode()
 				main.p2In = 2
 				main.p2Faces = true
 				main.coop = true
-				main.credits = 0
-				main.gameMode = t[item].itemname
+				main.t_charparam.stage = true
+				main.t_charparam.music = true
+				main.t_charparam.zoom = true
+				main.t_charparam.ai = true
+				main.t_charparam.time = true
+				main.t_charparam.onlyme = true
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				select.f_selectAdvance()
+				setGameMode('netplaysurvivalcoop')
+				select.f_selectArranged()
 			end
 			--BACK
 			if t[item].itemname == 'netplayback' then
@@ -2009,7 +2155,7 @@ function main.f_netplayMode()
 				break
 			end
 		end
-		main.f_menuCommon2(cursorPosY, moveTxt, item, t)
+		main.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
 	end
 end
 
@@ -2025,7 +2171,7 @@ local t_mainExtras = {
 	{data = textImgNew(), itemname = 'bonusgames', displayname = motif.title_info.menu_itemname_bonusgames},
 	--{data = textImgNew(), itemname = 'scoreranking', displayname = motif.title_info.menu_itemname_scoreranking},
 	{data = textImgNew(), itemname = 'replay', displayname = motif.title_info.menu_itemname_replay, selectname = motif.select_info.title_text_replay},
-	{data = textImgNew(), itemname = 'demo', displayname = motif.title_info.menu_itemname_demo},
+	{data = textImgNew(), itemname = 'randomtest', displayname = motif.title_info.menu_itemname_randomtest},
 	{data = textImgNew(), itemname = 'extrasback', displayname = motif.title_info.menu_itemname_extrasback},
 }
 for i = 1, #t_mainExtras do
@@ -2033,11 +2179,11 @@ for i = 1, #t_mainExtras do
 		t_mainExtras[i].displayname = ''
 	elseif t_mainExtras[i].itemname == 'bonusgames' and #main.t_bonusChars == 0 then
 		t_mainExtras[i].displayname = ''
-	elseif t_mainExtras[i].itemname == 'demo' and #main.t_randomChars < 2 then
+	elseif t_mainExtras[i].itemname == 'randomtest' and #main.t_randomChars < 2 then
 		t_mainExtras[i].displayname = ''
 	end
 end
-t_mainExtras = main.f_cleanTable(t_mainExtras)
+t_mainExtras = main.f_cleanTable(t_mainExtras, main.t_sort.title_info)
 
 function main.f_mainExtras()
 	main.f_cmdInput()
@@ -2046,7 +2192,7 @@ function main.f_mainExtras()
 	local item = 1
 	local t = t_mainExtras
 	while true do
-		cursorPosY, moveTxt, item = main.f_menuCommon1(cursorPosY, moveTxt, item, t)
+		cursorPosY, moveTxt, item = main.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 		if esc() then
 			sndPlay(motif.files.snd_data, motif.title_info.cancel_snd[1], motif.title_info.cancel_snd[2])
 			break
@@ -2058,8 +2204,10 @@ function main.f_mainExtras()
 				main.p2In = 1
 				main.stageMenu = true
 				main.p2Faces = true
+				--uses default main.t_charparam assignment
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				setGameMode('freebattle')
 				select.f_selectSimple()
 			end
 			--VS 100 KUMITE
@@ -2067,21 +2215,32 @@ function main.f_mainExtras()
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
 				main.p2In = 1
 				main.p2SelectMenu = false
-				main.gameMode = t[item].itemname
+				main.t_charparam.stage = true
+				main.t_charparam.music = true
+				main.t_charparam.zoom = true
+				main.t_charparam.ai = true
+				main.t_charparam.time = true
+				main.t_charparam.onlyme = true
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
-				select.f_selectAdvance()
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				setGameMode('100kumite')
+				select.f_selectArranged()
 			end
 			--BOSS RUSH
 			if t[item].itemname == 'bossrush' then
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
 				main.p2In = 1
 				main.p2SelectMenu = false
-				main.credits = 0
-				main.gameMode = t[item].itemname
+				main.t_charparam.stage = true
+				main.t_charparam.music = true
+				main.t_charparam.zoom = true
+				main.t_charparam.ai = true
+				main.t_charparam.time = true
+				main.t_charparam.onlyme = true
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
-				select.f_selectAdvance()
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				setGameMode('bossrush')
+				select.f_selectArranged()
 			end
 			--BONUS GAMES
 			if t[item].itemname == 'bonusgames' then
@@ -2101,10 +2260,13 @@ function main.f_mainExtras()
 				end
 			end
 			--DEMO
-			if t[item].itemname == 'demo' then
+			if t[item].itemname == 'randomtest' then
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				clearColor(motif.titlebgdef.bgclearcolor[1], motif.titlebgdef.bgclearcolor[2], motif.titlebgdef.bgclearcolor[3])
+				setGameMode('randomtest')
 				randomtest.run()
+				main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
 			end
 			--BACK
 			if t[item].itemname == 'extrasback' then
@@ -2112,7 +2274,7 @@ function main.f_mainExtras()
 				break
 			end
 		end
-		main.f_menuCommon2(cursorPosY, moveTxt, item, t)
+		main.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
 	end
 end
 
@@ -2130,7 +2292,7 @@ for i = 1, #main.t_bonusChars do
 	}
 end
 if motif.title_info.menu_itemname_bonusback ~= '' then
-	t_bonusExtras[#t_bonusExtras + 1] = {data = textImgNew(), itemname = 'bonusback', displayname = motif.title_info.menu_itemname_bonusback}
+	table.insert(t_bonusExtras, {data = textImgNew(), itemname = 'bonusback', displayname = motif.title_info.menu_itemname_bonusback})
 end
 
 function main.f_bonusExtras()
@@ -2140,7 +2302,7 @@ function main.f_bonusExtras()
 	local item = 1
 	local t = t_bonusExtras
 	while true do
-		cursorPosY, moveTxt, item = main.f_menuCommon1(cursorPosY, moveTxt, item, t)
+		cursorPosY, moveTxt, item = main.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 		if esc() then
 			sndPlay(motif.files.snd_data, motif.title_info.cancel_snd[1], motif.title_info.cancel_snd[2])
 			break
@@ -2153,17 +2315,25 @@ function main.f_bonusExtras()
 			--BONUS CHAR NAME
 			else
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
-				main.versusScreen = false
 				main.p2In = 1
+				main.versusScreen = false
+				main.t_charparam.stage = true
+				main.t_charparam.music = true
+				main.t_charparam.zoom = true
+				main.t_charparam.ai = true
+				main.t_charparam.rounds = true
+				main.t_charparam.time = true
+				main.t_charparam.onlyme = true
 				main.p1TeamMenu = {mode = 0, chars = 1}
 				main.p2TeamMenu = {mode = 0, chars = 1}
 				main.p2Char = {main.t_bonusChars[item]}
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				setGameMode('bonus')
 				select.f_selectSimple()
 			end
 		end
-		main.f_menuCommon2(cursorPosY, moveTxt, item, t)
+		main.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
 	end
 end
 
@@ -2177,7 +2347,7 @@ local t_mainTournament = {
 	{data = textImgNew(), itemname = 'tourney4', displayname = motif.title_info.menu_itemname_tourney4, selectname = motif.select_info.title_text_tourney4},
 	{data = textImgNew(), itemname = 'tourneyback', displayname = motif.title_info.menu_itemname_tourneyback},
 }
-t_mainTournament = main.f_cleanTable(t_mainTournament)
+t_mainTournament = main.f_cleanTable(t_mainTournament, main.t_sort.title_info)
 
 function main.f_mainTournament()
 	main.f_cmdInput()
@@ -2186,7 +2356,7 @@ function main.f_mainTournament()
 	local item = 1
 	local t = t_mainTournament
 	while true do
-		cursorPosY, moveTxt, item = main.f_menuCommon1(cursorPosY, moveTxt, item, t)
+		cursorPosY, moveTxt, item = main.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 		if esc() then
 			sndPlay(motif.files.snd_data, motif.title_info.cancel_snd[1], motif.title_info.cancel_snd[2])
 			break
@@ -2195,34 +2365,62 @@ function main.f_mainTournament()
 			--ROUND OF 32
 			if t[item].itemname == 'tourney32' then
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
-				main.gameMode = t[item].itemname
+				main.t_charparam.stage = true
+				main.t_charparam.music = true
+				main.t_charparam.zoom = true
+				main.t_charparam.ai = true
+				main.t_charparam.rounds = true
+				main.t_charparam.time = true
+				main.t_charparam.onlyme = true
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
-				select.f_selectTournament()
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				setGameMode('tournament')
+				select.f_selectTournament(32)
 			end
 			--ROUND OF 16
 			if t[item].itemname == 'tourney16' then
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
-				main.gameMode = t[item].itemname
+				main.t_charparam.stage = true
+				main.t_charparam.music = true
+				main.t_charparam.zoom = true
+				main.t_charparam.ai = true
+				main.t_charparam.rounds = true
+				main.t_charparam.time = true
+				main.t_charparam.onlyme = true
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
-				select.f_selectTournament()
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				setGameMode('tournament')
+				select.f_selectTournament(16)
 			end
 			--QUARTERFINALS
 			if t[item].itemname == 'tourney8' then
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
-				main.gameMode = t[item].itemname
+				main.t_charparam.stage = true
+				main.t_charparam.music = true
+				main.t_charparam.zoom = true
+				main.t_charparam.ai = true
+				main.t_charparam.rounds = true
+				main.t_charparam.time = true
+				main.t_charparam.onlyme = true
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
-				select.f_selectTournament()
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				setGameMode('tournament')
+				select.f_selectTournament(8)
 			end
 			--SEMIFINALS
 			if t[item].itemname == 'tourney4' then
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
-				main.gameMode = t[item].itemname
+				main.t_charparam.stage = true
+				main.t_charparam.music = true
+				main.t_charparam.zoom = true
+				main.t_charparam.ai = true
+				main.t_charparam.rounds = true
+				main.t_charparam.time = true
+				main.t_charparam.onlyme = true
 				textImgSetText(main.txt_mainSelect, t[item].selectname)
-				main.f_menuFadeOut(cursorPosY, moveTxt, item, t)
-				select.f_selectTournament()
+				main.f_menuFade('title_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				setGameMode('tournament')
+				select.f_selectTournament(4)
 			end
 			--BACK
 			if t[item].itemname == 'tourneyback' then
@@ -2230,20 +2428,17 @@ function main.f_mainTournament()
 				break
 			end
 		end
-		main.f_menuCommon2(cursorPosY, moveTxt, item, t)
+		main.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
 	end
 end
 
 --;===========================================================
 --; INITIALIZE LOOPS
 --;===========================================================
-
 -- Now that everithig is loaded we can enable GC back.
 SetGCPercent(100)
--------------------------------------------------------------
 
 main.f_mainMenu()
 
-
 -- Debug Info
-main.f_printTable(main, "debug/t_main.txt")
+--main.f_printTable(main, "debug/t_main.txt")

--- a/script/motif.lua
+++ b/script/motif.lua
@@ -1,10 +1,50 @@
 --;===========================================================
+--; LOCALCOORD VALUES
+--;===========================================================
+
+local def = config.Motif
+if main.flags['-r'] ~= nil then
+	local case = main.flags['-r']:lower()
+	if case:match('^data[/\\]') and main.f_fileExists(main.flags['-r']) then
+		def = main.flags['-r']
+	elseif case:match('%.def$') and main.f_fileExists('data/' .. main.flags['-r']) then
+		def = 'data/' .. main.flags['-r']
+	elseif main.f_fileExists('data/' .. main.flags['-r'] .. '/system.def') then
+		def = 'data/' .. main.flags['-r'] .. '/system.def'
+	end
+end
+
+local file = io.open(def, 'r')
+local s_file = file:read("*all")
+file:close()
+local localX, localY = s_file:match('localcoord%s*=%s*(%d+)%s*,%s*(%d+)')
+--local scaleX = 1
+--local scaleY = 1
+if localX ~= nil then
+	localX = tonumber(localX)
+	--scaleX = localX / 320
+else
+	localX = 320
+end
+if localY ~= nil then
+	localY = tonumber(localY)
+	--scaleY = localY / 240
+else
+	localY = 240
+end
+--local coords_fix = 0
+--if scaleY > 1 then
+--	coords_fix = math.floor(scaleY - 1)
+--end
+
+--;===========================================================
 --; DEFAULT VALUES
 --;===========================================================
 --This pre-made table (3/4 of the whole file) contains all default values used in screenpack. New table from parsed DEF file is merged on top of this one.
 --This is important because there are more params available in Ikemen. Whole screenpack code refers to these values.
 local motif =
 {
+	def = def,
 	info =
 	{
 		name = 'Default',
@@ -22,20 +62,15 @@ local motif =
 		intro_storyboard = '',
 		select = 'data/select.def',
 		fight = 'data/fight.def',
-		debug_font = 'font/f-6x9.fnt', --Ikemen feature
+		debug_font = 'f-6x9.def', --Ikemen feature
 		debug_script = 'script/debug.lua', --Ikemen feature
-		font = --FNT v2 fonts not supported yet
+		font =
 		{
-			[1] = 'font/f-4x6.fnt',
-			[2] = 'font/f-6x9.fnt',
-			[3] = 'font/jg.fnt',
-		},
-		font_height = --Truetype fonts not supported yet
-		{
-			[1] = nil,
-			[2] = nil,
-			[3] = nil,
+			[1] = 'f-4x6.def',
+			[2] = 'f-6x9.def',
+			[3] = 'jg.fnt',
 		},
+		font_height = {}
 	},
 	ja_files = {}, --not used in Ikemen
 	music =
@@ -43,43 +78,48 @@ local motif =
 		title_bgm = '',
 		title_bgm_volume = 100,
 		title_bgm_loop = 1,
-		title_bgm_loopstart = nil,
-		title_bgm_loopend = nil,
+		title_bgm_loopstart = 0,
+		title_bgm_loopend = 0,
 		select_bgm = '',
 		select_bgm_volume = 100,
 		select_bgm_loop = 1,
-		select_bgm_loopstart = nil,
-		select_bgm_loopend = nil,
+		select_bgm_loopstart = 0,
+		select_bgm_loopend = 0,
 		vs_bgm = '',
 		vs_bgm_volume = 100,
 		vs_bgm_loop = 1,
-		vs_bgm_loopstart = nil,
-		vs_bgm_loopend = nil,
+		vs_bgm_loopstart = 0,
+		vs_bgm_loopend = 0,
 		victory_bgm = '',
 		victory_bgm_volume = 100,
 		victory_bgm_loop = 1,
-		victory_bgm_loopstart = nil,
-		victory_bgm_loopend = nil,
+		victory_bgm_loopstart = 0,
+		victory_bgm_loopend = 0,
+		option_bgm = '', --Ikemen feature
+		option_bgm_volume = 100, --Ikemen feature
+		option_bgm_loop = 1, --Ikemen feature
+		option_bgm_loopstart = 0, --Ikemen feature
+		option_bgm_loopend = 0, --Ikemen feature
 		continue_bgm = 'sound/CONTINUE.ogg', --Ikemen feature
 		continue_bgm_volume = 100, --Ikemen feature
 		continue_bgm_loop = 1, --Ikemen feature
-		continue_bgm_loopstart = nil, --Ikemen feature
-		continue_bgm_loopend = nil, --Ikemen feature
+		continue_bgm_loopstart = 0, --Ikemen feature
+		continue_bgm_loopend = 0, --Ikemen feature
 		continue_end_bgm = 'sound/GAME_OVER.ogg', --Ikemen feature
 		continue_end_bgm_volume = 100, --Ikemen feature
 		continue_end_bgm_loop = 0, --Ikemen feature
-		continue_end_bgm_loopstart = nil, --Ikemen feature
-		continue_end_bgm_loopend = nil, --Ikemen feature
+		continue_end_bgm_loopstart = 0, --Ikemen feature
+		continue_end_bgm_loopend = 0, --Ikemen feature
 		results_bgm = '', --Ikemen feature
 		results_bgm_volume = 100, --Ikemen feature
 		results_bgm_loop = 1, --Ikemen feature
-		results_bgm_loopstart = nil, --Ikemen feature
-		results_bgm_loopend = nil, --Ikemen feature
+		results_bgm_loopstart = 0, --Ikemen feature
+		results_bgm_loopend = 0, --Ikemen feature
 		tournament_bgm = '', --Ikemen feature
 		tournament_bgm_volume = 100, --Ikemen feature
 		tournament_bgm_loop = 1, --Ikemen feature
-		tournament_bgm_loopstart = nil, --Ikemen feature
-		tournament_bgm_loopend = nil, --Ikemen feature
+		tournament_bgm_loopstart = 0, --Ikemen feature
+		tournament_bgm_loopend = 0, --Ikemen feature
 	},
 	title_info =
 	{
@@ -87,52 +127,56 @@ local motif =
 		fadein_col = {0, 0, 0}, --Ikemen feature
 		fadeout_time = 10,
 		fadeout_col = {0, 0, 0}, --Ikemen feature
-		loading_offset = {310, 230}, --Ikemen feature
-		loading_font = {'font/f-4x6.fnt', 7, -1, nil, nil, nil}, --Ikemen feature
+		loading_offset = {localX - 10, localY - 10}, --Ikemen feature (310, 230)
+		loading_font = {'f-4x6.def', 7, -1, 255, 255, 255, 255, 0}, --Ikemen feature
 		loading_font_scale = {1.0, 1.0}, --Ikemen feature
 		loading_text = 'LOADING...', --Ikemen feature
-		footer1_offset = {2, 240}, --Ikemen feature
-		footer1_font = {'font/f-4x6.fnt', 7, 1, nil, nil, nil}, --Ikemen feature
+		footer1_offset = {2, localY}, --Ikemen feature (2, 240)
+		footer1_font = {'f-4x6.def', 7, 1, 255, 255, 255, 255, 0}, --Ikemen feature
 		footer1_font_scale = {1.0, 1.0}, --Ikemen feature
-		footer1_text = 'I.K.E.M.E.N. by SUEHIRO', --Ikemen feature
-		footer2_offset = {160, 240}, --Ikemen feature
-		footer2_font = {'font/f-4x6.fnt', 7, 0, nil, nil, nil}, --Ikemen feature
+		footer1_text = 'I.K.E.M.E.N. GO', --Ikemen feature
+		footer2_offset = {localX / 2, localY}, --Ikemen feature (160, 240)
+		footer2_font = {'f-4x6.def', 7, 0, 255, 255, 255, 255, 0}, --Ikemen feature
 		footer2_font_scale = {1.0, 1.0}, --Ikemen feature
-		footer2_text = '', --Ikemen feature
-		footer3_offset = {319, 240}, --Ikemen feature
-		footer3_font = {'font/f-4x6.fnt', 7, -1, nil, nil, nil}, --Ikemen feature
+		footer2_text = 'Press F1 for info', --Ikemen feature
+		footer3_offset = {localX - 1, localY}, --Ikemen feature (319, 240)
+		footer3_font = {'f-4x6.def', 7, -1, 255, 255, 255, 255, 0}, --Ikemen feature
 		footer3_font_scale = {1.0, 1.0}, --Ikemen feature
-		footer3_text = 'https://osdn.net/users/supersuehiro/', --Ikemen feature
-		footer_boxbackground_visible = 1, --Ikemen feature
-		footer_boxbackground_coords = {0, 233, 319, 239}, --Ikemen feature
-		footer_boxbackground_alpha = {255, 100}, --Ikemen feature
+		footer3_text = 'Plus v0.9', --Ikemen feature
+		footer_boxbg_visible = 1, --Ikemen feature
+		footer_boxbg_coords = {0, localY - 7, localX - 1, localY - 1}, --Ikemen feature (0, 233, 319, 239)
+		footer_boxbg_col = {0, 0, 64}, --Ikemen feature
+		footer_boxbg_alpha = {255, 100}, --Ikemen feature
 		connecting_offset = {10, 40}, --Ikemen feature
-		connecting_font = {'font/f-6x9.fnt', 0, 1, nil, nil, nil}, --Ikemen feature
+		connecting_font = {'f-6x9.def', 0, 1, 255, 255, 255, 255, 0}, --Ikemen feature
 		connecting_font_scale = {1.0, 1.0}, --Ikemen feature
-		connecting_host = 'Waiting for player 2... (%s)', --Ikemen feature
-		connecting_join = 'Now connecting... (%s)', --Ikemen feature
-		input_ip_name = 'Enter Host display name, e.g. John.\nExisting entries can be removed with DELETE button.', --Ikemen feature
-		input_ip_address = 'Enter Host IP address, e.g. 127.0.0.1\nCopied text can be pasted with INSERT button.', --Ikemen feature
+		connecting_host_text = 'Waiting for player 2... (%s)', --Ikemen feature
+		connecting_join_text = 'Now connecting... (%s)', --Ikemen feature
+		connecting_boxbg_coords = {0, 0, localX, localY}, --Ikemen feature (0, 0, 320, 240)
+		connecting_boxbg_col = {0, 0, 0}, --Ikemen feature
+		connecting_boxbg_alpha = {20, 100}, --Ikemen feature
+		input_ip_name_text = 'Enter Host display name, e.g. John.\nExisting entries can be removed with DELETE button.', --Ikemen feature
+		input_ip_address_text = 'Enter Host IP address, e.g. 127.0.0.1\nCopied text can be pasted with INSERT button.', --Ikemen feature
 		menu_pos = {159, 158},
-		menu_item_font = {'font/f-6x9.fnt', 7, 0, nil, nil, nil},
-		menu_item_font_scale = {1.0, 1.0},
-		menu_item_active_font = {'font/f-6x9.fnt', 0, 0, nil, nil, nil},
-		menu_item_active_font_scale = {1.0, 1.0},
+		menu_item_font = {'f-6x9.def', 7, 0, 255, 255, 255, 255, 0},
+		menu_item_font_scale = {1.0, 1.0}, --broken parameter in mugen 1.1: http://mugenguild.com/forum/msg.1905756
+		menu_item_active_font = {'f-6x9.def', 0, 0, 255, 255, 255, 255, 0},
+		menu_item_active_font_scale = {1.0, 1.0}, --broken parameter in mugen 1.1: http://mugenguild.com/forum/msg.1905756
 		menu_item_spacing = {0, 13},
 		menu_itemname_arcade = 'ARCADE',
 		menu_itemname_versus = 'VS MODE',
-		menu_itemname_online = 'NETWORK', --Ikemen feature
-		menu_itemname_teamarcade = 'TEAM ARCADE', --not used in Ikemen (same as ARCADE)
-		menu_itemname_teamversus = 'TEAM VS', --not used in Ikemen (same as VS MODE)
+		menu_itemname_teamarcade = 'TEAM ARCADE',
+		menu_itemname_teamversus = 'TEAM VERSUS',
+		menu_itemname_online = '', --Ikemen feature (NETWORK)
 		menu_itemname_teamcoop = 'TEAM CO-OP',
 		menu_itemname_survival = 'SURVIVAL',
 		menu_itemname_survivalcoop = 'SURVIVAL CO-OP',
-		menu_itemname_storymode = 'STORY MODE', --Ikemen feature (not implemented yet)
-		menu_itemname_timeattack = 'TIME ATTACK', --Ikemen feature (not implemented yet)
-		menu_itemname_tournament = 'TOURNAMENT', --Ikemen feature
+		menu_itemname_storymode = '', --Ikemen feature (STORY MODE, not implemented yet)
+		menu_itemname_timeattack = '', --Ikemen feature (TIME ATTACK, not implemented yet)
+		menu_itemname_tournament = '', --Ikemen feature (TOURNAMENT, not implemented yet)
 		menu_itemname_training = 'TRAINING',
 		menu_itemname_watch = 'WATCH',
-		menu_itemname_extras = 'EXTRAS', --Ikemen feature
+		menu_itemname_extras = '', --Ikemen feature (EXTRAS)
 		menu_itemname_options = 'OPTIONS',
 		menu_itemname_exit = 'EXIT',
 		menu_itemname_netplayversus = 'VS MODE', --Ikemen feature
@@ -147,7 +191,7 @@ local motif =
 		menu_itemname_bonusgames = 'BONUS GAMES', --Ikemen feature
 		menu_itemname_scoreranking = 'SCORE RANKING', --Ikemen feature (not implemented yet)
 		menu_itemname_replay = 'REPLAY', --Ikemen feature
-		menu_itemname_demo = 'DEMO', --Ikemen feature
+		menu_itemname_randomtest = 'DEMO', --Ikemen feature
 		menu_itemname_extrasback = 'BACK', --Ikemen feature
 		menu_itemname_bonusback = 'BACK', --Ikemen feature
 		menu_itemname_tourney32 = 'ROUND OF 32', --Ikemen feature
@@ -164,6 +208,8 @@ local motif =
 		menu_window_visibleitems = 5,
 		menu_boxcursor_visible = 1,
 		menu_boxcursor_coords = {-40, -10, 39, 2},
+		menu_boxcursor_col = {255, 255, 255}, --Ikemen feature
+		menu_boxcursor_alpharange = {10, 40, 2, 255, 255, 0}, --Ikemen feature
 		cursor_move_snd = {100, 0},
 		cursor_done_snd = {100, 1},
 		cancel_snd = {100, 2},
@@ -172,21 +218,21 @@ local motif =
 	{
 		spr = '',
 		bgclearcolor = {0, 0, 0},
-		bg = {},
-		timer = 0, --Ikemen feature
 	},
 	infobox =
 	{
-		title = 'I.K.E.M.E.N', --Ikemen feature
+		title = '', --Ikemen feature
 		title_pos = {159, 13}, --Ikemen feature
-		title_font = {'font/f-6x9.fnt', 0, 0, nil, nil, nil}, --Ikemen feature
+		title_font = {'f-6x9.def', 0, 0, 255, 255, 255, 255, 0}, --Ikemen feature
 		title_font_scale = {1.0, 1.0}, --Ikemen feature
-		text = "Welcome to I.K.E.M.E.N beta!\n* This is a public development release, for testing purposes.\n* This build isn't stable and may contain bugs and incomplete features.\n* Your help and cooperation are appreciated!\n* Source code: https://osdn.net/users/supersuehiro/\n* Ikemen Plus feedback:\n  http://mugenguild.com/forum/topics/ikemen-plus-181972.200.html", --Ikemen feature (requires new 'text = ' entry under [Infobox] section)
+		text = "Welcome to SUEHIRO's I.K.E.M.E.N GO engine!\n\n* This is a public development release, for testing purposes.\n* This build may contain bugs and incomplete features.\n* Your help and cooperation are appreciated!\n* I.K.E.M.E.N GO source code: https://osdn.net/users/supersuehiro/\n* Ikemen GO Plus source code: https://github.com/K4thos/Ikemen-GO-Plus", --Ikemen feature (requires new 'text = ' entry under [Infobox] section)
 		text_pos = {25, 30}, --Ikemen feature
-		text_font = {'font/f-4x6.fnt', 7, 1, nil, nil, nil}, --Ikemen feature
+		text_font = {'f-4x6.def', 7, 1, 255, 255, 255, 255, 0}, --Ikemen feature
 		text_font_scale = {1.0, 1.0}, --Ikemen feature
 		text_spacing = {0, 10}, --Ikemen feature
-		background_alpha = {20, 100}, --Ikemen feature
+		boxbg_coords = {0, 0, localX, localY}, --Ikemen feature (0, 0, 320, 240)
+		boxbg_col = {0, 0, 0}, --Ikemen feature
+		boxbg_alpha = {20, 100}, --Ikemen feature
 	},
 	infobox_text = '', --not used in Ikemen
 	ja_infobox_text = '', --not used in Ikemen
@@ -211,19 +257,17 @@ local motif =
 		searchemptyboxesup = 0, --Ikemen feature
 		searchemptyboxesdown = 0, --Ikemen feature
 		cell_size = {27, 27},
-		cell_spacing = 2,
+		cell_spacing = {2, 2}, --Ikemen feature (optionally accepts x, y values instead of a single one for both coordinates)
 		--cell_bg_anim = nil,
 		cell_bg_spr = {},
 		cell_bg_offset = {0, 0},
 		cell_bg_facing = 1,
 		cell_bg_scale = {1.0, 1.0},
-		--cell_bg_alpha = {}, --Ikemen feature (not implemented yet)
 		--cell_random_anim = nil,
 		cell_random_spr = {},
 		cell_random_offset = {0, 0},
 		cell_random_facing = 1,
 		cell_random_scale = {1.0, 1.0},
-		--cell_random_alpha = {}, --Ikemen feature (not implemented yet)
 		cell_random_switchtime = 4,
 		p1_cursor_startcell = {0, 0},
 		--p1_cursor_active_anim = nil,
@@ -262,10 +306,12 @@ local motif =
 		portrait_offset = {0, 0}, --not supported yet
 		portrait_scale = {1.0, 1.0},
 		title_offset = {0, 0},
-		title_font = {'font/jg.fnt', 0, 0, nil, nil, nil},
+		title_font = {'jg.fnt', 0, 0, 255, 255, 255, 255, 0},
 		title_font_scale = {1.0, 1.0},
 		title_text_arcade = 'Arcade', --Ikemen feature
 		title_text_versus = 'Versus Mode', --Ikemen feature
+		title_text_teamarcade = 'Team Arcade', --Ikemen feature
+		title_text_teamversus = 'Team Versus', --Ikemen feature
 		title_text_teamcoop = 'Team Cooperative', --Ikemen feature
 		title_text_survival = 'Survival', --Ikemen feature
 		title_text_survivalcoop = 'Survival Cooperative', --Ikemen feature
@@ -291,37 +337,61 @@ local motif =
 		p1_face_facing = 1,
 		p1_face_scale = {1.0, 1.0},
 		p1_face_window = {0, 0, 0, 0},
-		p1_face_spacing = {0, 0}, --Ikemen feature
 		p1_face_num = 1, --Ikemen feature
+		p1_face_spacing = {0, 0}, --Ikemen feature
+		p1_c1_face_offset = {0, 0}, --Ikemen feature
+		p1_c1_face_scale = {1.0, 1.0}, --Ikemen feature
+		p1_c2_face_offset = {0, 0}, --Ikemen feature
+		p1_c2_face_scale = {1.0, 1.0}, --Ikemen feature
+		p1_c3_face_offset = {0, 0}, --Ikemen feature
+		p1_c3_face_scale = {1.0, 1.0}, --Ikemen feature
+		p1_c4_face_offset = {0, 0}, --Ikemen feature
+		p1_c4_face_scale = {1.0, 1.0}, --Ikemen feature
 		p2_face_spr = {9000, 1},
 		p2_face_offset = {0, 0},
 		p2_face_facing = -1,
 		p2_face_scale = {1.0, 1.0},
 		p2_face_window = {0, 0, 0, 0},
-		p2_face_spacing = {0, 0}, --Ikemen feature
 		p2_face_num = 1, --Ikemen feature
+		p2_face_spacing = {0, 0}, --Ikemen feature
+		p2_c1_face_offset = {0, 0}, --Ikemen feature
+		p2_c1_face_scale = {1.0, 1.0}, --Ikemen feature
+		p2_c2_face_offset = {0, 0}, --Ikemen feature
+		p1_c2_face_scale = {1.0, 1.0}, --Ikemen feature
+		p2_c3_face_offset = {0, 0}, --Ikemen feature
+		p2_c3_face_scale = {1.0, 1.0}, --Ikemen feature
+		p2_c4_face_offset = {0, 0}, --Ikemen feature
+		p2_c4_face_scale = {1.0, 1.0}, --Ikemen feature
 		p1_name_offset = {0, 0},
-		p1_name_font = {'font/jg.fnt', 4, 1, nil, nil, nil},
+		p1_name_font = {'jg.fnt', 4, 1, 255, 255, 255, 255, 0},
 		p1_name_font_scale = {1.0, 1.0},
 		p1_name_spacing = {0, 14},
 		p2_name_offset = {0, 0},
-		p2_name_font = {'font/jg.fnt', 1, -1, nil, nil, nil},
+		p2_name_font = {'jg.fnt', 1, -1, 255, 255, 255, 255, 0},
 		p2_name_font_scale = {1.0, 1.0},
 		p2_name_spacing = {0, 14},
 		stage_pos = {0, 0},
-		stage_active_font = {'font/f-4x6.fnt', 0, 0, nil, nil, nil},
+		stage_active_font = {'f-4x6.def', 0, 0, 255, 255, 255, 255, 0},
 		stage_active_font_scale = {1.0, 1.0},
-		stage_active2_font = {'font/f-4x6.fnt', 0, 0, nil, nil, nil},
+		stage_active2_font = {'f-4x6.def', 0, 0, 255, 255, 255, 255, 0},
 		stage_active2_font_scale = {1.0, 1.0},
-		stage_done_font = {'font/f-4x6.fnt', 0, 0, nil, nil, nil},
+		stage_done_font = {'f-4x6.def', 0, 0, 255, 255, 255, 255, 0},
 		stage_done_font_scale = {1.0, 1.0},
 		stage_text = 'Stage %i: %s', --Ikemen feature
+		stage_random_text = 'Stage: Random', --Ikemen feature
 		stage_text_spacing = {0, 14}, --Ikemen feature
+		stage_portrait_spr = {9000, 0}, --Ikemen feature
+		stage_portrait_offset = {0, 0}, --Ikemen feature
+		stage_portrait_scale = {1.0, 1.0}, --Ikemen feature
+		stage_portrait_random_spr = {}, --Ikemen feature
+		--stage_portrait_random_anim = nil, --Ikemen feature
+		stage_portrait_random_offset = {0, 0}, --Ikemen feature
+		stage_portrait_random_scale = {1.0, 1.0}, --Ikemen feature
 		teammenu_move_wrapping = 1,
 		teammenu_itemname_single = 'Single', --Ikemen feature
 		teammenu_itemname_simul = 'Simul', --Ikemen feature
 		teammenu_itemname_turns = 'Turns', --Ikemen feature
-		teammenu_itemname_tag = 'Tag', --Ikemen feature
+		teammenu_itemname_tag = '', --Ikemen feature (Tag)
 		p1_teammenu_pos = {0, 0},
 		--p1_teammenu_bg_anim = nil,
 		p1_teammenu_bg_spr = {},
@@ -333,7 +403,7 @@ local motif =
 		p1_teammenu_selftitle_offset = {0, 0},
 		p1_teammenu_selftitle_facing = 1,
 		p1_teammenu_selftitle_scale = {1.0, 1.0},
-		p1_teammenu_selftitle_font = {'font/jg.fnt', 0, 1, nil, nil, nil},
+		p1_teammenu_selftitle_font = {'jg.fnt', 0, 1, 255, 255, 255, 255, 0},
 		p1_teammenu_selftitle_font_scale = {1.0, 1.0},
 		p1_teammenu_selftitle_text = '',
 		--p1_teammenu_enemytitle_anim = nil,
@@ -341,7 +411,7 @@ local motif =
 		p1_teammenu_enemytitle_offset = {0, 0},
 		p1_teammenu_enemytitle_facing = 1,
 		p1_teammenu_enemytitle_scale = {1.0, 1.0},
-		p1_teammenu_enemytitle_font = {'font/jg.fnt', 0, 1, nil, nil, nil},
+		p1_teammenu_enemytitle_font = {'jg.fnt', 0, 1, 255, 255, 255, 255, 0},
 		p1_teammenu_enemytitle_font_scale = {1.0, 1.0},
 		p1_teammenu_enemytitle_text = '',
 		p1_teammenu_move_snd = {100, 0},
@@ -350,11 +420,11 @@ local motif =
 		p1_teammenu_item_offset = {0, 0},
 		p1_teammenu_item_spacing = {0, 15},
 		p1_teammenu_item_font_offset = {0, 0}, --Ikemen feature
-		p1_teammenu_item_font = {'font/jg.fnt', 0, 1, nil, nil, nil},
+		p1_teammenu_item_font = {'jg.fnt', 0, 1, 255, 255, 255, 255, 0},
 		p1_teammenu_item_font_scale = {1.0, 1.0},
-		p1_teammenu_item_active_font = {'font/jg.fnt', 3, 1, nil, nil, nil},
+		p1_teammenu_item_active_font = {'jg.fnt', 3, 1, 255, 255, 255, 255, 0},
 		p1_teammenu_item_active_font_scale = {1.0, 1.0},
-		p1_teammenu_item_active2_font = {'font/jg.fnt', 0, 1, nil, nil, nil},
+		p1_teammenu_item_active2_font = {'jg.fnt', 0, 1, 255, 255, 255, 255, 0},
 		p1_teammenu_item_active2_font_scale = {1.0, 1.0},
 		--p1_teammenu_item_cursor_anim = nil,
 		p1_teammenu_item_cursor_spr = {},
@@ -383,7 +453,7 @@ local motif =
 		p2_teammenu_selftitle_offset = {0, 0},
 		p2_teammenu_selftitle_facing = 1,
 		p2_teammenu_selftitle_scale = {1.0, 1.0},
-		p2_teammenu_selftitle_font = {'font/jg.fnt', 0, -1, nil, nil, nil},
+		p2_teammenu_selftitle_font = {'jg.fnt', 0, -1, 255, 255, 255, 255, 0},
 		p2_teammenu_selftitle_font_scale = {1.0, 1.0},
 		p2_teammenu_selftitle_text = '',
 		--p2_teammenu_enemytitle_anim = nil,
@@ -391,7 +461,7 @@ local motif =
 		p2_teammenu_enemytitle_offset = {0, 0},
 		p2_teammenu_enemytitle_facing = 1,
 		p2_teammenu_enemytitle_scale = {1.0, 1.0},
-		p2_teammenu_enemytitle_font = {'font/jg.fnt', 0, -1, nil, nil, nil},
+		p2_teammenu_enemytitle_font = {'jg.fnt', 0, -1, 255, 255, 255, 255, 0},
 		p2_teammenu_enemytitle_font_scale = {1.0, 1.0},
 		p2_teammenu_enemytitle_text = '',
 		p2_teammenu_move_snd = {100, 0},
@@ -400,11 +470,11 @@ local motif =
 		p2_teammenu_item_offset = {0, 0},
 		p2_teammenu_item_spacing = {0, 15},
 		p2_teammenu_item_font_offset = {0, 0}, --Ikemen feature
-		p2_teammenu_item_font = {'font/jg.fnt', 0, -1, nil, nil, nil},
+		p2_teammenu_item_font = {'jg.fnt', 0, -1, 255, 255, 255, 255, 0},
 		p2_teammenu_item_font_scale = {1.0, 1.0},
-		p2_teammenu_item_active_font = {'font/jg.fnt', 1, -1, nil, nil, nil},
+		p2_teammenu_item_active_font = {'jg.fnt', 1, -1, 255, 255, 255, 255, 0},
 		p2_teammenu_item_active_font_scale = {1.0, 1.0},
-		p2_teammenu_item_active2_font = {'font/jg.fnt', 0, -1, nil, nil, nil},
+		p2_teammenu_item_active2_font = {'jg.fnt', 0, -1, 255, 255, 255, 255, 0},
 		p2_teammenu_item_active2_font_scale = {1.0, 1.0},
 		--p2_teammenu_item_cursor_anim = nil,
 		p2_teammenu_item_cursor_spr = {},
@@ -427,8 +497,6 @@ local motif =
 	{
 		spr = '',
 		bgclearcolor = {0, 0, 0},
-		bg = {},
-		timer = 0, --Ikemen feature
 	},
 	vs_screen =
 	{
@@ -440,37 +508,53 @@ local motif =
 		time_order = 60, --Ikemen feature
 		match_text = 'Match %i',
 		match_offset = {159, 12},
-		match_font = {'font/jg.fnt', 0, 0, nil, nil, nil},
+		match_font = {'jg.fnt', 0, 0, 255, 255, 255, 255, 0},
 		match_font_scale = {1.0, 1.0},
 		p1_pos = {0, 0},
 		p1_spr = {9000, 1},
 		p1_offset = {0, 0},
 		p1_facing = 1,
 		p1_scale = {1.0, 1.0},
-		p1_window = {0, 0, 0, 0},
-		p1_spacing = {0, 0}, --Ikemen feature
+		--p1_window = {0, 0, 0, 0}, --not implemented yet
 		p1_num = 1, --Ikemen feature
+		p1_spacing = {0, 0}, --Ikemen feature
+		p1_c1_offset = {0, 0}, --Ikemen feature
+		p1_c1_scale = {1.0, 1.0}, --Ikemen feature
+		p1_c2_offset = {0, 0}, --Ikemen feature
+		p1_c2_scale = {1.0, 1.0}, --Ikemen feature
+		p1_c3_offset = {0, 0}, --Ikemen feature
+		p1_c3_scale = {1.0, 1.0}, --Ikemen feature
+		p1_c4_offset = {0, 0}, --Ikemen feature
+		p1_c4_scale = {1.0, 1.0}, --Ikemen feature
 		p2_pos = {0, 0},
-		p2_spr = {9000, 1},
+		p2_spr = {9000, 1}, --not used in Ikemen (same as p1_spr)
 		p2_offset = {0, 0},
 		p2_facing = -1,
 		p2_scale = {1.0, 1.0},
-		p2_window = {0, 0, 0, 0},
-		p2_spacing = {0, 0}, --Ikemen feature
+		--p2_window = {0, 0, 0, 0}, --not implemented yet
 		p2_num = 1, --Ikemen feature
+		p2_spacing = {0, 0}, --Ikemen feature
+		p2_c1_offset = {0, 0}, --Ikemen feature
+		p2_c1_scale = {1.0, 1.0}, --Ikemen feature
+		p2_c2_offset = {0, 0}, --Ikemen feature
+		p2_c2_scale = {1.0, 1.0}, --Ikemen feature
+		p2_c3_offset = {0, 0}, --Ikemen feature
+		p2_c3_scale = {1.0, 1.0}, --Ikemen feature
+		p2_c4_offset = {0, 0}, --Ikemen feature
+		p2_c4_scale = {1.0, 1.0}, --Ikemen feature
 		p1_name_pos = {0, 0},
 		p1_name_offset = {0, 0},
-		p1_name_font = {'font/jg.fnt', 0, 0, nil, nil, nil},
+		p1_name_font = {'jg.fnt', 0, 0, 255, 255, 255, 255, 0},
 		p1_name_font_scale = {1.0, 1.0},
 		p1_name_spacing = {0, 14},
 		p2_name_pos = {0, 0},
 		p2_name_offset = {0, 0},
-		p2_name_font = {'font/jg.fnt', 0, 0, nil, nil, nil},
+		p2_name_font = {'jg.fnt', 0, 0, 255, 255, 255, 255, 0},
 		p2_name_font_scale = {1.0, 1.0},
 		p2_name_spacing = {0, 14},
-		--p1_name_active_font = {'font/jg.fnt', 0, 0, nil, nil, nil}, --Ikemen feature
+		--p1_name_active_font = {'jg.fnt', 0, 0, 255, 255, 255, 255, 0}, --Ikemen feature
 		--p1_name_active_font_scale = {1.0, 1.0}, --Ikemen feature
-		--p2_name_active_font = {'font/jg.fnt', 0, 0, nil, nil, nil}, --Ikemen feature
+		--p2_name_active_font = {'jg.fnt', 0, 0, 255, 255, 255, 255, 0}, --Ikemen feature
 		--p2_name_active_font_scale = {1.0, 1.0}, --Ikemen feature
 		p1_cursor_move_snd = {100, 0}, --Ikemen feature
 		p1_cursor_done_snd = {100, 1}, --Ikemen feature
@@ -481,21 +565,23 @@ local motif =
 	{
 		spr = '',
 		bgclearcolor = {0, 0, 0},
-		bg = {},
-		timer = 0, --Ikemen feature
 	},
 	demo_mode =
 	{
-		enabled = 1, --not supported yet
+		enabled = 1,
 		select_enabled = 0, --not supported yet
 		vsscreen_enabled = 0, --not supported yet
-		title_waittime = 600, --not supported yet
-		fight_endtime = 1500, --not supported yet
-		fight_playbgm = 0, --not supported yet
-		fight_stopbgm = 1, --not supported yet
-		fight_bars_display = 0, --not supported yet
-		intro_waitcycles = 1, --not supported yet
-		debuginfo = 0, --not supported yet
+		title_waittime = 600,
+		fight_endtime = 1500,
+		fight_playbgm = 0,
+		fight_stopbgm = 0,
+		fight_bars_display = 0,
+		intro_waitcycles = 1,
+		debuginfo = 0,
+		fadein_time = 50, --Ikemen feature
+		fadein_col = {0, 0, 0}, --Ikemen feature
+		fadeout_time = 50, --Ikemen feature
+		fadeout_col = {0, 0, 0}, --Ikemen feature
 	},
 	continue_screen =
 	{
@@ -534,28 +620,28 @@ local motif =
 		continue_end_snd = {1, 0}, --Ikemen feature
 		credits_text = 'Credits: %i', --Ikemen feature
 		credits_offset = {20, 30}, --Ikemen feature
-		credits_font = {'font/jg.fnt', 0, 1, nil, nil, nil}, --Ikemen feature
+		credits_font = {'jg.fnt', 0, 1, 255, 255, 255, 255, 0}, --Ikemen feature
 		credits_font_scale = {1.0, 1.0}, --Ikemen feature
 		--enabled = 1, --not used in Ikemen
 		--pos = {160, 240}, --not used in Ikemen
 		--continue_text = 'CONTINUE?', --not used in Ikemen
-		--continue_font = {'font/f-4x6.fnt', 0, 0, nil, nil, nil}, --not used in Ikemen
+		--continue_font = {'f-4x6.def', 0, 0, 255, 255, 255, 255, 0}, --not used in Ikemen
 		--continue_font_scale = {1.0, 1.0}, --not used in Ikemen
 		--continue_offset = {0, 0}, --not used in Ikemen
 		--yes_text = 'YES', --not used in Ikemen
-		--yes_font = {'font/f-4x6.fnt', 0, 0, 128, 128, 128}, --not used in Ikemen
+		--yes_font = {'f-4x6.def', 0, 0, 128, 128, 128}, --not used in Ikemen
 		--yes_font_scale = {1.0, 1.0}, --not used in Ikemen
 		--yes_offset = {-80, 60}, --not used in Ikemen
 		--yes_active_text = 'YES', --not used in Ikemen
-		--yes_active_font = {'font/f-4x6.fnt', 3, 0, nil, nil, nil}, --not used in Ikemen
+		--yes_active_font = {'f-4x6.def', 3, 0, 255, 255, 255, 255, 0}, --not used in Ikemen
 		--yes_active_font_scale = {1.0, 1.0}, --not used in Ikemen
 		--yes_active_offset = {-80, 60}, --not used in Ikemen
 		--no_text = 'NO', --not used in Ikemen
-		--no_font = {'font/f-4x6.fnt', 0, 0, 128, 128, 128}, --not used in Ikemen
+		--no_font = {'f-4x6.def', 0, 0, 128, 128, 128}, --not used in Ikemen
 		--no_font_scale = {1.0, 1.0}, --not used in Ikemen
 		--no_offset = {80, 60}, --not used in Ikemen
 		--no_active_text = 'NO', --not used in Ikemen
-		--no_active_font = {'font/f-4x6.fnt', 3, 0, nil, nil, nil}, --not used in Ikemen
+		--no_active_font = {'f-4x6.def', 3, 0, 255, 255, 255, 255, 0}, --not used in Ikemen
 		--no_active_font_scale = {1.0, 1.0}, --not used in Ikemen
 		--no_active_offset = {80, 60}, --not used in Ikemen
 	},
@@ -563,8 +649,6 @@ local motif =
 	{
 		spr = 'data/continue.sff', --Ikemen feature
 		bgclearcolor = {0, 0, 0}, --Ikemen feature
-		bg = {},
-		timer = 0, --Ikemen feature
 	},
 	game_over_screen =
 	{
@@ -573,32 +657,54 @@ local motif =
 	},
 	victory_screen =
 	{
-		enabled = 1,
+		enabled = 0,
+		cpu_enabled = 1, --Ikemen feature
+		vs_enabled = 1, --Ikemen feature
+		looser_name_enabled = 0, --Ikemen feature
+		winner_teamko_enabled = 0, --Ikemen feature
 		time = 300,
 		fadein_time = 8,
 		fadein_col = {0, 0, 0}, --Ikemen feature
 		fadeout_time = 15,
 		fadeout_col = {0, 0, 0}, --Ikemen feature
+		p1_pos = {0, 0},
 		p1_spr = {9000, 2},
 		p1_offset = {100, 20},
 		p1_facing = 1,
 		p1_scale = {1.0, 1.0},
-		p1_window = {0, 0, 319, 160},
+		--p1_window = {0, 0, 319, 160}, --not implemented yet
+		p1_num = 1, --Ikemen feature
+		p1_c1_offset = {0, 0}, --Ikemen feature
+		p1_c1_scale = {1.0, 1.0}, --Ikemen feature
+		p1_c2_offset = {0, 0}, --Ikemen feature
+		p1_c2_scale = {1.0, 1.0}, --Ikemen feature
+		p1_c3_offset = {0, 0}, --Ikemen feature
+		p1_c3_scale = {1.0, 1.0}, --Ikemen feature
+		p1_c4_offset = {0, 0}, --Ikemen feature
+		p1_c4_scale = {1.0, 1.0}, --Ikemen feature
 		p1_name_offset = {20, 180},
-		p1_name_font = {'font/jg.fnt', 0, 1, nil, nil, nil},
+		p1_name_font = {'jg.fnt', 0, 1, 255, 255, 255, 255, 0},
 		p1_name_font_scale = {1.0, 1.0},
-		p2_display = 0, --Ikemen feature
-		p2_spr = {9000, 2}, --Ikemen feature
+		p2_pos = {0, 0}, --Ikemen feature
 		p2_offset = {100, 20}, --Ikemen feature
-		p2_facing = -1, --Ikemen feature
+		p2_facing = 1, --Ikemen feature
 		p2_scale = {1.0, 1.0}, --Ikemen feature
-		p2_window = {0, 0, 319, 160}, --Ikemen feature
+		--p2_window = {0, 0, 319, 160}, --Ikemen feature (not implemented yet)
+		p2_num = 0, --Ikemen feature
+		p2_c1_offset = {0, 0}, --Ikemen feature
+		p2_c1_scale = {1.0, 1.0}, --Ikemen feature
+		p2_c2_offset = {0, 0}, --Ikemen feature
+		p2_c2_scale = {1.0, 1.0}, --Ikemen feature
+		p2_c3_offset = {0, 0}, --Ikemen feature
+		p2_c3_scale = {1.0, 1.0}, --Ikemen feature
+		p2_c4_offset = {0, 0}, --Ikemen feature
+		p2_c4_scale = {1.0, 1.0}, --Ikemen feature
 		p2_name_offset = {20, 180}, --Ikemen feature
-		p2_name_font = {'font/jg.fnt', 0, 1, nil, nil, nil}, --Ikemen feature
-		p2_name_font_scale = {1.0, 1.0},
+		p2_name_font = {'jg.fnt', 0, 1, 255, 255, 255, 255, 0}, --Ikemen feature
+		p2_name_font_scale = {1.0, 1.0}, --Ikemen feature
 		winquote_text = 'Winner!',
 		winquote_offset = {20, 192},
-		winquote_font = {'font/f-6x9.fnt', 0, 1, nil, nil, nil},
+		winquote_font = {'f-6x9.def', 0, 1, 255, 255, 255, 255, 0},
 		winquote_font_scale = {1.0, 1.0},
 		winquote_spacing = {0, 15}, --Ikemen feature
 		winquote_delay = 2, --Ikemen feature
@@ -610,8 +716,6 @@ local motif =
 	{
 		spr = '',
 		bgclearcolor = {0, 0, 0},
-		bg = {},
-		timer = 0, --Ikemen feature
 	},
 	win_screen =
 	{
@@ -623,7 +727,7 @@ local motif =
 		pose_time = 300,
 		wintext_text = 'Congratulations!',
 		wintext_offset = {159, 70},
-		wintext_font = {'font/f-6x9.fnt', 0, 0, nil, nil, nil},
+		wintext_font = {'f-6x9.def', 0, 0, 255, 255, 255, 255, 0},
 		wintext_font_scale = {1.0, 1.0},
 		wintext_displaytime = -1,
 		wintext_layerno = 2,
@@ -648,7 +752,7 @@ local motif =
 		show_time = 300,
 		winstext_text = 'Rounds survived: %i',
 		winstext_offset = {159, 70},
-		winstext_font = {'font/jg.fnt', 0, 0, nil, nil, nil},
+		winstext_font = {'jg.fnt', 0, 0, 255, 255, 255, 255, 0},
 		winstext_font_scale = {1.0, 1.0},
 		winstext_spacing = {0, 15}, --Ikemen feature
 		winstext_displaytime = -1,
@@ -665,7 +769,7 @@ local motif =
 		show_time = 300, --Ikemen feature
 		winstext_text = 'Wins: %i\nLoses: %i', --Ikemen feature
 		winstext_offset = {159, 70}, --Ikemen feature
-		winstext_font = {'font/jg.fnt', 0, 0, nil, nil, nil}, --Ikemen feature
+		winstext_font = {'jg.fnt', 0, 0, 255, 255, 255, 255, 0}, --Ikemen feature
 		winstext_font_scale = {1.0, 1.0}, --Ikemen feature
 		winstext_spacing = {0, 15}, --Ikemen feature
 		winstext_displaytime = -1, --Ikemen feature
@@ -676,8 +780,6 @@ local motif =
 	{
 		spr = '', --Ikemen feature
 		bgclearcolor = {0, 0, 0}, --Ikemen feature (disabled to not cover game screen)
-		bg = {},
-		timer = 0, --Ikemen feature
 	},
 	option_info =
 	{
@@ -686,92 +788,77 @@ local motif =
 		fadeout_time = 10, --check winmugen values
 		fadeout_col = {0, 0, 0}, --Ikemen feature
 		title_offset = {159, 19},
-		title_font = {'font/f-6x9.fnt', 0, 0, nil, nil, nil},
+		title_font = {'f-6x9.def', 0, 0, 255, 255, 255, 255, 0},
 		title_font_scale = {1.0, 1.0},
 		title_text_main = 'OPTIONS', --Ikemen feature
 		title_text_arcade = 'ARCADE SETTINGS', --Ikemen feature
 		title_text_gameplay = 'GAMEPLAY SETTINGS', --Ikemen feature
-		title_text_advgameplay = 'ADVANCED GAMEPLAY SETTINGS', --Ikemen feature
+		title_text_advgameplay = 'ADVANCED SETTINGS', --Ikemen feature
 		title_text_video = 'VIDEO SETTINGS', --Ikemen feature
+		title_text_res = 'RESOLUTION SETTINGS', --Ikemen feature
 		title_text_audio = 'AUDIO SETTINGS', --Ikemen feature
 		title_text_engine = 'ENGINE SETTINGS', --Ikemen feature
-		title_text_res = 'RESOLUTION SETTINGS', --Ikemen feature
 		title_text_input = 'INPUT SETTINGS', --Ikemen feature
 		title_text_key = 'KEY SETTINGS', --Ikemen feature
+		title_text_controller = 'CONTROLLER SETTINGS', --Ikemen feature
 		menu_pos = {85, 33}, --Ikemen feature
-		menu_item_font = {'font/f-6x9.fnt', 7, 1, nil, nil, nil}, --Ikemen feature
+		menu_item_font = {'f-6x9.def', 7, 1, 255, 255, 255, 255, 0}, --Ikemen feature
 		menu_item_font_scale = {1.0, 1.0}, --Ikemen feature
-		menu_item_active_font = {'font/f-6x9.fnt', 0, 1, nil, nil, nil}, --Ikemen feature
+		menu_item_active_font = {'f-6x9.def', 0, 1, 255, 255, 255, 255, 0}, --Ikemen feature
 		menu_item_active_font_scale = {1.0, 1.0}, --Ikemen feature
-		menu_item_value_font = {'font/f-6x9.fnt', 7, -1, nil, nil, nil}, --Ikemen feature
+		menu_item_value_font = {'f-6x9.def', 7, -1, 255, 255, 255, 255, 0}, --Ikemen feature
 		menu_item_value_font_scale = {1.0, 1.0}, --Ikemen feature
-		menu_item_value_active_font = {'font/f-6x9.fnt', 0, -1, nil, nil, nil}, --Ikemen feature
+		menu_item_value_active_font = {'f-6x9.def', 0, -1, 255, 255, 255, 255, 0}, --Ikemen feature
 		menu_item_value_active_font_scale = {1.0, 1.0}, --Ikemen feature
-		menu_item_value_conflict_font = {'font/f-6x9.fnt', 1, -1, nil, nil, nil}, --Ikemen feature
+		menu_item_value_conflict_font = {'f-6x9.def', 1, -1, 255, 255, 255, 255, 0}, --Ikemen feature
 		menu_item_value_conflict_font_scale = {1.0, 1.0}, --Ikemen feature
 		menu_item_spacing = {150, 13}, --Ikemen feature
 		menu_window_visibleitems = 16, --Ikemen feature
 		menu_boxcursor_visible = 1, --Ikemen feature
-		menu_boxcursor_coords = {-5, -9, 154, 3}, --Ikemen feature
-		menu_boxbackground_visible = 1, --Ikemen feature
-		menu_boxbackground_alpha = {20, 100}, --Ikemen feature
+		menu_boxcursor_coords = {-5, -10, 154, 2}, --Ikemen feature
+		menu_boxcursor_col = {255, 255, 255}, --Ikemen feature
+		menu_boxcursor_alpharange = {10, 40, 2, 255, 255, 0}, --Ikemen feature
+		menu_boxbg_visible = 1, --Ikemen feature
+		menu_boxbg_col = {0, 0, 0}, --Ikemen feature
+		menu_boxbg_alpha = {20, 100}, --Ikemen feature
 		menu_itemname_main_arcade = 'Arcade Settings', --Ikemen feature
 		menu_itemname_main_gameplay = 'Gameplay Settings', --Ikemen feature
-		menu_itemname_main_engine = "Engine Settings", --Ikemen feature
+		menu_itemname_main_engine = 'Engine Settings', --Ikemen feature
 		menu_itemname_main_video = 'Video Settings', --Ikemen feature
 		menu_itemname_main_audio = 'Audio Settings', --Ikemen feature
 		menu_itemname_main_input = 'Input Settings', --Ikemen feature
+		menu_itemname_main_quicklaunch = 'Quick Launch', --Ikemen feature
 		menu_itemname_main_port = 'Port Change', --Ikemen feature
 		menu_itemname_main_default = 'Default Values', --Ikemen feature
+		menu_itemname_main_save = 'Save and Return', --Ikemen feature
 		menu_itemname_main_back = 'Return Without Saving', --Ikemen feature
-		menu_itemname_arcade_roundstowin = 'Rounds to Win', --Ikemen feature
-		menu_itemname_arcade_roundtime = 'Round Time', --Ikemen feature
+		menu_itemname_arcade_roundtime = 'Time Limit', --Ikemen feature
+		menu_itemname_arcade_roundtime_none = 'None', --Ikemen feature
+		menu_itemname_arcade_roundsnumsingle = 'Rounds to Win Single', --Ikemen feature
+		menu_itemname_arcade_roundsnumteam = 'Rounds to Win Simul/Tag', --Ikemen feature
+		menu_itemname_arcade_maxdrawgames = 'Max Draw Games', --Ikemen feature
 		menu_itemname_arcade_difficulty = 'Difficulty level', --Ikemen feature
 		menu_itemname_arcade_credits = 'Credits', --Ikemen feature
 		menu_itemname_arcade_charchange = 'Char change at Continue', --Ikemen feature
-		menu_itemname_arcade_airamping = 'AI ramping', --Ikemen feature
+		menu_itemname_arcade_airamping = 'AI Ramping', --Ikemen feature
+		menu_itemname_arcade_aipalette = 'AI Palette', --Ikemen feature
+		menu_itemname_arcade_aipalette_random = 'Random', --Ikemen feature
+		menu_itemname_arcade_aipalette_default = 'Default', --Ikemen feature
 		menu_itemname_arcade_back = 'Back', --Ikemen feature
-		menu_itemname_gameplay_lifemul = 'Life', --Ikemen feature
-		menu_itemname_gameplay_autoguard = 'Auto-Guard', --Ikemen feature
-		menu_itemname_gameplay_attackpowermul = 'Attack.LifeToPowerMul', --Ikemen feature
-		menu_itemname_gameplay_gethitpowermul = 'GetHit.LifeToPowerMul', --Ikemen feature
-		menu_itemname_gameplay_superdefencemul = 'Super.TargetDefenceMul', --Ikemen feature
-		menu_itemname_gameplay_team1vs2life = '1P Vs Team Life', --Ikemen feature
-		menu_itemname_gameplay_turnsrecoveryrate = 'Turns HP Recovery', --Ikemen feature
-		menu_itemname_gameplay_teampowershare = 'Team Power Share', --Ikemen feature
-		menu_itemname_gameplay_teamlifeshare = 'Team Life Share', --Ikemen feature
-		menu_itemname_gameplay_singlemode = 'Single Mode', --Ikemen feature
-		menu_itemname_gameplay_numturns = 'Turns Limit', --Ikemen feature
-		menu_itemname_gameplay_numsimul = 'Simul Limit', --Ikemen feature
-		menu_itemname_gameplay_numtag = 'Tag Limit', --Ikemen features
-		menu_itemname_gameplay_simulmode = 'Legacy Tag Mode', --Ikemen feature
-		menu_itemname_gameplay_simulmode_simul = 'Disabled', --Ikemen feature
-		menu_itemname_gameplay_simulmode_tag = 'Enabled', --Ikemen feature
-		menu_itemname_gameplay_advanced = 'Advanced Settings', --Ikemen feature
-		menu_itemname_gameplay_back = 'Back', --Ikemen feature
 		menu_itemname_video_resolution = 'Resolution', --Ikemen feature
 		menu_itemname_video_fullscreen = 'Fullscreen', --Ikemen feature
 		menu_itemname_video_msaa = 'MSAA', --Ikemen feature
-		menu_itemname_video_helpermax = 'HelperMax', --Ikemen feature
-		menu_itemname_video_playerprojectilemax = 'PlayerProjectileMax', --Ikemen feature
-		menu_itemname_video_explodmax = 'ExplodMax', --Ikemen feature
-		menu_itemname_video_afterimagemax = 'AfterImageMax', --Ikemen feature
-		menu_itemname_video_zoomactive = 'Zoom Active', --Ikemen feature
-		menu_itemname_video_maxzoomout = 'Default Max Zoom Out', --Ikemen feature
-		menu_itemname_video_maxzoomin = 'Default Max Zoom In', --Ikemen feature
-		menu_itemname_video_zoomspeed = 'Default Zoom Speed', --Ikemen feature
-		menu_itemname_video_lifebarfontscale = 'Default Lifebar Font Scale', --Ikemen feature
-		menu_itemname_video_aipalette = 'AI Palette', --Ikemen feature
-		menu_itemname_video_aipalette_random = 'Random', --Ikemen feature
-		menu_itemname_video_aipalette_default = 'Default', --Ikemen feature
+		menu_itemname_video_shader = 'Shader', --Ikemen feature
+		menu_itemname_video_shader_none = 'None', --Ikemen feature
+		menu_itemname_video_shader_hqx2 = 'hq2x', --Ikemen feature
+		menu_itemname_video_shader_hqx4 = 'hqx4', --Ikemen feature
+		menu_itemname_video_shader_scanlines = 'scanlines', --Ikemen feature
 		menu_itemname_video_back = 'Back', --Ikemen feature
 		menu_itemname_res_320x240 = '320x240    (4:3 QVGA)', --Ikemen feature
 		menu_itemname_res_640x480 = '640x480    (4:3 VGA)', --Ikemen feature
 		menu_itemname_res_1280x960 = '1280x960   (4:3 Quad-VGA)', --Ikemen feature
 		menu_itemname_res_1600x1200 = '1600x1200  (4:3 UXGA)', --Ikemen feature
 		menu_itemname_res_960x720 = '960x720    (4:3 HD)', --Ikemen feature
-		menu_itemname_res_1200x900 = '1200x900   (4:3 HD+)', --Ikemen feature
-		menu_itemname_res_1440x1080 = '1440x1080  (4:3 FHD)', --Ikemen feature
 		menu_itemname_res_1280x720 = '1280x720   (16:9 HD)', --Ikemen feature
 		menu_itemname_res_1600x900 = '1600x900   (16:9 HD+)', --Ikemen feature
 		menu_itemname_res_1920x1080 = '1920x1080  (16:9 FHD)', --Ikemen feature
@@ -779,12 +866,46 @@ local motif =
 		menu_itemname_res_3840x2160 = '3840x2160  (16:9 4K)', --Ikemen feature
 		menu_itemname_res_custom = 'Custom', --Ikemen feature
 		menu_itemname_res_back = 'Back', --Ikemen feature
-		menu_itemname_input_p1keyboard = 'P1 Keyboard', --Ikemen feature
-		menu_itemname_input_p1gamepad = 'P1 Gamepad', --Ikemen feature
-		menu_itemname_input_p2keyboard = 'P2 Keyboard', --Ikemen feature
-		menu_itemname_input_p2gamepad = 'P2 Gamepad', --Ikemen feature
+		menu_itemname_audio_mastervolume = 'Master Volume', --Ikemen feature
+		menu_itemname_audio_bgmvolume = 'BGM Volume', --Ikemen feature
+		menu_itemname_audio_sfxvolume = 'SFX Volume', --Ikemen feature
+		menu_itemname_audio_audioducking = 'Audio Ducking', --Ikemen feature
+		menu_itemname_audio_back = 'Back', --Ikemen feature
+		menu_itemname_gameplay_lifemul = 'Life', --Ikemen feature
+		menu_itemname_gameplay_autoguard = 'Auto-Guard', --Ikemen feature
+		menu_itemname_gameplay_attackpowermul = 'Attack.LifeToPowerMul', --Ikemen feature
+		menu_itemname_gameplay_gethitpowermul = 'GetHit.LifeToPowerMul', --Ikemen feature
+		menu_itemname_gameplay_superdefencemul = 'Super.TargetDefenceMul', --Ikemen feature
+		menu_itemname_gameplay_team1vs2life = '1P Vs Team Life', --Ikemen feature
+		menu_itemname_gameplay_turnsrecoverybase = 'Turns Recovery Base', --Ikemen feature
+		menu_itemname_gameplay_turnsrecoverybonus = 'Turns Recovery Bonus', --Ikemen feature
+		menu_itemname_gameplay_teampowershare = 'Team Power Share', --Ikemen feature
+		menu_itemname_gameplay_teamlifeshare = 'Team Life Share', --Ikemen feature
+		menu_itemname_gameplay_singlemode = 'Single Mode', --Ikemen feature
+		menu_itemname_gameplay_numturns = 'Turns Limit', --Ikemen feature
+		menu_itemname_gameplay_numsimul = 'Simul Limit', --Ikemen feature
+		menu_itemname_gameplay_numtag = 'Tag Limit', --Ikemen features
+		menu_itemname_gameplay_advanced = 'Advanced Settings', --Ikemen feature
+		menu_itemname_gameplay_back = 'Back', --Ikemen feature
+		menu_itemname_engine_allowdebugkeys = 'Debug Keys', --Ikemen feature
+		menu_itemname_engine_simulmode = 'Legacy Tag Mode', --Ikemen feature
+		menu_itemname_engine_helpermax = 'HelperMax', --Ikemen feature
+		menu_itemname_engine_playerprojectilemax = 'PlayerProjectileMax', --Ikemen feature
+		menu_itemname_engine_explodmax = 'ExplodMax', --Ikemen feature
+		menu_itemname_engine_afterimagemax = 'AfterImageMax', --Ikemen feature
+		menu_itemname_engine_zoomactive = 'Zoom Active', --Ikemen feature
+		menu_itemname_engine_maxzoomout = 'Default Max Zoom Out', --Ikemen feature
+		menu_itemname_engine_maxzoomin = 'Default Max Zoom In', --Ikemen feature
+		menu_itemname_engine_zoomspeed = 'Default Zoom Speed', --Ikemen feature
+		menu_itemname_engine_lifebarfontscale = 'Lifebar Font Scale', --Ikemen feature
+		menu_itemname_input_keyboard = 'Key Config', --Ikemen feature
+		menu_itemname_input_gamepad = 'Joystick Config', --Ikemen feature
+		menu_itemname_input_system = 'System Keys', --Ikemen feature (not used yet)
 		menu_itemname_input_default = 'Default Values', --Ikemen feature
 		menu_itemname_input_back = 'Back', --Ikemen feature
+		menu_itemname_key_p1 = 'PLAYER 1', --Ikemen feature
+		menu_itemname_key_p2 = 'PLAYER 2', --Ikemen feature
+		menu_itemname_key_all = 'Config all', --Ikemen feature
 		menu_itemname_key_up = 'Up', --Ikemen feature
 		menu_itemname_key_down = 'Down', --Ikemen feature
 		menu_itemname_key_left = 'Left', --Ikemen feature
@@ -796,24 +917,35 @@ local motif =
 		menu_itemname_key_y = 'Y', --Ikemen feature
 		menu_itemname_key_z = 'Z', --Ikemen feature
 		menu_itemname_key_start = 'Start', --Ikemen feature
-		menu_itemname_key_v = 'D', --Ikemen feature
+		menu_itemname_key_d = 'D', --Ikemen feature
 		menu_itemname_key_w = 'W', --Ikemen feature
 		menu_itemname_key_back = 'Back', --Ikemen feature
+		menu_item_key_p1_font = {'f-6x9.def', 4, 0, 255, 255, 255, 255, 0}, --Ikemen feature
+		menu_item_key_p1_font_scale = {1.0, 1.0}, --Ikemen feature
+		menu_item_key_p2_font = {'f-6x9.def', 1, 0, 255, 255, 255, 255, 0}, --Ikemen feature
+		menu_item_key_p2_font_scale = {1.0, 1.0}, --Ikemen feature
+		menu_item_info_font = {'f-6x9.def', 5, -1, 255, 255, 255, 255, 0}, --Ikemen feature
+		menu_item_info_font_scale = {1.0, 1.0}, --Ikemen feature
+		menu_item_info_active_font = {'f-6x9.def', 5, -1, 255, 255, 255, 255, 0}, --Ikemen feature
+		menu_item_info_active_font_scale = {1.0, 1.0}, --Ikemen feature
+		menu_itemname_info_f1 = '(F1)', --Ikemen feature
+		menu_itemname_info_f2 = '(F2)', --Ikemen feature
+		menu_itemname_info_esc = '(Esc)', --Ikemen feature
+		menu_itemname_info_disable = 'Not used', --Ikemen feature
+		menu_item_p1_pos = {91, 33}, --Ikemen feature
+		menu_item_p2_pos = {230, 33}, --Ikemen feature
+		menu_key_p1_pos = {39, 33}, --Ikemen feature
+		menu_key_p2_pos = {178, 33}, --Ikemen feature
+		menu_key_item_spacing = {101, 13}, --Ikemen feature
+		menu_key_boxcursor_coords = {-5, -10, 106, 2}, --Ikemen feature
 		menu_itemname_yes = 'Yes', --Ikemen feature
 		menu_itemname_no = 'No', --Ikemen feature
-		menu_itemname_main_save = 'Save and Return', --Ikemen feature
 		menu_itemname_enabled = 'Enabled', --Ikemen feature
 		menu_itemname_disabled = 'Disabled', --Ikemen feature
-		menu_itemname_audio_mastervolume = 'Master Volume', --Ikemen feature
-		menu_itemname_audio_sfxvolume = 'SFX Volume', --Ikemen feature
-		menu_itemname_audio_bgmvolume = 'BGM Volume', --Ikemen feature
-		menu_itemname_audio_audioducking = 'Audio Ducking', --Ikemen feature
-		menu_itemname_engine_quicklaunch = 'Quick Launch', --Ikemen feature
-		menu_itemname_engine_allowdebugkeys = 'Debug Keys', --Ikemen feature
 		input_text_port = 'Type in Host Port, e.g. 7500.\nPress ENTER to accept.\nPress ESC to cancel.', --Ikemen feature
 		input_text_reswidth = 'Type in screen width.\nPress ENTER to accept.\nPress ESC to cancel.', --Ikemen feature
 		input_text_resheight = 'Type in screen height.\nPress ENTER to accept.\nPress ESC to cancel.', --Ikemen feature
-		input_text_key = 'Press a key to assign to entry.\nPress ESC to cancel.', --Ikemen feature
+		input_text_key = 'Press a key to assign to entry.\nPress SPACE to disable key.\nPress ESC to cancel.', --Ikemen feature
 		cursor_move_snd = {100, 0},
 		cursor_done_snd = {100, 1},
 		cancel_snd = {100, 2},
@@ -822,8 +954,6 @@ local motif =
 	{
 		spr = '',
 		bgclearcolor = {0, 0, 0},
-		bg = {},
-		timer = 0, --Ikemen feature
 	},
 	tournament_info =
 	{
@@ -836,25 +966,28 @@ local motif =
 	{
 		spr = 'data/tournament.sff', --Ikemen feature
 		bgclearcolor = {0, 0, 0}, --Ikemen feature
-		bg = {}, --Ikemen feature
-		timer = 0, --Ikemen feature
 	},
 	warning_info =
 	{
 		title = 'WARNING', --Ikemen feature
 		title_pos = {159, 19}, --Ikemen feature
-		title_font = {'font/f-6x9.fnt', 0, 0, nil, nil, nil}, --Ikemen feature
+		title_font = {'f-6x9.def', 0, 0, 255, 255, 255, 255, 0}, --Ikemen feature
 		title_font_scale = {1.0, 1.0}, --Ikemen feature
 		text_stages = 'No stages in select.def available for random selection.\nPress any key to exit the program.', --Ikemen feature
-		text_order = "No characters in select.def correspond to 'maxmatches'\nsettings. Check [Characters] section and 'order' parameters.\nPress any key to exit the program.", --Ikemen feature
+		text_order = "Incorrect 'maxmatches' settings detected.\nCheck orders in [Characters] and [Options] sections\nto ensure that at least one battle is possible.\nPress any key to exit the program.", --Ikemen feature
 		text_training = "Training character ('chars/Training/Training.def') not found.\nPress any key to exit the program.", --Ikemen feature
 		text_reload = 'Some selected options require Ikemen to be restarted.\nPress any key to exit the program.', --Ikemen feature
 		text_res = 'Non 4:3 resolutions require stages coded for different\naspect ratio. Change it back to 4:3 if stages look off.', --Ikemen feature
+		text_keys = 'Conflict between button keys detected.\nAll keys should have unique assignment.\nFix the problem before exitting key settings.', --Ikemen feature
+		text_pad = 'Controller not detected.\nCheck if your controller is plugged in.', --Ikemen feature
+		text_simul = 'This is a legacy option that works only if screenpack \nhas not been updated to support both Tag and Simul \nmode selection in select screen.', --Ikemen feature
 		text_pos = {25, 33}, --Ikemen feature
-		text_font = {'font/f-6x9.fnt', 0, 1, nil, nil, nil}, --Ikemen feature
+		text_font = {'f-6x9.def', 0, 1, 255, 255, 255, 255, 0}, --Ikemen feature
 		text_font_scale = {1.0, 1.0}, --Ikemen feature
 		text_spacing = {0, 13}, --Ikemen feature
-		background_alpha = {20, 100}, --Ikemen feature
+		boxbg_coords = {0, 0, localX, localY}, --Ikemen feature (0, 0, 320, 240)
+		boxbg_col = {0, 0, 0}, --Ikemen feature
+		boxbg_alpha = {20, 100}, --Ikemen feature
 	},
 	anim =
 	{
@@ -1288,120 +1421,39 @@ local motif =
 			'101,75, -32,8, -1', --1593+
 		},
 	},
-	ctrldef = {
-		titlebgdef = {},
-		selectbgdef = {}, 
-		versusbgdef = {},
-		optionbgdef = {},
-		continuebgdef = {},
-		victorybgdef = {},
-		resultsbgdef = {},
-		tournamentbgdef = {},
-	}
 }
 
 --;===========================================================
 --; PARSE SCREENPACK
 --;===========================================================
 --here starts proper screenpack DEF file parsing
-local sp = config.Motif
-if main.flags['-r'] ~= nil then
-	if main.f_fileExists(main.flags['-r']) then
-		sp = main.flags['-r']
-	elseif main.f_fileExists('data/' .. main.flags['-r'] .. '/system.def') then
-		sp = 'data/' .. main.flags['-r'] .. '/system.def'
-	end
-end
-local file = io.open(sp, 'r')
-local fileDir, fileName = sp:match('^(.-)([^/\\]+)$')
+main.t_sort = {}
 local t = {}
 local pos = t
+local pos_sort = main.t_sort
 local def_pos = motif
 t.anim = {}
-t.font_data = {['font/f-4x6.fnt'] = fontNew('font/f-4x6.fnt'), ['font/f-6x9.fnt'] = fontNew('font/f-6x9.fnt'), ['font/jg.fnt'] = fontNew('font/jg.fnt')}
-t.ctrldef = {}
+t.font_data = {['f-4x6.def'] = fontNew('f-4x6.def'), ['f-6x9.def'] = fontNew('f-6x9.def'), ['jg.fnt'] = fontNew('jg.fnt')}
+local fileDir, fileName = motif.def:match('^(.-)([^/\\]+)$')
 t.fileDir = fileDir
 t.fileName = fileName
-local bgdef = 'dummyUntilSet'
-local bgctrl = ''
-local bgctrl_match = 'dummyUntilSet'
 local tmp = ''
+file = io.open(motif.def, 'r')
 for line in file:lines() do
 	line = line:gsub('%s*;.*$', '')
 	if line:match('^%s*%[.-%s*%]%s*$') then --matched [] group
 		line = line:match('^%s*%[(.-)%s*%]%s*$') --match text between []
 		line = line:gsub('[%. ]', '_') --change . and space to _
-		line = line:lower() --lowercase line
-		local row = tostring(line:lower()) --just in case it's a number (not really needed)
-		if row:match('.+ctrldef') then --matched ctrldef start
-			bgctrl = row
-			bgctrl_match = bgctrl:match('^(.-ctrl)def')
-			t.ctrldef[bgdef .. 'def'][bgctrl] = {}
-			t.ctrldef[bgdef .. 'def'][bgctrl].ctrl = {}
-			pos = t.ctrldef[bgdef .. 'def'][bgctrl]
-			motif.ctrldef[bgdef .. 'def'][bgctrl] = {
-				looptime = -1,
-				ctrlid = {0},
-				ctrl = {}
-			}
-		elseif row:match('^' .. bgctrl_match) then --matched ctrldef content
-			tmp = t.ctrldef[bgdef .. 'def'][bgctrl].ctrl
-			tmp[#tmp + 1] = {}
-			pos = tmp[#tmp]
-			motif.ctrldef[bgdef .. 'def'][bgctrl].ctrl[#tmp] = {
-				type = 'null',
-				time = {0, -1, -1},
-				ctrlid = {}
-			}
-		elseif row:match('.+bgdef$') then --matched bgdef start
-			t[row] = {}
-			pos = t[row]
-			t[row].bg = {}
-			bgdef = row:match('(.+)def$')
-			t.ctrldef[bgdef .. 'def'] = {}
-		elseif row:match('^' .. bgdef) then --matched bgdef content
-			tmp = t[bgdef .. 'def']
-			tmp.bg[#tmp.bg + 1] = {}
-			pos = tmp.bg[#tmp.bg]
-			motif[bgdef .. 'def'].bg[#tmp.bg] =
-			{
-				type = 'normal',
-				spriteno = {0, 0},
-				id = 0,
-				layerno = 0,
-				start = {0, 0},
-				delta = {1, 1},
-				trans = '',
-				mask = 0,
-				tile = {0, 0},
-				tilespacing = {0, nil},
-				--window = {0, 0, 0, 0},
-				--windowdelta = {0, 0}, --not supported yet
-				--width = {0, 0}, --not supported yet (parallax)
-				--xscale = {1.0, 1.0}, --not supported yet (parallax)
-				--yscalestart = 100, --not supported yet (parallax)
-				--yscaledelta = 1, --not supported yet (parallax)
-				positionlink = 0,
-				velocity = {0, 0},
-				--sin_x = {0, 0, 0}, --not supported yet
-				--sin_y = {0, 0, 0}, --not supported yet
-				ctrl = {},
-				ctrl_flags = {
-					visible = 1,
-					enabled = 1,
-					velx = 0,
-					vely = 0,
-					x = 0,
-					y = 0
-				}
-			}
-		elseif row:match('^begin_action_[0-9]+$') then --matched anim
+		local row = tostring(line:lower())
+		if row:match('^begin_action_[0-9]+$') then --matched anim
 			row = tonumber(row:match('^begin_action_([0-9]+)$'))
 			t.anim[row] = {}
 			pos = t.anim[row]
 		else --matched other []
 			t[row] = {}
+			main.t_sort[row] = {}
 			pos = t[row]
+			pos_sort = main.t_sort[row]
 			def_pos = motif[row]
 		end
 	else --matched non [] line
@@ -1409,7 +1461,7 @@ for line in file:lines() do
 		if param ~= nil then
 			param = param:gsub('[%. ]', '_') --change param . and space to _
 			param = param:lower() --lowercase param
-			if value ~= nil and def_pos ~= nil then -- Let's chech if it's even a valid param
+			if value ~= nil and def_pos ~= nil then --let's check if it's even a valid param
 				if value == '' and (type(def_pos[param]) == 'number' or type(def_pos[param]) == 'table') then --text should remain empty
 					value = '0'
 				end
@@ -1419,7 +1471,7 @@ for line in file:lines() do
 			value = value:gsub('"', '') --remove brackets from value
 			value = value:gsub('^(%.[0-9])', '0%1') --add 0 before dot if missing at the beginning of matched string
 			value = value:gsub('([^0-9])(%.[0-9])', '%10%2') --add 0 before dot if missing anywhere else
-			if param:match('^font[0-9]+$') then --font declaration param matched
+			if param:match('^font[0-9]+') then --font declaration param matched
 				local num = tonumber(param:match('font([0-9]+)'))
 				if param:match('_height$') then
 					if pos.font_height == nil then
@@ -1427,21 +1479,7 @@ for line in file:lines() do
 					end
 					pos.font_height[num] = main.f_dataType(value)
 				else
-					value = value:lower()
 					value = value:gsub('\\', '/')
-					if t.font_data[value] == nil then
-						if not value:match('^data/') then
-							if main.f_fileExists(fileDir .. value) then
-								value = fileDir .. value
-							elseif main.f_fileExists('font/' .. value) then
-								value = 'font/' .. value
-							elseif main.f_fileExists(t.files.fight:match('^(.-)[^/\\]+$') .. value) then
-								value = t.files.fight:match('^(.-)[^/\\]+$') .. value
-							end
-						end
-						t.font_data[value] = fontNew(value)
-						wait = true
-					end
 					if pos.font == nil then
 						pos.font = {}
 					end
@@ -1456,26 +1494,33 @@ for line in file:lines() do
 						elseif i == 1 then
 							pos[param] = {}
 							if param:match('_font$') then
-								c = t.files.font[tonumber(c)]
+								if t.files ~= nil and t.files.font ~= nil and t.files.font[tonumber(c)] ~= nil then --in case font is used before it's declared in DEF file
+									c = t.files.font[tonumber(c)]
+								else
+									break --use default font values
+								end
 							end
 						end
 						if c == nil or c == '' then
-							pos[param][#pos[param] + 1] = 0
+							table.insert(pos[param], 0)
 						else
-							pos[param][#pos[param] + 1] = main.f_dataType(c)
+							table.insert(pos[param], main.f_dataType(c))
 						end
 					end
 				else --single value
+					if param:match('_itemname_') then
+						table.insert(pos_sort, param:match('_itemname_(.+)$'))
+					end
 					pos[param] = main.f_dataType(value)
 				end
 			end
 		else --only valid lines left are animations
 			line = line:lower()
-			local value = line:match('^%s*([0-9%-]+%s*,%s*[0-9%-]+%s*,%s*[0-9%-]+%s*,%s*[0-9%-]+%s*,%s*[0-9%-]+.-)[,%s]*$') or line:match('^%s*loopstart') or line:match('^%s*interpolate offset') or line:match('^%s*interpolate angle') or line:match('^%s*interpolate scale') or line:match('^%s*interpolate blend')
+			local value = line:match('^%s*([0-9%-]+%s*,%s*[0-9%-]+%s*,%s*[0-9%-]+%s*,%s*[0-9%-]+%s*,%s*[0-9%-]+.-)[,%s]*$') or line:match('^%s*loopstart') or line:match('%s*interpolate [oasb][fncl][fgae][sln][ed]t?')
 			if value ~= nil then
 				value = value:gsub(',%s*,', ',0,') --add missing values
 				value = value:gsub(',%s*$', '')
-				pos[#pos + 1] = value
+				table.insert(pos, value)
 			end
 		end
 	end
@@ -1486,8 +1531,15 @@ file:close()
 --;===========================================================
 --; FIX REFERENCES, LOAD DATA
 --;===========================================================
-local anim = ''
-local facing = ''
+--adopt old DEF code to Ikemen features
+if type(motif.select_info.cell_spacing) ~= "table" then
+	motif.select_info.cell_spacing = {motif.select_info.cell_spacing[1], motif.select_info.cell_spacing[1]}
+end
+
+if motif.victory_screen.enabled == 0 then
+	motif.victory_screen.cpu_enabled = 0
+	motif.victory_screen.vs_enabled = 0
+end
 
 --merge tables
 motif = main.f_tableMerge(motif, t)
@@ -1534,40 +1586,11 @@ main.loadingRefresh()
 motif.files.continue_snd_data = sndNew(motif.files.continue_snd)
 main.loadingRefresh()
 
---fadein / fadeout data
-t_dir = {'title_info', 'select_info', 'vs_screen', 'victory_screen', 'win_screen', 'survival_results_screen', 'vs100kumite_results_screen', 'option_info', 'tournament_info', 'continue_screen'}
-for i = 1, #t_dir do
-	motif[t_dir[i]].fadein_data = main.f_fadeAnim(1, motif[t_dir[i]].fadein_time, motif[t_dir[i]].fadein_col[1], motif[t_dir[i]].fadein_col[2], motif[t_dir[i]].fadein_col[3])
-	animSetWindow(motif[t_dir[i]].fadein_data, main.screenOverscan, 0, motif.info.localcoord[1], motif.info.localcoord[2])
-	motif[t_dir[i]].fadeout_data = main.f_fadeAnim(0, motif[t_dir[i]].fadeout_time, motif[t_dir[i]].fadeout_col[1], motif[t_dir[i]].fadeout_col[2], motif[t_dir[i]].fadeout_col[3])
-	animSetWindow(motif[t_dir[i]].fadeout_data, main.screenOverscan, 0, motif.info.localcoord[1], motif.info.localcoord[2])
-end
-
---other entries
+--data
+local anim = ''
+local facing = ''
 t_dir = {'titlebgdef', 'selectbgdef', 'versusbgdef', 'optionbgdef', 'continuebgdef', 'victorybgdef', 'resultsbgdef', 'tournamentbgdef'}
 for i = 1, #t_dir do
-	--ctrldef table adjustment
-	for k, v in pairs(motif.ctrldef[t_dir[i]]) do
-		tmp = motif.ctrldef[t_dir[i]][k].ctrl
-		for j = 1, #tmp do
-			--if END_TIME is omitted it should default to the same value as START_TIME
-			if tmp[j].time[2] == -1 then
-				tmp[j].time[2] = tmp[j].time[1]
-			end
-			--if LOOPTIME is omitted or set to -1, the background controller will not reset its own timer. In such case use GLOBAL_LOOPTIME
-			if tmp[j].time[3] == -1 then
-				tmp[j].time[3] = motif.ctrldef[t_dir[i]][k].looptime
-			end
-			--lowercase type name
-			tmp[j].type = tmp[j].type:lower()
-			--this list, if specified, overrides the default list specified in the BGCtrlDef
-			if #tmp[j].ctrlid == 0 then
-				for z = 1, #motif.ctrldef[t_dir[i]][k].ctrlid do
-					tmp[j].ctrlid[#tmp[j].ctrlid + 1] = motif.ctrldef[t_dir[i]][k].ctrlid[z]
-				end
-			end
-		end
-	end
 	--optional sff paths and data
 	if motif[t_dir[i]].spr ~= '' then
 		if not motif[t_dir[i]].spr:match('^data/') then
@@ -1577,81 +1600,26 @@ for i = 1, #t_dir do
 				motif[t_dir[i]].spr = 'data/' .. motif[t_dir[i]].spr
 			end
 		end
-		motif[t_dir[i]].spr_data = sffNew(motif[t_dir[i]].spr)
+		motif[t_dir[i]].spr_data = sffNew(motif[t_dir[i]].spr) --does sff work with all data or just backgrounds? If the latter then it's not needed
 		main.loadingRefresh()
 	elseif motif[t_dir[i]].spr ~= 'continuebgdef' and motif[t_dir[i]].spr ~= 'tournamentbgdef' then
 		motif[t_dir[i]].spr = motif.files.spr
 		motif[t_dir[i]].spr_data = motif.files.spr_data
 	end
-	--clearcolor data
-	motif[t_dir[i]].bgclearcolor_data = main.f_clearColor(motif[t_dir[i]].bgclearcolor[1], motif[t_dir[i]].bgclearcolor[2], motif[t_dir[i]].bgclearcolor[3])
-	animSetWindow(motif[t_dir[i]].bgclearcolor_data, main.screenOverscan, 0, motif.info.localcoord[1], motif.info.localcoord[2])
-	--background data
-	motif[t_dir[i]].bg_data = {}
-	local t_bgdef = motif[t_dir[i]].bg
-	local prev_k = ''
-	for k, v in pairs(t_bgdef) do --loop through table keys
-		t_bgdef[k].type = t_bgdef[k].type:lower()
-		--mugen ignores delta = 0 (defaults to 1)
-		if t_bgdef[k].delta[1] == 0 then t_bgdef[k].delta[1] = 1 end
-		if t_bgdef[k].delta[2] == 0 then t_bgdef[k].delta[2] = 1 end
-		--add ctrl data
-		motif[t_dir[i]].bg[k].ctrl = main.f_ctrlBG(t_bgdef[k], motif.ctrldef[t_dir[i]])
-		--positionlink adjustment
-		if t_bgdef[k].positionlink == 1 and prev_k ~= '' then
-			t_bgdef[k].start[1] = t_bgdef[prev_k].start[1]
-			t_bgdef[k].start[2] = t_bgdef[prev_k].start[2]
-			t_bgdef[k].delta[1] = t_bgdef[prev_k].delta[1]
-			t_bgdef[k].delta[2] = t_bgdef[prev_k].delta[2]
-		end
-		prev_k = k
-		--generate anim data
-		local sizeX, sizeY, offsetX, offsetY = 0, 0, 0, 0
-		if t_bgdef[k].type == 'anim' then
-			anim = main.f_animFromTable(motif.anim[t_bgdef[k].actionno], motif[t_dir[i]].spr_data, (t_bgdef[k].start[1] + main.normalSpriteCenter), t_bgdef[k].start[2])
-		else --normal, parallax
-			anim = t_bgdef[k].spriteno[1] .. ', ' .. t_bgdef[k].spriteno[2] .. ', ' .. (t_bgdef[k].start[1] + main.normalSpriteCenter) .. ', ' .. t_bgdef[k].start[2] .. ', ' .. -1
-			anim = animNew(motif[t_dir[i]].spr_data, anim)
-			sizeX, sizeY, offsetX, offsetY = getSpriteInfo(motif[t_dir[i]].spr, t_bgdef[k].spriteno[1], t_bgdef[k].spriteno[2])
-		end
-		if t_bgdef[k].trans == 'add1' then
-			animSetAlpha(anim, 255, 128)
-		elseif t_bgdef[k].trans == 'add' then
-			animSetAlpha(anim, 255, 255)
-		elseif t_bgdef[k].trans == 'sub' then
-			animSetAlpha(anim, 1, 255)
-		end
-		animAddPos(anim, 160, 0) --for some reason needed in ikemen
-		if t_bgdef[k].window ~= nil and t_bgdef[k].window[1] ~= nil and t_bgdef[k].window[2] ~= nil and t_bgdef[k].window[3] ~= nil and t_bgdef[k].window[4] ~= nil then
-			animSetWindow(
-				anim,
-				t_bgdef[k].window[1],
-				t_bgdef[k].window[2],
-				t_bgdef[k].window[3] - t_bgdef[k].window[1] + 1,
-				t_bgdef[k].window[4] - t_bgdef[k].window[2] + 1
-			)
-		else
-			animSetWindow(anim, main.screenOverscan, 0, motif.info.localcoord[1], motif.info.localcoord[2])
-		end
-		if t_bgdef[k].tilespacing[2] == nil then t_bgdef[k].tilespacing[2] = t_bgdef[k].tilespacing[1] end
-		if t_bgdef[k].type == 'parallax' then
-			animSetTile(anim, t_bgdef[k].tile[1], 0, t_bgdef[k].tilespacing[1] + sizeX, t_bgdef[k].tilespacing[2] + sizeY)
-		else
-			animSetTile(anim, t_bgdef[k].tile[1], t_bgdef[k].tile[2], t_bgdef[k].tilespacing[1] + sizeX, t_bgdef[k].tilespacing[2] + sizeY)
-		end
-		if t_bgdef[k].mask == 1 or t_bgdef[k].type ~= 'normal' or (t_bgdef[k].trans ~= '' and t_bgdef[k].trans ~= 'none') then
-			animSetColorKey(anim, 0)
+	--backgrounds
+	motif[t_dir[i]].bg = bgNew(motif.def, t_dir[i]:match('^(.+)def$'), motif[t_dir[i]].spr)
+	main.loadingRefresh()
+end
+
+for k, v in pairs(motif.files.font) do --loop through table keys
+	if v ~= '' and motif.font_data[v] == nil then
+		if motif.files.font_height[k] ~= nil then
+			motif.font_data[v] = fontNew(v, motif.files.font_height[k])
 		else
-			animSetColorKey(anim, -1)
+			motif.font_data[v] = fontNew(v)
 		end
-		
-		-- Scale non animated sprites
-		animUpdate(anim)
-		animSetScale(anim, 1 ,1)
-		
-		motif[t_dir[i]].bg_data[k] = anim
-		main.loadingRefresh()
 	end
+	main.loadingRefresh()
 end
 
 local function f_facing(var)
@@ -1662,27 +1630,6 @@ local function f_facing(var)
 	end
 end
 
-local function f_alphaToTable(var) --not used yet
-	var = var:match('^%s*(.-)%s*$')
-	var = var:lower()
-	if var:match('^a$') then
-		return {255, 255} --AS256D256
-	elseif var:match('^a1$') then
-		return {255, 128} --AS256D128
-	elseif var:match('^s$') then
-		return {1, 255} --AS0D256
-	elseif var:match('^s1$') then
-		return {1, 128} --are these values correct for S1?
-	elseif var:match('^as[0-9]+d[0-9]+$') then
-		local tabl = {}
-		tabl[1] = tonumber(var:match('^as([0-9]+)'))
-		tabl[2] = tonumber(var:match('d([0-9]+)$'))
-		return tabl
-	else
-		return nil
-	end
-end
-
 t = motif.select_info
 t_dir = {
 	{s = 'cell_bg_',                      x = 0,                                                   y = 0},
@@ -1703,21 +1650,12 @@ t_dir = {
 	{s = 'p2_teammenu_item_cursor_',      x = t.p2_teammenu_pos[1] + t.p2_teammenu_item_offset[1], y = t.p2_teammenu_pos[2] + t.p2_teammenu_item_offset[2]},
 	{s = 'p2_teammenu_value_icon_',       x = t.p2_teammenu_pos[1] + t.p2_teammenu_item_offset[1], y = t.p2_teammenu_pos[2] + t.p2_teammenu_item_offset[2]},
 	{s = 'p2_teammenu_value_empty_icon_', x = t.p2_teammenu_pos[1] + t.p2_teammenu_item_offset[1], y = t.p2_teammenu_pos[2] + t.p2_teammenu_item_offset[2]},
+	{s = 'stage_portrait_random_',        x = t.stage_pos[1] + t.stage_portrait_offset[1],         y = t.stage_pos[2] + t.stage_portrait_offset[2]},
+	
 }
 for i = 1, #t_dir do
-	--if i <= 2 and #t[t_dir[i].s .. 'spr'] == 0 and t[t_dir[i].s .. 'anim'] ~= nil and motif.anim[t[t_dir[i].s .. 'anim']] ~= nil then --cell_bg_, cell_random_
-	--	for j = 1, #motif.anim[t[t_dir[i].s .. 'anim']] do
-	--		for k, c in ipairs(main.f_strsplit(',', motif.anim[t[t_dir[i].s .. 'anim']][j])) do
-	--			if c:match('loopstart') then
-	--				break
-	--			elseif k <= 2 then
-	--				t[t_dir[i].s .. 'spr'][k] = tonumber(c)
-	--			elseif k == 7 and type(c) == 'string' then
-	--				t[t_dir[i].s .. 'alpha'] = f_alphaToTable(c)
-	--			end
-	--		end
-	--	end
-	--end
+	--if t[t_dir[i].s .. 'offset'] == nil then t[t_dir[i].s .. 'offset'] = {0, 0} end
+	--if t[t_dir[i].s .. 'scale'] == nil then t[t_dir[i].s .. 'scale'] = {1.0, 1.0} end
 	if #t[t_dir[i].s .. 'spr'] > 0 then --create sprite data
 		if #t[t_dir[i].s .. 'spr'] == 1 then --fix values
 			if type(t[t_dir[i].s .. 'spr'][1]) == 'string' then
@@ -1746,7 +1684,6 @@ for i = 1, #t_dir do
 		animUpdate(t[t_dir[i].s .. 'data'])
 	end
 	animSetWindow(t[t_dir[i].s .. 'data'], main.screenOverscan, 0, motif.info.localcoord[1], motif.info.localcoord[2])
-	--animAddPos(t[t_dir[i].s .. 'data'], 160, 0) --for some reason needed in ikemen (but not in this case)
 	main.loadingRefresh()
 end
 
@@ -1764,15 +1701,32 @@ if motif.anim[t.continue_anim] ~= nil then
 end
 
 if motif.vs_screen.p1_name_active_font == nil then
-	motif.vs_screen.p1_name_active_font = {motif.vs_screen.p1_name_font[1], motif.vs_screen.p1_name_font[2], motif.vs_screen.p1_name_font[3]}
+	motif.vs_screen.p1_name_active_font = {
+		motif.vs_screen.p1_name_font[1],
+		motif.vs_screen.p1_name_font[2],
+		motif.vs_screen.p1_name_font[3],
+		motif.vs_screen.p1_name_font[4],
+		motif.vs_screen.p1_name_font[5],
+		motif.vs_screen.p1_name_font[6],
+		motif.vs_screen.p1_name_font[7],
+		motif.vs_screen.p1_name_font[8]
+	}
 	motif.vs_screen.p1_name_active_font_scale = {motif.vs_screen.p1_name_font_scale[1], motif.vs_screen.p1_name_font_scale[2]}
 end
 if motif.vs_screen.p2_name_active_font == nil then
-	motif.vs_screen.p2_name_active_font = {motif.vs_screen.p2_name_font[1], motif.vs_screen.p2_name_font[2], motif.vs_screen.p2_name_font[3]}
+	motif.vs_screen.p2_name_active_font = {
+		motif.vs_screen.p2_name_font[1],
+		motif.vs_screen.p2_name_font[2],
+		motif.vs_screen.p2_name_font[3],
+		motif.vs_screen.p2_name_font[4],
+		motif.vs_screen.p2_name_font[5],
+		motif.vs_screen.p2_name_font[6],
+		motif.vs_screen.p2_name_font[7],
+		motif.vs_screen.p2_name_font[8]
+	}
 	motif.vs_screen.p2_name_active_font_scale = {motif.vs_screen.p2_name_font_scale[1], motif.vs_screen.p2_name_font_scale[2]}
 end
 
---motif.ctrldef = nil
 main.f_printTable(motif, "debug/t_motif.txt")
 
 return motif

--- a/script/options.lua
+++ b/script/options.lua
@@ -2,29 +2,26 @@
 local options = {}
 
 --;===========================================================
---; LOAD DATA
---;===========================================================
-
--- Data loading from lifebar
-local file = io.open(motif.files.fight,"r")
-local s_lifebar = file:read("*all")
-file:close()
-local roundsNum = tonumber(s_lifebar:match('match.wins%s*=%s*(%d+)'))
-options.framespercount = tonumber(s_lifebar:match('framespercount%s*=%s*(%d+)'))
-
-main.f_printTable(config, "debug/config.txt")
-
---;===========================================================
 --; COMMON
 --;===========================================================
 local modified = 0
-local modifiedlifebar = 0
 local needReload = 0
 
-local windowBox = animNew(main.fadeSff, '0,0, 0,0, -1')
-animSetTile(windowBox, 1, 1)
-animSetAlpha(windowBox, motif.option_info.menu_boxbackground_alpha[1], motif.option_info.menu_boxbackground_alpha[2])
-animUpdate(windowBox)
+if config.RoundsNumSingle == -1 then
+	options.roundsNumSingle = getMatchWins()
+else
+	options.roundsNumSingle = config.RoundsNumSingle
+end
+if config.RoundsNumTeam == -1 then
+	options.roundsNumTeam = getMatchWins()
+else
+	options.roundsNumTeam = config.RoundsNumTeam
+end
+if config.MaxDrawGames == -2 then
+	options.maxDrawGames = getMatchMaxDrawGames()
+else
+	options.maxDrawGames = config.MaxDrawGames
+end
 
 --return string depending on bool
 function options.f_boolDisplay(bool, t, f)
@@ -37,15 +34,12 @@ function options.f_boolDisplay(bool, t, f)
 	end
 end
 
---return string depending on int
-function options.f_intDisplay(bool, t, f)
-	t = t or motif.option_info.menu_itemname_yes
-	f = f or motif.option_info.menu_itemname_no
-	if bool == 1 then
-		return t
-	else
-		return f
+--return table entry if provided key exists there, otherwise return default argument
+function options.f_definedDisplay(key, t, default)
+	if t[key] ~= nil then
+		return t[key]
 	end
+	return default
 end
 
 --return correct precision
@@ -53,20 +47,12 @@ function options.f_precision(v, decimal)
 	return tonumber(string.format(decimal, v))
 end
 
+--save configuration
 function options.f_saveCfg()
 	--Data saving to config.json
 	local file = io.open("save/config.json","w+")
 	file:write(json.encode(config, {indent = true}))
 	file:close()
-	--Data saving to lifebar
-	if modifiedlifebar == 1 then
-		s_lifebar = s_lifebar:gsub('match.wins%s*=%s*%d+', 'match.wins = ' .. roundsNum)
-		file = io.open(motif.files.fight,"w+")
-		file:write(s_lifebar)
-		file:close()
-		--Reload lifebar
-		loadLifebar(motif.files.fight)
-	end
 	--Reload game if needed
 	if needReload == 1 then
 		main.f_warning(main.f_extractText(motif.warning_info.text_reload), motif.option_info, motif.optionbgdef)
@@ -74,62 +60,134 @@ function options.f_saveCfg()
 	end
 end
 
+--reset key settings
 function options.f_keyDefault()
-	config.KeyConfig[1].Buttons[1] = 'UP'
-	config.KeyConfig[1].Buttons[2] = 'DOWN'
-	config.KeyConfig[1].Buttons[3] = 'LEFT'
-	config.KeyConfig[1].Buttons[4] = 'RIGHT'
-	config.KeyConfig[1].Buttons[5] = 'z'
-	config.KeyConfig[1].Buttons[6] = 'x'
-	config.KeyConfig[1].Buttons[7] = 'c'
-	config.KeyConfig[1].Buttons[8] = 'a'
-	config.KeyConfig[1].Buttons[9] = 's'
-	config.KeyConfig[1].Buttons[10] = 'd'
-	config.KeyConfig[1].Buttons[11] = 'RETURN'
-	config.KeyConfig[1].Buttons[12] = 'q'
-	config.KeyConfig[1].Buttons[13] = 'w'
-	config.KeyConfig[2].Buttons[1] = 't'
-	config.KeyConfig[2].Buttons[2] = 'g'
-	config.KeyConfig[2].Buttons[3] = 'f'
-	config.KeyConfig[2].Buttons[4] = 'h'
-	config.KeyConfig[2].Buttons[5] = 'j'
-	config.KeyConfig[2].Buttons[6] = 'k'
-	config.KeyConfig[2].Buttons[7] = 'l'
-	config.KeyConfig[2].Buttons[8] = 'u'
-	config.KeyConfig[2].Buttons[9] = 'i'
-	config.KeyConfig[2].Buttons[10] = 'o'
-	config.KeyConfig[2].Buttons[11] = 'RSHIFT'
-	config.KeyConfig[2].Buttons[12] = 'LEFTBRACKET'
-	config.KeyConfig[2].Buttons[13] = 'RIGHTBRACKET'
-	config.JoystickConfig[1].Buttons[1] = '-7'
-	config.JoystickConfig[1].Buttons[2] = '-8'
-	config.JoystickConfig[1].Buttons[3] = '-5'
-	config.JoystickConfig[1].Buttons[4] = '-6'
-	config.JoystickConfig[1].Buttons[5] = '0'
-	config.JoystickConfig[1].Buttons[6] = '1'
-	config.JoystickConfig[1].Buttons[7] = '4'
-	config.JoystickConfig[1].Buttons[8] = '2'
-	config.JoystickConfig[1].Buttons[9] = '3'
-	config.JoystickConfig[1].Buttons[10] = '5'
-	config.JoystickConfig[1].Buttons[11] = '7'
-	config.JoystickConfig[1].Buttons[12] = '6'
-	config.JoystickConfig[1].Buttons[13] = '8'
-	config.JoystickConfig[2].Buttons[1] = '-7'
-	config.JoystickConfig[2].Buttons[2] = '-8'
-	config.JoystickConfig[2].Buttons[3] = '-5'
-	config.JoystickConfig[2].Buttons[4] = '-6'
-	config.JoystickConfig[2].Buttons[5] = '0'
-	config.JoystickConfig[2].Buttons[6] = '1'
-	config.JoystickConfig[2].Buttons[7] = '4'
-	config.JoystickConfig[2].Buttons[8] = '2'
-	config.JoystickConfig[2].Buttons[9] = '3'
-	config.JoystickConfig[2].Buttons[10] = '5'
-	config.JoystickConfig[2].Buttons[11] = '7'
-	config.JoystickConfig[2].Buttons[12] = '6'
-	config.JoystickConfig[2].Buttons[13] = '8'
+	for i = 1, #config.KeyConfig do
+		if i == 1 then
+			config.KeyConfig[i].Buttons[1] = 'UP'
+			config.KeyConfig[i].Buttons[2] = 'DOWN'
+			config.KeyConfig[i].Buttons[3] = 'LEFT'
+			config.KeyConfig[i].Buttons[4] = 'RIGHT'
+			config.KeyConfig[i].Buttons[5] = 'z'
+			config.KeyConfig[i].Buttons[6] = 'x'
+			config.KeyConfig[i].Buttons[7] = 'c'
+			config.KeyConfig[i].Buttons[8] = 'a'
+			config.KeyConfig[i].Buttons[9] = 's'
+			config.KeyConfig[i].Buttons[10] = 'd'
+			config.KeyConfig[i].Buttons[11] = 'RETURN'
+			config.KeyConfig[i].Buttons[12] = 'q'
+			config.KeyConfig[i].Buttons[13] = 'w'
+		elseif i == 2 then
+			config.KeyConfig[i].Buttons[1] = 't'
+			config.KeyConfig[i].Buttons[2] = 'g'
+			config.KeyConfig[i].Buttons[3] = 'f'
+			config.KeyConfig[i].Buttons[4] = 'h'
+			config.KeyConfig[i].Buttons[5] = 'j'
+			config.KeyConfig[i].Buttons[6] = 'k'
+			config.KeyConfig[i].Buttons[7] = 'l'
+			config.KeyConfig[i].Buttons[8] = 'u'
+			config.KeyConfig[i].Buttons[9] = 'i'
+			config.KeyConfig[i].Buttons[10] = 'o'
+			config.KeyConfig[i].Buttons[11] = 'RSHIFT'
+			config.KeyConfig[i].Buttons[12] = 'LEFTBRACKET'
+			config.KeyConfig[i].Buttons[13] = 'RIGHTBRACKET'
+		else
+			for j = 1, #config.KeyConfig[i].Buttons do
+				config.KeyConfig[i].Buttons[j] = tostring(motif.option_info.menu_itemname_info_disable)
+			end
+		end
+	end
+	for i = 1, #config.JoystickConfig do
+		config.JoystickConfig[i].Buttons[1] = '-3'
+		config.JoystickConfig[i].Buttons[2] = '-4'
+		config.JoystickConfig[i].Buttons[3] = '-1'
+		config.JoystickConfig[i].Buttons[4] = '-2'
+		config.JoystickConfig[i].Buttons[5] = '0'
+		config.JoystickConfig[i].Buttons[6] = '1'
+		config.JoystickConfig[i].Buttons[7] = '4'
+		config.JoystickConfig[i].Buttons[8] = '2'
+		config.JoystickConfig[i].Buttons[9] = '3'
+		config.JoystickConfig[i].Buttons[10] = '5'
+		config.JoystickConfig[i].Buttons[11] = '7'
+		config.JoystickConfig[i].Buttons[12] = '-10'
+		config.JoystickConfig[i].Buttons[13] = '-12'
+	end
+	resetRemapInput()
+end
+
+--reset vardisplay in tables
+function options.f_resetTables()
+	local t_displaynameReset = {
+		t_mainCfg = {
+			portchange = getListenPort(),
+		},
+		t_arcadeCfg = {
+			roundtime = options.f_definedDisplay(config.RoundTime, {[-1] = motif.option_info.menu_itemname_arcade_roundtime_none}, config.RoundTime),
+			roundsnumsingle = options.roundsNumSingle,
+			roundsnumteam = options.roundsNumTeam,
+			maxdrawgames = options.maxDrawGames,
+			difficulty = config.Difficulty,
+			credits = config.Credits,
+			charchange = options.f_boolDisplay(config.ContSelection),
+			airamping = options.f_boolDisplay(config.AIRamping),
+			airandomcolor = options.f_boolDisplay(config.AIRandomColor, motif.option_info.menu_itemname_arcade_aipalette_random, motif.option_info.menu_itemname_arcade_aipalette_default),
+		},
+		t_videoCfg = {
+			resolution = config.Width .. 'x' .. config.Height,
+			fullscreen = options.f_boolDisplay(config.Fullscreen),
+			msaa = options.f_boolDisplay(config.MSAA, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled),
+			postprocessingshader = options.t_shaderNames[config.PostProcessingShader],
+		},
+		t_audioCfg = {
+			mastervolume = config.MasterVolume .. '%',
+			bgmvolume = config.BgmVolume .. '%',
+			sfxvolume = config.WavVolume .. '%',
+			audioducking = options.f_boolDisplay(config.AudioDucking, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled),
+		},
+		t_gameplayCfg = {
+			lifemul = config.LifeMul .. '%',
+			autoguard = options.f_boolDisplay(config.AutoGuard),
+			team1vs2life = config.Team1VS2Life .. '%',
+			turnsrecoverybase = config.TurnsRecoveryBase .. '%',
+			turnsrecoverybonus = config.TurnsRecoveryBonus .. '%',
+			teampowershare = options.f_boolDisplay(config.TeamPowerShare),
+			teamlifeshare = options.f_boolDisplay(config.TeamLifeShare),
+		},
+		t_advGameplayCfg = {
+			attackpowermul = config['Attack.LifeToPowerMul'],
+			gethitpowermul = config['GetHit.LifeToPowerMul'],
+			superdefencemul = config['Super.TargetDefenceMul'],
+			singlemode = options.f_boolDisplay(config.SingleTeamMode, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled),
+			numturns = options.f_checkTeamAmount(config.NumTurns, 1, motif.option_info.menu_itemname_disabled),
+			numsimul = options.f_checkTeamAmount(config.NumSimul, 1, motif.option_info.menu_itemname_disabled),
+			numtag = options.f_checkTeamAmount(config.NumTag, 1, motif.option_info.menu_itemname_disabled),
+		},
+		t_engineCfg = {
+			allowdebugkeys = options.f_boolDisplay(config.AllowDebugKeys, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled),
+			simulmode = options.f_boolDisplay(config.SimulMode, motif.option_info.menu_itemname_disabled, motif.option_info.menu_itemname_enabled),
+			lifebarfontscale = config.LifebarFontScale,
+			helpermax = config.HelperMax,
+			playerprojectilemax = config.PlayerProjectileMax,
+			explodmax = config.ExplodMax,
+			afterimagemax = config.AfterImageMax,
+			zoomactive = options.f_boolDisplay(config.ZoomActive),
+			maxzoomout = config.ZoomMin,
+			maxzoomin = config.ZoomMax,
+			zoomspeed = config.ZoomSpeed,
+		},
+	}
+	for k1, v1 in pairs(t_displaynameReset) do
+		for k2, v2 in pairs(t_displaynameReset[k1]) do
+			for i = 1, #options[k1] do
+				if options[k1][i].itemname == k2 then
+					options[k1][i].vardisplay = v2
+				end
+			end
+		end
+	end
 end
 
-function options.f_menuCommon1(cursorPosY, moveTxt, item, t)
+function options.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 	if commandGetState(main.p1Cmd, 'u') then
 		sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
 		item = item - 1
@@ -184,33 +242,35 @@ local txt_title = main.f_createTextImg(
 	motif.option_info.title_font_scale[2],
 	motif.option_info.title_font[4],
 	motif.option_info.title_font[5],
-	motif.option_info.title_font[6]
+	motif.option_info.title_font[6],
+	motif.option_info.title_font[7],
+	motif.option_info.title_font[8]
 )
-function options.f_menuCommon2(cursorPosY, moveTxt, item, t)
+function options.f_menuCommonDraw(cursorPosY, moveTxt, item, t, fadeType)
+	fadeType = fadeType or 'fadein'
 	--draw clearcolor
-	animDraw(motif.optionbgdef.bgclearcolor_data)
+	clearColor(motif.optionbgdef.bgclearcolor[1], motif.optionbgdef.bgclearcolor[2], motif.optionbgdef.bgclearcolor[3])
 	--draw layerno = 0 backgrounds
-	main.f_drawBG(motif.optionbgdef.bg_data, motif.optionbgdef.bg, 0, motif.optionbgdef.timer, {320,240})
+	bgDraw(motif.optionbgdef.bg, false)
 	--draw menu box
-	if motif.option_info.menu_boxbackground_visible == 1 then
+	if motif.option_info.menu_boxbg_visible == 1 then
+		local coord4 = 0
 		if #t > motif.option_info.menu_window_visibleitems and moveTxt == (#t - motif.option_info.menu_window_visibleitems) * motif.option_info.menu_item_spacing[2] then
-			animSetWindow(
-				windowBox,
-				motif.option_info.menu_pos[1] + motif.option_info.menu_boxcursor_coords[1],
-				motif.option_info.menu_pos[2] + motif.option_info.menu_boxcursor_coords[2],
-				motif.option_info.menu_boxcursor_coords[3] - motif.option_info.menu_boxcursor_coords[1] + 1,
-				motif.option_info.menu_window_visibleitems * (motif.option_info.menu_boxcursor_coords[4] - motif.option_info.menu_boxcursor_coords[2] + 1)
-			)
+			coord4 = motif.option_info.menu_window_visibleitems * (motif.option_info.menu_boxcursor_coords[4] - motif.option_info.menu_boxcursor_coords[2] + 1) + main.f_oddRounding(motif.option_info.menu_boxcursor_coords[2])
 		else
-			animSetWindow(
-				windowBox,
-				motif.option_info.menu_pos[1] + motif.option_info.menu_boxcursor_coords[1],
-				motif.option_info.menu_pos[2] + motif.option_info.menu_boxcursor_coords[2],
-				motif.option_info.menu_boxcursor_coords[3] - motif.option_info.menu_boxcursor_coords[1] + 1,
-				#t * (motif.option_info.menu_boxcursor_coords[4] - motif.option_info.menu_boxcursor_coords[2] + 1)
-			)
+			coord4 = #t * (motif.option_info.menu_boxcursor_coords[4] - motif.option_info.menu_boxcursor_coords[2] + 1) + main.f_oddRounding(motif.option_info.menu_boxcursor_coords[2])
 		end
-		animDraw(windowBox)
+		fillRect(
+			motif.option_info.menu_pos[1] + motif.option_info.menu_boxcursor_coords[1],
+			motif.option_info.menu_pos[2] + motif.option_info.menu_boxcursor_coords[2],
+			motif.option_info.menu_boxcursor_coords[3] - motif.option_info.menu_boxcursor_coords[1] + 1,
+			coord4,
+			motif.option_info.menu_boxbg_col[1],
+			motif.option_info.menu_boxbg_col[2],
+			motif.option_info.menu_boxbg_col[3],
+			motif.option_info.menu_boxbg_alpha[1],
+			motif.option_info.menu_boxbg_alpha[2]
+		)
 	end
 	--draw title
 	textImgDraw(txt_title)
@@ -230,7 +290,9 @@ function options.f_menuCommon2(cursorPosY, moveTxt, item, t)
 					motif.option_info.menu_item_active_font_scale[2],
 					motif.option_info.menu_item_active_font[4],
 					motif.option_info.menu_item_active_font[5],
-					motif.option_info.menu_item_active_font[6]
+					motif.option_info.menu_item_active_font[6],
+					motif.option_info.menu_item_active_font[7],
+					motif.option_info.menu_item_active_font[8]
 				))
 				if t[i].vardata ~= nil then
 					textImgDraw(main.f_updateTextImg(
@@ -245,7 +307,9 @@ function options.f_menuCommon2(cursorPosY, moveTxt, item, t)
 						motif.option_info.menu_item_value_active_font_scale[2],
 						motif.option_info.menu_item_value_active_font[4],
 						motif.option_info.menu_item_value_active_font[5],
-						motif.option_info.menu_item_value_active_font[6]
+						motif.option_info.menu_item_value_active_font[6],
+						motif.option_info.menu_item_value_active_font[7],
+						motif.option_info.menu_item_value_active_font[8]
 					))
 				end
 			else
@@ -261,7 +325,9 @@ function options.f_menuCommon2(cursorPosY, moveTxt, item, t)
 					motif.option_info.menu_item_font_scale[2],
 					motif.option_info.menu_item_font[4],
 					motif.option_info.menu_item_font[5],
-					motif.option_info.menu_item_font[6]
+					motif.option_info.menu_item_font[6],
+					motif.option_info.menu_item_font[7],
+					motif.option_info.menu_item_font[8]
 				))
 				if t[i].vardata ~= nil then
 					textImgDraw(main.f_updateTextImg(
@@ -276,45 +342,63 @@ function options.f_menuCommon2(cursorPosY, moveTxt, item, t)
 						motif.option_info.menu_item_value_font_scale[2],
 						motif.option_info.menu_item_value_font[4],
 						motif.option_info.menu_item_value_font[5],
-						motif.option_info.menu_item_value_font[6]
+						motif.option_info.menu_item_value_font[6],
+						motif.option_info.menu_item_value_font[7],
+						motif.option_info.menu_item_value_font[8]
 					))
 				end
 			end
 		end
 	end
 	--draw menu cursor
-	if motif.option_info.menu_boxcursor_visible == 1 then
-		animSetWindow(
-			main.cursorBox,
+	if motif.option_info.menu_boxcursor_visible == 1 and not main.fadeActive then
+		local src, dst = main.f_boxcursorAlpha(
+			motif.option_info.menu_boxcursor_alpharange[1],
+			motif.option_info.menu_boxcursor_alpharange[2],
+			motif.option_info.menu_boxcursor_alpharange[3],
+			motif.option_info.menu_boxcursor_alpharange[4],
+			motif.option_info.menu_boxcursor_alpharange[5],
+			motif.option_info.menu_boxcursor_alpharange[6]
+		)
+		fillRect(
 			motif.option_info.menu_pos[1] + motif.option_info.menu_boxcursor_coords[1],
 			motif.option_info.menu_pos[2] + motif.option_info.menu_boxcursor_coords[2] + (cursorPosY - 1) * motif.option_info.menu_item_spacing[2],
 			motif.option_info.menu_boxcursor_coords[3] - motif.option_info.menu_boxcursor_coords[1] + 1,
-			motif.option_info.menu_boxcursor_coords[4] - motif.option_info.menu_boxcursor_coords[2] + 1
+			motif.option_info.menu_boxcursor_coords[4] - motif.option_info.menu_boxcursor_coords[2] + 1 + main.f_oddRounding(motif.option_info.menu_boxcursor_coords[2]),
+			motif.option_info.menu_boxcursor_col[1],
+			motif.option_info.menu_boxcursor_col[2],
+			motif.option_info.menu_boxcursor_col[3],
+			src,
+			dst
 		)
-		main.f_dynamicAlpha(main.cursorBox, 10,40,2, 255,255,0)
-		animDraw(main.cursorBox)
 	end
 	--draw layerno = 1 backgrounds
-	main.f_drawBG(motif.optionbgdef.bg_data, motif.optionbgdef.bg, 1, motif.optionbgdef.timer, {320,240})
-	--draw fadein
-	animDraw(motif.option_info.fadein_data)
-	animUpdate(motif.option_info.fadein_data)
-	--update timer
-	motif.optionbgdef.timer = motif.optionbgdef.timer + 1
-	--end loop
-	main.f_cmdInput()
+	bgDraw(motif.optionbgdef.bg, true)
+	--draw fadein / fadeout
+	main.fadeActive = fadeScreen(
+		fadeType,
+		main.fadeStart,
+		motif.option_info[fadeType .. '_time'],
+		motif.option_info[fadeType .. '_col'][1],
+		motif.option_info[fadeType .. '_col'][2],
+		motif.option_info[fadeType .. '_col'][3]
+	)
+	--frame transition
+	if main.fadeActive then
+		commandBufReset(main.p1Cmd)
+	elseif fadeType == 'fadeout' then
+		commandBufReset(main.p1Cmd)
+		return --skip last frame rendering
+	else
+		main.f_cmdInput()
+	end
 	refresh()
 end
 
 --;===========================================================
 --; MAIN LOOP
 --;===========================================================
-local t_quicklaunchNames = {}
-t_quicklaunchNames[0] = "Disabled"
-t_quicklaunchNames[1] = "Level1"
-t_quicklaunchNames[2] = "Level2"
-
-local t_mainCfg = {
+options.t_mainCfg = {
 	{data = textImgNew(), itemname = 'arcadesettings', displayname = motif.option_info.menu_itemname_main_arcade},
 	{data = textImgNew(), itemname = 'videosettings', displayname = motif.option_info.menu_itemname_main_video},
 	{data = textImgNew(), itemname = 'audiosettings', displayname = motif.option_info.menu_itemname_main_audio},
@@ -322,28 +406,39 @@ local t_mainCfg = {
 	{data = textImgNew(), itemname = 'gameplaysettings', displayname = motif.option_info.menu_itemname_main_gameplay},
 	{data = textImgNew(), itemname = 'enginesettings', displayname = motif.option_info.menu_itemname_main_engine},
 	{data = textImgNew(), itemname = 'empty', displayname = ' '},
-	{data = textImgNew(), itemname = 'quicklaunch', displayname = motif.option_info.menu_itemname_engine_quicklaunch, vardata = textImgNew(), vardisplay = t_quicklaunchNames[config.QuickLaunch]},
 	{data = textImgNew(), itemname = 'portchange', displayname = motif.option_info.menu_itemname_main_port, vardata = textImgNew(), vardisplay = getListenPort()},
 	{data = textImgNew(), itemname = 'defaultvalues', displayname = motif.option_info.menu_itemname_main_default},
 	{data = textImgNew(), itemname = 'empty', displayname = ' '},
 	{data = textImgNew(), itemname = 'save', displayname = motif.option_info.menu_itemname_main_save},
 	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_main_back},
 }
-t_mainCfg = main.f_cleanTable(t_mainCfg)
+options.t_mainCfg = main.f_cleanTable(options.t_mainCfg, main.t_sort.option_info)
 
 function options.f_mainCfg()
 	main.f_cmdInput()
 	local cursorPosY = 1
 	local moveTxt = 0
 	local item = 1
-	local t = t_mainCfg
+	local t = options.t_mainCfg
 	textImgSetText(txt_title, motif.option_info.title_text_main)
-	main.f_resetBG(motif.option_info, motif.optionbgdef)
+	if motif.music.option_bgm == '' then
+		main.f_menuReset(motif.optionbgdef.bg)
+	else
+		main.f_menuReset(motif.optionbgdef.bg, motif.music.option_bgm, motif.music.option_bgm_loop, motif.music.option_bgm_volume, motif.music.option_bgm_loopstart, motif.music.option_bgm_loopend)
+	end
 	while true do
-		cursorPosY, moveTxt, item = options.f_menuCommon1(cursorPosY, moveTxt, item, t)
+		cursorPosY, moveTxt, item = options.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 		if esc() then
 			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
-			main.f_resetBG(motif.title_info, motif.titlebgdef)
+			if modified == 1 then
+				options.f_saveCfg()
+			end
+			main.f_menuFade('option_info', 'fadeout', cursorPosY, moveTxt, item, t)
+			if motif.music.option_bgm == '' then
+				main.f_menuReset(motif.titlebgdef.bg)
+			else
+				main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+			end
 			break
 		--Port Change
 		elseif t[item].itemname == 'portchange' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
@@ -357,42 +452,31 @@ function options.f_mainCfg()
 			end
 			t[item].vardisplay = getListenPort()
 			modified = 1
-		-- Quick Launch
-		elseif t[item].itemname == 'quicklaunch' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
-			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-			if commandGetState(main.p1Cmd, 'r') and config.QuickLaunch < #t_quicklaunchNames then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.QuickLaunch = config.QuickLaunch + 1
-			elseif commandGetState(main.p1Cmd, 'l') and config.QuickLaunch > 0 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.QuickLaunch = config.QuickLaunch - 1
-			end
-			t[item].vardisplay = t_quicklaunchNames[config.QuickLaunch]
-			modified = 1
 		elseif main.f_btnPalNo(main.p1Cmd) > 0 then
 			--Arcade Settings
 			if t[item].itemname == 'arcadesettings' then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
 				options.f_arcadeCfg()
-			--Gameplay Settings
-			elseif t[item].itemname == 'gameplaysettings' then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
-				options.f_gameplayCfg()
 			--Video Settings
 			elseif t[item].itemname == 'videosettings' then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
 				options.f_videoCfg()
+			--Audio Settings
 			elseif t[item].itemname == 'audiosettings' then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
 				options.f_audioCfg()
-			--Engine Settings
-				elseif t[item].itemname == 'enginesettings' then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
-				options.f_engineCfg()
 			--Input Settings
 			elseif t[item].itemname == 'inputsettings' then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
 				options.f_inputCfg()
+			--Gameplay Settings
+			elseif t[item].itemname == 'gameplaysettings' then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
+				options.f_gameplayCfg()
+			--Engine Settings
+			elseif t[item].itemname == 'enginesettings' then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
+				options.f_engineCfg()
 			--Default Values
 			elseif t[item].itemname == 'defaultvalues' then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
@@ -400,6 +484,9 @@ function options.f_mainCfg()
 				config.PlayerProjectileMax = 256
 				config.ExplodMax = 512
 				config.AfterImageMax = 128
+				config.MasterVolume = 80
+				config.WavVolume = 80
+				config.BgmVolume = 80
 				config['Attack.LifeToPowerMul'] = 0.7
 				config['GetHit.LifeToPowerMul'] = 0.6
 				config.Width = 640
@@ -408,17 +495,24 @@ function options.f_mainCfg()
 				config.LifebarFontScale = 1
 				--config.System = 'script/main.lua'
 				options.f_keyDefault()
+				--config.ControllerStickSensitivity = 0.4
+				--config.XinputTriggerSensitivity = 0
 				--config.Motif = 'data/system.def'
+				--config.CommonAir = 'data/common.air'
+				--config.CommonCmd = 'data/common.cmd'
 				config.SimulMode = true
 				config.LifeMul = 100
-				config.Team1VS2Life = 120
-				config.TurnsRecoveryRate = 300
+				config.Team1VS2Life = 100
+				config.TurnsRecoveryBase = 12.5
+				config.TurnsRecoveryBonus = 27.5
 				config.ZoomActive = false
 				config.ZoomMin = 0.75
 				config.ZoomMax = 1.1
 				config.ZoomSpeed = 1.0
-				config.AIRandomColor = true
 				config.RoundTime = 99
+				config.RoundsNumSingle = -1
+				config.RoundsNumTeam = -1
+				config.MaxDrawGames = -2
 				config.SingleTeamMode = true
 				config.NumTurns = 4
 				config.NumSimul = 4
@@ -427,88 +521,142 @@ function options.f_mainCfg()
 				config.Credits = 10
 				setListenPort(7500)
 				config.ContSelection = true
+				config.AIRandomColor = true
 				config.AIRamping = true
 				config.AutoGuard = false
 				config.TeamPowerShare = false
 				config.TeamLifeShare = false
 				config.Fullscreen = false
-				--lifebar
-				roundsNum = 2
+				config.AudioDucking = false
+				config.QuickLaunch = 0
+				config.AllowDebugKeys = true
+				config.ComboExtraFrameWindow = 1
+				config.PostProcessingShader = 0
+				config.LocalcoordScalingType = 1
+				config.MSAA = false
+				loadLifebar(motif.files.fight)
+				options.roundsNumSingle = getMatchWins()
+				options.roundsNumTeam = getMatchWins()
+				options.maxDrawGames = getMatchMaxDrawGames()
+				options.f_resetTables()
 				modified = 1
 				needReload = 1
-			-- Save
+			--Save
 			elseif t[item].itemname == 'save' then
 				sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
 				if modified == 1 then
 					options.f_saveCfg()
 				end
-				main.f_resetBG(motif.title_info, motif.titlebgdef)
+				main.f_menuFade('option_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				if motif.music.option_bgm == '' then
+					main.f_menuReset(motif.titlebgdef.bg)
+				else
+					main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+				end
 				break
-			-- Back
+			--Back
 			elseif t[item].itemname == 'back' then
 				sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
-				main.f_resetBG(motif.title_info, motif.titlebgdef)
+				main.f_menuFade('option_info', 'fadeout', cursorPosY, moveTxt, item, t)
+				if motif.music.option_bgm == '' then
+					main.f_menuReset(motif.titlebgdef.bg)
+				else
+					main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+				end
 				break
 			end
 		end
-		options.f_menuCommon2(cursorPosY, moveTxt, item, t)
+		options.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
 	end
 end
 
 --;===========================================================
 --; ARCADE SETTINGS
 --;===========================================================
-local t_arcadeCfg = {
-	{data = textImgNew(), itemname = 'roundstowin', displayname = motif.option_info.menu_itemname_arcade_roundstowin, vardata = textImgNew(), vardisplay = roundsNum},
-	{data = textImgNew(), itemname = 'roundtime', displayname = motif.option_info.menu_itemname_arcade_roundtime, vardata = textImgNew(), vardisplay = config.RoundTime},
+options.t_arcadeCfg = {
+	{data = textImgNew(), itemname = 'roundtime', displayname = motif.option_info.menu_itemname_arcade_roundtime, vardata = textImgNew(), vardisplay = options.f_definedDisplay(config.RoundTime, {[-1] = motif.option_info.menu_itemname_arcade_roundtime_none}, config.RoundTime)},
+	{data = textImgNew(), itemname = 'roundsnumsingle', displayname = motif.option_info.menu_itemname_arcade_roundsnumsingle, vardata = textImgNew(), vardisplay = options.roundsNumSingle},
+	{data = textImgNew(), itemname = 'roundsnumteam', displayname = motif.option_info.menu_itemname_arcade_roundsnumteam, vardata = textImgNew(), vardisplay = options.roundsNumTeam},
+	{data = textImgNew(), itemname = 'maxdrawgames', displayname = motif.option_info.menu_itemname_arcade_maxdrawgames, vardata = textImgNew(), vardisplay = options.maxDrawGames},
 	{data = textImgNew(), itemname = 'difficulty', displayname = motif.option_info.menu_itemname_arcade_difficulty, vardata = textImgNew(), vardisplay = config.Difficulty},
 	{data = textImgNew(), itemname = 'credits', displayname = motif.option_info.menu_itemname_arcade_credits, vardata = textImgNew(), vardisplay = config.Credits},
 	{data = textImgNew(), itemname = 'charchange', displayname = motif.option_info.menu_itemname_arcade_charchange, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.ContSelection)},
 	{data = textImgNew(), itemname = 'airamping', displayname = motif.option_info.menu_itemname_arcade_airamping, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.AIRamping)},
+	{data = textImgNew(), itemname = 'airandomcolor', displayname = motif.option_info.menu_itemname_arcade_aipalette, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.AIRandomColor, motif.option_info.menu_itemname_arcade_aipalette_random, motif.option_info.menu_itemname_arcade_aipalette_default)},
 	{data = textImgNew(), itemname = 'empty', displayname = ' '},
 	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_arcade_back},
 }
-t_arcadeCfg = main.f_cleanTable(t_arcadeCfg)
+options.t_arcadeCfg = main.f_cleanTable(options.t_arcadeCfg, main.t_sort.option_info)
 
 function options.f_arcadeCfg()
 	main.f_cmdInput()
 	local cursorPosY = 1
 	local moveTxt = 0
 	local item = 1
-	local t = t_arcadeCfg
+	local t = options.t_arcadeCfg
 	textImgSetText(txt_title, motif.option_info.title_text_arcade)
 	while true do
-		cursorPosY, moveTxt, item = options.f_menuCommon1(cursorPosY, moveTxt, item, t)
+		cursorPosY, moveTxt, item = options.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 		if esc() then
 			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
 			textImgSetText(txt_title, motif.option_info.title_text_main)
 			break
-		--Rounds to Win
-		elseif t[item].itemname == 'roundstowin' then
-			if commandGetState(main.p1Cmd, 'r') and roundsNum < 10 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				roundsNum = roundsNum + 1
-				t[item].vardisplay = roundsNum
-				modifiedlifebar = 1
-				modified = 1
-			elseif commandGetState(main.p1Cmd, 'l') and roundsNum > 1 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				roundsNum = roundsNum - 1
-				t[item].vardisplay = roundsNum
-				modifiedlifebar = 1
-				modified = 1
-			end
-		--Round Time
+		--Time Limit
 		elseif t[item].itemname == 'roundtime' then
 			if commandGetState(main.p1Cmd, 'r') and config.RoundTime < 1000 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
 				config.RoundTime = config.RoundTime + 1
 				t[item].vardisplay = config.RoundTime
 				modified = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config.RoundTime > -2 then
+			elseif commandGetState(main.p1Cmd, 'l') and config.RoundTime > -1 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
 				config.RoundTime = config.RoundTime - 1
-				t[item].vardisplay = config.RoundTime
+				t[item].vardisplay = options.f_definedDisplay(config.RoundTime, {[-1] = motif.option_info.menu_itemname_arcade_roundtime_none}, config.RoundTime)
+				modified = 1
+			end
+		--Rounds to Win Single
+		elseif t[item].itemname == 'roundsnumsingle' then
+			if commandGetState(main.p1Cmd, 'r') and options.roundsNumSingle < 10 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				options.roundsNumSingle = options.roundsNumSingle + 1
+				t[item].vardisplay = options.roundsNumSingle
+				config.RoundsNumSingle = options.roundsNumSingle
+				modified = 1
+			elseif commandGetState(main.p1Cmd, 'l') and options.roundsNumSingle > 1 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				options.roundsNumSingle = options.roundsNumSingle - 1
+				t[item].vardisplay = options.roundsNumSingle
+				config.RoundsNumSingle = options.roundsNumSingle
+				modified = 1
+			end
+		--Rounds to Win Simul/Tag
+		elseif t[item].itemname == 'roundsnumteam' then
+			if commandGetState(main.p1Cmd, 'r') and options.roundsNumTeam < 10 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				options.roundsNumTeam = options.roundsNumTeam + 1
+				t[item].vardisplay = options.roundsNumTeam
+				config.RoundsNumTeam = options.roundsNumTeam
+				modified = 1
+			elseif commandGetState(main.p1Cmd, 'l') and options.roundsNumTeam > 1 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				options.roundsNumTeam = options.roundsNumTeam - 1
+				t[item].vardisplay = options.roundsNumTeam
+				config.RoundsNumTeam = options.roundsNumTeam
+				modified = 1
+			end
+		--Max Draw Games
+		elseif t[item].itemname == 'maxdrawgames' then
+			if commandGetState(main.p1Cmd, 'r') and options.maxDrawGames < 10 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				options.maxDrawGames = options.maxDrawGames + 1
+				t[item].vardisplay = options.maxDrawGames
+				config.MaxDrawGames = options.maxDrawGames
+				modified = 1
+			elseif commandGetState(main.p1Cmd, 'l') and options.maxDrawGames > -1 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				options.maxDrawGames = options.maxDrawGames - 1
+				t[item].vardisplay = options.maxDrawGames
+				config.MaxDrawGames = options.maxDrawGames
 				modified = 1
 			end
 		--Difficulty level
@@ -547,7 +695,7 @@ function options.f_arcadeCfg()
 			end
 			t[item].vardisplay = options.f_boolDisplay(config.ContSelection)
 			modified = 1
-		--AI ramping
+		--AI Ramping
 		elseif t[item].itemname == 'airamping' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
 			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
 			if config.AIRamping then
@@ -557,260 +705,373 @@ function options.f_arcadeCfg()
 			end
 			t[item].vardisplay = options.f_boolDisplay(config.AIRamping)
 			modified = 1
+		--AI Palette
+		elseif t[item].itemname == 'airandomcolor' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
+			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+			if config.AIRandomColor then
+				config.AIRandomColor = false
+			else
+				config.AIRandomColor = true
+			end
+			t[item].vardisplay = options.f_boolDisplay(config.AIRandomColor, motif.option_info.menu_itemname_arcade_aipalette_random, motif.option_info.menu_itemname_arcade_aipalette_default)
+			modified = 1
 		--Back
 		elseif t[item].itemname == 'back' and main.f_btnPalNo(main.p1Cmd) > 0 then
 			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
 			textImgSetText(txt_title, motif.option_info.title_text_main)
 			break
 		end
-		options.f_menuCommon2(cursorPosY, moveTxt, item, t)
+		options.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
 	end
 end
 
 --;===========================================================
---; GAMEPLAY SETTINGS
+--; VIDEO SETTINGS
 --;===========================================================
-local t_gameplayCfg = {
-	{data = textImgNew(), itemname = 'lifemul', displayname = motif.option_info.menu_itemname_gameplay_lifemul, vardata = textImgNew(), vardisplay = config.LifeMul .. '%'},
-	{data = textImgNew(), itemname = 'autoguard', displayname = motif.option_info.menu_itemname_gameplay_autoguard, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.AutoGuard)},
-	{data = textImgNew(), itemname = 'team1vs2life', displayname = motif.option_info.menu_itemname_gameplay_team1vs2life, vardata = textImgNew(), vardisplay = config.Team1VS2Life},
-	{data = textImgNew(), itemname = 'turnsrecoveryrate', displayname = motif.option_info.menu_itemname_gameplay_turnsrecoveryrate, vardata = textImgNew(), vardisplay = config.TurnsRecoveryRate},
-	{data = textImgNew(), itemname = 'teampowershare', displayname = motif.option_info.menu_itemname_gameplay_teampowershare, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.TeamPowerShare)},
-	{data = textImgNew(), itemname = 'teamlifeshare', displayname = motif.option_info.menu_itemname_gameplay_teamlifeshare, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.TeamLifeShare)},
+options.t_shaderNames = {
+	[0] = motif.option_info.menu_itemname_video_shader_none,
+	[1] = motif.option_info.menu_itemname_video_shader_hqx2,
+	[2] = motif.option_info.menu_itemname_video_shader_hqx4,
+	[3] = motif.option_info.menu_itemname_video_shader_scanlines,
+}
+
+options.t_videoCfg = {
+	{data = textImgNew(), itemname = 'resolution', displayname = motif.option_info.menu_itemname_video_resolution, vardata = textImgNew(), vardisplay = config.Width .. 'x' .. config.Height},
+	{data = textImgNew(), itemname = 'fullscreen', displayname = motif.option_info.menu_itemname_video_fullscreen, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.Fullscreen)},
+	{data = textImgNew(), itemname = 'msaa', displayname = motif.option_info.menu_itemname_video_msaa, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.MSAA, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)},
+	{data = textImgNew(), itemname = 'postprocessingshader', displayname = motif.option_info.menu_itemname_video_shader, vardata = textImgNew(), vardisplay = options.t_shaderNames[config.PostProcessingShader]},
 	{data = textImgNew(), itemname = 'empty', displayname = ' '},
-	{data = textImgNew(), itemname = 'advancedGameplaySettings', displayname = motif.option_info.menu_itemname_gameplay_advanced},
-	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_gameplay_back},
+	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_video_back},
 }
-t_gameplayCfg = main.f_cleanTable(t_gameplayCfg)
+options.t_videoCfg = main.f_cleanTable(options.t_videoCfg, main.t_sort.option_info)
 
-function options.f_gameplayCfg()
+function options.f_videoCfg()
 	main.f_cmdInput()
 	local cursorPosY = 1
 	local moveTxt = 0
 	local item = 1
-	local t = t_gameplayCfg
-	textImgSetText(txt_title, motif.option_info.title_text_gameplay)
+	local t = options.t_videoCfg
+	textImgSetText(txt_title, motif.option_info.title_text_video)
 	while true do
-		cursorPosY, moveTxt, item = options.f_menuCommon1(cursorPosY, moveTxt, item, t)
+		cursorPosY, moveTxt, item = options.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 		if esc() then
 			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
 			textImgSetText(txt_title, motif.option_info.title_text_main)
 			break
-		--Life
-		elseif t[item].itemname == 'lifemul' then
-			if commandGetState(main.p1Cmd, 'r') and config.LifeMul < 300 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.LifeMul = config.LifeMul + 10
-				t[item].vardisplay = config.LifeMul .. '%'
-				modified = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config.LifeMul > 10 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.LifeMul = config.LifeMul - 10
-				t[item].vardisplay = config.LifeMul .. '%'
-				modified = 1
-			end
-		--Auto-Guard
-		elseif t[item].itemname == 'autoguard' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
+		--Resolution
+		elseif t[item].itemname == 'resolution' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
 			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-			if config.AutoGuard then
-				config.AutoGuard = false
+			options.f_resCfg()
+			t[item].vardisplay = config.Width .. 'x' .. config.Height
+		--Fullscreen
+		elseif t[item].itemname == 'fullscreen' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
+			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+			if config.Fullscreen then
+				config.Fullscreen = false
 			else
-				config.AutoGuard = true
+				config.Fullscreen = true
 			end
-			t[item].vardisplay = options.f_boolDisplay(config.AutoGuard)
+			t[item].vardisplay = options.f_boolDisplay(config.Fullscreen)
 			modified = 1
-		--1P Vs Team Life
-		elseif t[item].itemname == 'team1vs2life' then
-			if commandGetState(main.p1Cmd, 'r') and config.Team1VS2Life < 3000 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.Team1VS2Life = config.Team1VS2Life + 10
-				t[item].vardisplay = config.Team1VS2Life
-				modified = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config.Team1VS2Life > 10 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.Team1VS2Life = config.Team1VS2Life - 10
-				t[item].vardisplay = config.Team1VS2Life
-				modified = 1
+			needReload = 1
+		--MSAA
+		elseif t[item].itemname == 'msaa' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
+			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+			if config.MSAA then
+				config.MSAA = false
+			else
+				config.MSAA = true
 			end
-		--Turns HP Recovery
-		elseif t[item].itemname == 'turnsrecoveryrate' then
-			if commandGetState(main.p1Cmd, 'r') and config.TurnsRecoveryRate < 3000 then
+			t[item].vardisplay = options.f_boolDisplay(config.MSAA, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)
+			modified = 1
+			needReload = 1
+		--Shader
+		elseif t[item].itemname == 'postprocessingshader' then
+			if commandGetState(main.p1Cmd, 'r') and config.PostProcessingShader < #options.t_shaderNames then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.TurnsRecoveryRate = config.TurnsRecoveryRate + 10
-				t[item].vardisplay = config.TurnsRecoveryRate
+				config.PostProcessingShader = config.PostProcessingShader + 1
 				modified = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config.TurnsRecoveryRate > 10 then
+				needReload = 1
+			elseif commandGetState(main.p1Cmd, 'l') and config.PostProcessingShader > 0 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.TurnsRecoveryRate = config.TurnsRecoveryRate - 10
-				t[item].vardisplay = config.TurnsRecoveryRate
+				config.PostProcessingShader = config.PostProcessingShader - 1
 				modified = 1
+				needReload = 1
 			end
-		--Team Power Share
-		elseif t[item].itemname == 'teampowershare' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
-			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-			if config.TeamPowerShare then
-				config.TeamPowerShare = false
-			else
-				config.TeamPowerShare = true
-			end
-			t[item].vardisplay = options.f_boolDisplay(config.TeamPowerShare)
-			modified = 1
-		--Team Life Share
-		elseif t[item].itemname == 'teamlifeshare' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
-			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-			if config.TeamLifeShare then
-				config.TeamLifeShare = false
-			else
-				config.TeamLifeShare = true
-			end
-			t[item].vardisplay = options.f_boolDisplay(config.TeamLifeShare)
-			modified = 1
-		-- Advanced settings
-		elseif t[item].itemname == 'advancedGameplaySettings' and main.f_btnPalNo(main.p1Cmd) > 0 then
-			sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
-			options.f_advGameplayCfg()
+			t[item].vardisplay = options.t_shaderNames[config.PostProcessingShader]
 		--Back
 		elseif t[item].itemname == 'back' and main.f_btnPalNo(main.p1Cmd) > 0 then
 			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
 			textImgSetText(txt_title, motif.option_info.title_text_main)
 			break
 		end
-		options.f_menuCommon2(cursorPosY, moveTxt, item, t)
+		options.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
 	end
 end
 
-
 --;===========================================================
---; ADVANCED GAMEPLAY SETTINGS
+--; RESOLUTION SETTINGS
 --;===========================================================
-function options.f_checkTeamAmount(arg1, arg2, arg3)
-	ret = arg1
-	if arg1 <= arg2 then
-		ret = arg3
-	end
-
-	return ret
-end
-
-local t_advGameplayCfg = {
-	{data = textImgNew(), itemname = 'attackpowermul', displayname = motif.option_info.menu_itemname_gameplay_attackpowermul, vardata = textImgNew(), vardisplay = config['Attack.LifeToPowerMul']},
-	{data = textImgNew(), itemname = 'gethitpowermul', displayname = motif.option_info.menu_itemname_gameplay_gethitpowermul, vardata = textImgNew(), vardisplay = config['GetHit.LifeToPowerMul']},
-	{data = textImgNew(), itemname = 'superdefencemul', displayname = motif.option_info.menu_itemname_gameplay_superdefencemul, vardata = textImgNew(), vardisplay = config['Super.TargetDefenceMul']},
-	{data = textImgNew(), itemname = 'empty', displayname = ' '},
-	{data = textImgNew(), itemname = 'singlemode', displayname = motif.option_info.menu_itemname_gameplay_singlemode, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.SingleTeamMode, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)},
-	{data = textImgNew(), itemname = 'numturns', displayname = motif.option_info.menu_itemname_gameplay_numturns, vardata = textImgNew(), vardisplay = options.f_checkTeamAmount(config.NumTurns, 1, motif.option_info.menu_itemname_disabled)},
-	{data = textImgNew(), itemname = 'numsimul', displayname = motif.option_info.menu_itemname_gameplay_numsimul, vardata = textImgNew(), vardisplay = options.f_checkTeamAmount(config.NumSimul, 1, motif.option_info.menu_itemname_disabled)},
-	{data = textImgNew(), itemname = 'numtag', displayname = motif.option_info.menu_itemname_gameplay_numtag, vardata = textImgNew(), vardisplay = options.f_checkTeamAmount(config.NumTag, 1, motif.option_info.menu_itemname_disabled)},
+local t_resCfg = {
+	{data = textImgNew(), x = 320,  y = 240, displayname = motif.option_info.menu_itemname_res_320x240},
+	{data = textImgNew(), x = 640,  y = 480, displayname = motif.option_info.menu_itemname_res_640x480},
+	{data = textImgNew(), x = 1280, y = 960, displayname = motif.option_info.menu_itemname_res_1280x960},
+	{data = textImgNew(), x = 1600, y = 1200, displayname = motif.option_info.menu_itemname_res_1600x1200},
+	{data = textImgNew(), x = 960,  y = 720, displayname = motif.option_info.menu_itemname_res_960x720},
+	{data = textImgNew(), x = 1280, y = 720, displayname = motif.option_info.menu_itemname_res_1280x720},
+	{data = textImgNew(), x = 1600, y = 900, displayname = motif.option_info.menu_itemname_res_1600x900},
+	{data = textImgNew(), x = 1920, y = 1080, displayname = motif.option_info.menu_itemname_res_1920x1080},
+	{data = textImgNew(), x = 2560, y = 1440, displayname = motif.option_info.menu_itemname_res_2560x1440},
+	{data = textImgNew(), x = 3840, y = 2160, displayname = motif.option_info.menu_itemname_res_3840x2160},
 	{data = textImgNew(), itemname = 'empty', displayname = ' '},
-	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_gameplay_back},
+	{data = textImgNew(), itemname = 'custom', displayname = motif.option_info.menu_itemname_res_custom},
+	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_res_back},
 }
-t_advGameplayCfg = main.f_cleanTable(t_advGameplayCfg)
+t_resCfg = main.f_cleanTable(t_resCfg, main.t_sort.option_info)
 
-function options.f_advGameplayCfg()
+function options.f_resCfg()
 	main.f_cmdInput()
 	local cursorPosY = 1
 	local moveTxt = 0
 	local item = 1
-	local t = t_advGameplayCfg
-	textImgSetText(txt_title, motif.option_info.title_text_advgameplay)
+	local t = t_resCfg
+	textImgSetText(txt_title, motif.option_info.title_text_res)
 	while true do
-		cursorPosY, moveTxt, item = options.f_menuCommon1(cursorPosY, moveTxt, item, t)
+		cursorPosY, moveTxt, item = options.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 		if esc() then
 			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
-			textImgSetText(txt_title, motif.option_info.title_text_gameplay)
+			textImgSetText(txt_title, motif.option_info.title_text_video)
 			break
-		--Life
-		elseif t[item].itemname == 'lifemul' then
-			if commandGetState(main.p1Cmd, 'r') and config.LifeMul < 300 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.LifeMul = config.LifeMul + 10
-				t[item].vardisplay = config.LifeMul .. '%'
-				modified = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config.LifeMul > 10 then
+		elseif main.f_btnPalNo(main.p1Cmd) > 0 then
+			--Back
+			if t[item].itemname == 'back' then
+				sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
+				textImgSetText(txt_title, motif.option_info.title_text_video)
+				break
+			--Custom
+			elseif t[item].itemname == 'custom' then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.LifeMul = config.LifeMul - 10
-				t[item].vardisplay = config.LifeMul .. '%'
-				modified = 1
-			end
-		--Auto-Guard
-		elseif t[item].itemname == 'autoguard' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
-			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-			if config.AutoGuard then
-				config.AutoGuard = false
+				local width = tonumber(main.f_input(main.f_extractText(motif.option_info.input_text_reswidth), motif.option_info, motif.optionbgdef, 'string'))
+				if width ~= nil then
+					sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+					local height = tonumber(main.f_input(main.f_extractText(motif.option_info.input_text_resheight), motif.option_info, motif.optionbgdef, 'string'))
+					if height ~= nil then
+						config.Width = width
+						config.Height = height
+						sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
+						if (height / 3 * 4) ~= width then
+							main.f_warning(main.f_extractText(motif.warning_info.text_res), motif.option_info, motif.optionbgdef)
+						end
+						modified = 1
+						needReload = 1
+					else
+						sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
+					end
+				else
+					sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
+				end
+				textImgSetText(txt_title, motif.option_info.title_text_video)
+				break
+			--Resolution
 			else
-				config.AutoGuard = true
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
+				config.Width = t[item].x
+				config.Height = t[item].y
+				if (config.Height / 3 * 4) ~= config.Width then
+					main.f_warning(main.f_extractText(motif.warning_info.text_res), motif.option_info, motif.optionbgdef)
+				end
+				modified = 1
+				needReload = 1
+				textImgSetText(txt_title, motif.option_info.title_text_video)
+				break
 			end
-			t[item].vardisplay = options.f_boolDisplay(config.AutoGuard)
-			modified = 1
-		--Attack.LifeToPowerMul
-		elseif t[item].itemname == 'attackpowermul' then
-			if commandGetState(main.p1Cmd, 'r') then
+		end
+		options.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
+	end
+end
+
+--;===========================================================
+--; AUDIO SETTINGS
+--;===========================================================
+options.t_audioCfg = {
+	{data = textImgNew(), itemname = 'mastervolume', displayname = motif.option_info.menu_itemname_audio_mastervolume, vardata = textImgNew(), vardisplay = config.MasterVolume .. '%'},
+	{data = textImgNew(), itemname = 'bgmvolume', displayname = motif.option_info.menu_itemname_audio_bgmvolume, vardata = textImgNew(), vardisplay = config.BgmVolume .. '%'},
+	{data = textImgNew(), itemname = 'sfxvolume', displayname = motif.option_info.menu_itemname_audio_sfxvolume, vardata = textImgNew(), vardisplay = config.WavVolume .. '%'},
+	{data = textImgNew(), itemname = 'audioducking', displayname = motif.option_info.menu_itemname_audio_audioducking, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.AudioDucking, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)},
+	{data = textImgNew(), itemname = 'empty', displayname = ' '},
+	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_audio_back},
+}
+options.t_audioCfg = main.f_cleanTable(options.t_audioCfg, main.t_sort.option_info)
+
+function options.f_audioCfg()
+	main.f_cmdInput()
+	local cursorPosY = 1
+	local moveTxt = 0
+	local item = 1
+	local t = options.t_audioCfg
+	textImgSetText(txt_title, motif.option_info.title_text_audio)
+	while true do
+		cursorPosY, moveTxt, item = options.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
+		if esc() then
+			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
+			textImgSetText(txt_title, motif.option_info.title_text_main)
+			break
+		--Master Volume
+		elseif t[item].itemname == 'mastervolume' then
+			if commandGetState(main.p1Cmd, 'r') and config.MasterVolume < 200 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config['Attack.LifeToPowerMul'] = options.f_precision(config['Attack.LifeToPowerMul'] + 0.1, '%.01f')
-				t[item].vardisplay = config['Attack.LifeToPowerMul']
+				config.MasterVolume = config.MasterVolume + 1
+				t[item].vardisplay = config.MasterVolume
+				setMasterVolume(config.MasterVolume)
 				modified = 1
-				needReload = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config['Attack.LifeToPowerMul'] > 0.1 then
+			elseif commandGetState(main.p1Cmd, 'l') and config.MasterVolume > 0 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config['Attack.LifeToPowerMul'] = options.f_precision(config['Attack.LifeToPowerMul'] - 0.1, '%.01f')
-				t[item].vardisplay = config['Attack.LifeToPowerMul']
+				config.MasterVolume = config.MasterVolume - 1
+				t[item].vardisplay = config.MasterVolume
+				setMasterVolume(config.MasterVolume)
 				modified = 1
-				needReload = 1
 			end
-		--GetHit.LifeToPowerMul
-		elseif t[item].itemname == 'gethitpowermul' then
-			if commandGetState(main.p1Cmd, 'r') then
+		--BGM Volume
+		elseif t[item].itemname == 'bgmvolume' then
+			if commandGetState(main.p1Cmd, 'r') and config.BgmVolume < 100 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config['GetHit.LifeToPowerMul'] = options.f_precision(config['GetHit.LifeToPowerMul'] + 0.1, '%.01f')
-				t[item].vardisplay = config['GetHit.LifeToPowerMul']
+				config.BgmVolume = config.BgmVolume + 1
+				t[item].vardisplay = config.BgmVolume
+				setBgmVolume(config.BgmVolume)
 				modified = 1
-				needReload = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config['GetHit.LifeToPowerMul'] > 0.1 then
+			elseif commandGetState(main.p1Cmd, 'l') and config.BgmVolume > 0 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config['GetHit.LifeToPowerMul'] = options.f_precision(config['GetHit.LifeToPowerMul'] - 0.1, '%.01f')
-				t[item].vardisplay = config['GetHit.LifeToPowerMul']
+				config.BgmVolume = config.BgmVolume - 1
+				t[item].vardisplay = config.BgmVolume
+				setBgmVolume(config.BgmVolume)
 				modified = 1
-				needReload = 1
 			end
-		--Super.TargetDefenceMul
-		elseif t[item].itemname == 'superdefencemul' then
-			if commandGetState(main.p1Cmd, 'r') then
+		--SFX Volume
+		elseif t[item].itemname == 'wavvolume' then
+			if commandGetState(main.p1Cmd, 'r') and config.WavVolume < 100 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config['Super.TargetDefenceMul'] = options.f_precision(config['Super.TargetDefenceMul'] + 0.1, '%.01f')
-				t[item].vardisplay = config['Super.TargetDefenceMul']
+				config.WavVolume = config.WavVolume + 1
+				t[item].vardisplay = config.WavVolume
+				setWavVolume(config.WavVolume)
 				modified = 1
-				needReload = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config['Super.TargetDefenceMul'] > 0.1 then
+			elseif commandGetState(main.p1Cmd, 'l') and config.WavVolume > 0 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config['Super.TargetDefenceMul'] = options.f_precision(config['Super.TargetDefenceMul'] - 0.1, '%.01f')
-				t[item].vardisplay = config['Super.TargetDefenceMul']
+				config.WavVolume = config.WavVolume - 1
+				t[item].vardisplay = config.WavVolume
+				setWavVolume(config.WavVolume)
+				modified = 1
+			end
+		--Audio Ducking
+		elseif t[item].itemname == 'audioducking' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
+			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+			if config.AudioDucking then
+				config.AudioDucking = false
+			else
+				config.AudioDucking = true
+			end
+			t[item].vardisplay = options.f_boolDisplay(config.AudioDucking, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)
+			setAudioDucking(config.AudioDucking)
+			modified = 1
+		--Back
+		elseif t[item].itemname == 'back' and main.f_btnPalNo(main.p1Cmd) > 0 then
+			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
+			textImgSetText(txt_title, motif.option_info.title_text_main)
+			break
+		end
+		options.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
+	end
+end
+
+--;===========================================================
+--; GAMEPLAY SETTINGS
+--;===========================================================
+options.t_gameplayCfg = {
+	{data = textImgNew(), itemname = 'lifemul', displayname = motif.option_info.menu_itemname_gameplay_lifemul, vardata = textImgNew(), vardisplay = config.LifeMul .. '%'},
+	{data = textImgNew(), itemname = 'autoguard', displayname = motif.option_info.menu_itemname_gameplay_autoguard, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.AutoGuard)},
+	{data = textImgNew(), itemname = 'team1vs2life', displayname = motif.option_info.menu_itemname_gameplay_team1vs2life, vardata = textImgNew(), vardisplay = config.Team1VS2Life .. '%'},
+	{data = textImgNew(), itemname = 'turnsrecoverybase', displayname = motif.option_info.menu_itemname_gameplay_turnsrecoverybase, vardata = textImgNew(), vardisplay = config.TurnsRecoveryBase .. '%'},
+	{data = textImgNew(), itemname = 'turnsrecoverybonus', displayname = motif.option_info.menu_itemname_gameplay_turnsrecoverybonus, vardata = textImgNew(), vardisplay = config.TurnsRecoveryBonus .. '%'},
+	{data = textImgNew(), itemname = 'teampowershare', displayname = motif.option_info.menu_itemname_gameplay_teampowershare, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.TeamPowerShare)},
+	{data = textImgNew(), itemname = 'teamlifeshare', displayname = motif.option_info.menu_itemname_gameplay_teamlifeshare, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.TeamLifeShare)},
+	{data = textImgNew(), itemname = 'empty', displayname = ' '},
+	{data = textImgNew(), itemname = 'advancedGameplaySettings', displayname = motif.option_info.menu_itemname_gameplay_advanced},
+	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_gameplay_back},
+}
+options.t_gameplayCfg = main.f_cleanTable(options.t_gameplayCfg, main.t_sort.option_info)
+
+function options.f_gameplayCfg()
+	main.f_cmdInput()
+	local cursorPosY = 1
+	local moveTxt = 0
+	local item = 1
+	local t = options.t_gameplayCfg
+	textImgSetText(txt_title, motif.option_info.title_text_gameplay)
+	while true do
+		cursorPosY, moveTxt, item = options.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
+		if esc() then
+			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
+			textImgSetText(txt_title, motif.option_info.title_text_main)
+			break
+		--Life
+		elseif t[item].itemname == 'lifemul' then
+			if commandGetState(main.p1Cmd, 'r') and config.LifeMul < 300 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				config.LifeMul = config.LifeMul + 10
+				t[item].vardisplay = config.LifeMul .. '%'
+				modified = 1
+			elseif commandGetState(main.p1Cmd, 'l') and config.LifeMul > 10 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				config.LifeMul = config.LifeMul - 10
+				t[item].vardisplay = config.LifeMul .. '%'
 				modified = 1
-				needReload = 1
 			end
+		--Auto-Guard
+		elseif t[item].itemname == 'autoguard' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
+			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+			if config.AutoGuard then
+				config.AutoGuard = false
+			else
+				config.AutoGuard = true
+			end
+			t[item].vardisplay = options.f_boolDisplay(config.AutoGuard)
+			modified = 1
 		--1P Vs Team Life
 		elseif t[item].itemname == 'team1vs2life' then
-			if commandGetState(main.p1Cmd, 'r') and config.Team1VS2Life < 3000 then
+			if commandGetState(main.p1Cmd, 'r') and config.Team1VS2Life < 300 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
 				config.Team1VS2Life = config.Team1VS2Life + 10
-				t[item].vardisplay = config.Team1VS2Life
+				t[item].vardisplay = config.Team1VS2Life .. '%'
 				modified = 1
 			elseif commandGetState(main.p1Cmd, 'l') and config.Team1VS2Life > 10 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
 				config.Team1VS2Life = config.Team1VS2Life - 10
-				t[item].vardisplay = config.Team1VS2Life
+				t[item].vardisplay = config.Team1VS2Life .. '%'
+				modified = 1
+			end
+		--Turns Recovery Base
+		elseif t[item].itemname == 'turnsrecoverybase' then
+			if commandGetState(main.p1Cmd, 'r') and config.TurnsRecoveryBase < 100 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				config.TurnsRecoveryBase = config.TurnsRecoveryBase + 0.5
+				t[item].vardisplay = config.TurnsRecoveryBase .. '%'
+				modified = 1
+			elseif commandGetState(main.p1Cmd, 'l') and config.TurnsRecoveryBase > 0 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				config.TurnsRecoveryBase = config.TurnsRecoveryBase - 0.5
+				t[item].vardisplay = config.TurnsRecoveryBase .. '%'
 				modified = 1
 			end
-		--Turns HP Recovery
-		elseif t[item].itemname == 'turnsrecoveryrate' then
-			if commandGetState(main.p1Cmd, 'r') and config.TurnsRecoveryRate < 3000 then
+		--Turns Recovery Bonus
+		elseif t[item].itemname == 'turnsrecoverybonus' then
+			if commandGetState(main.p1Cmd, 'r') and config.TurnsRecoveryBonus < 100 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.TurnsRecoveryRate = config.TurnsRecoveryRate + 10
-				t[item].vardisplay = config.TurnsRecoveryRate
+				config.TurnsRecoveryBonus = config.TurnsRecoveryBonus + 0.5
+				t[item].vardisplay = config.TurnsRecoveryBonus .. '%'
 				modified = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config.TurnsRecoveryRate > 10 then
+			elseif commandGetState(main.p1Cmd, 'l') and config.TurnsRecoveryBonus > 0 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.TurnsRecoveryRate = config.TurnsRecoveryRate - 10
-				t[item].vardisplay = config.TurnsRecoveryRate
+				config.TurnsRecoveryBonus = config.TurnsRecoveryBonus - 0.5
+				t[item].vardisplay = config.TurnsRecoveryBonus .. '%'
 				modified = 1
 			end
 		--Team Power Share
@@ -833,286 +1094,252 @@ function options.f_advGameplayCfg()
 			end
 			t[item].vardisplay = options.f_boolDisplay(config.TeamLifeShare)
 			modified = 1
-		-- Singke mode
-		elseif t[item].itemname == 'singlemode' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
-			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-			if config.SingleTeamMode then
-				config.SingleTeamMode = false
-			else
-				config.SingleTeamMode = true
-			end
-			t[item].vardisplay = options.f_boolDisplay(config.SingleTeamMode, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)
-			modified = 1
-			needReload = 1
-		--Turns Limit
-		elseif t[item].itemname == 'numturns' then
-			if commandGetState(main.p1Cmd, 'r') and config.NumTurns < 8 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.NumTurns = config.NumTurns + 1
-				t[item].vardisplay = config.NumTurns
-				modified = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config.NumTurns > 1 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.NumTurns = config.NumTurns - 1
-				t[item].vardisplay = options.f_checkTeamAmount(config.NumTurns, 1, motif.option_info.menu_itemname_disabled)
-				modified = 1
-			end
-			-- Disable check
-			if config.NumTurns < 2 then
-				needReload = 1
-			end
-		--Simul Limit
-		elseif t[item].itemname == 'numsimul' then
-			if commandGetState(main.p1Cmd, 'r') and config.NumSimul < 8 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.NumSimul = config.NumSimul + 1
-				t[item].vardisplay = config.NumSimul
-				modified = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config.NumSimul > 1 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.NumSimul = config.NumSimul - 1
-				t[item].vardisplay = options.f_checkTeamAmount(config.NumSimul, 1, motif.option_info.menu_itemname_disabled)
-				modified = 1
-			end
-			-- Disable check
-			if config.NumSimul < 2 then
-				needReload = 1
-			end
-		--Tag Limit
-		elseif t[item].itemname == 'numtag' then
-			if commandGetState(main.p1Cmd, 'r') and config.NumTag < 8 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.NumTag = config.NumTag + 1
-				t[item].vardisplay = config.NumTag
-				modified = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config.NumTag > 1 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.NumTag = config.NumTag - 1
-				t[item].vardisplay = options.f_checkTeamAmount(config.NumTag, 1, motif.option_info.menu_itemname_disabled)
-				modified = 1
-			end
-			-- Disable check
-			if config.NumTag < 2 then
-				needReload = 1
-			end
+		--Advanced Settings
+		elseif t[item].itemname == 'advancedGameplaySettings' and main.f_btnPalNo(main.p1Cmd) > 0 then
+			sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
+			options.f_advGameplayCfg()
 		--Back
 		elseif t[item].itemname == 'back' and main.f_btnPalNo(main.p1Cmd) > 0 then
 			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
-			textImgSetText(txt_title, motif.option_info.title_text_gameplay)
+			textImgSetText(txt_title, motif.option_info.title_text_main)
 			break
 		end
-		options.f_menuCommon2(cursorPosY, moveTxt, item, t)
+		options.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
 	end
 end
 
 --;===========================================================
---; VIDEO SETTINGS
+--; ADVANCED GAMEPLAY SETTINGS
 --;===========================================================
-local t_shaderNames = {}
-t_shaderNames[0] = "No shader"
-t_shaderNames[1] = "hqx2"
-t_shaderNames[2] = "hqx4"
-t_shaderNames[3] = "scanline"
+function options.f_checkTeamAmount(arg1, arg2, arg3)
+	ret = arg1
+	if arg1 <= arg2 then
+		ret = arg3
+	end
+	return ret
+end
 
-local t_videoCfg = {
-	{data = textImgNew(), itemname = 'resolution', displayname = motif.option_info.menu_itemname_video_resolution, vardata = textImgNew(), vardisplay = config.Width .. 'x' .. config.Height},
-	{data = textImgNew(), itemname = 'fullscreen', displayname = motif.option_info.menu_itemname_video_fullscreen, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.Fullscreen)},
-	{data = textImgNew(), itemname = 'msaa', displayname = motif.option_info.menu_itemname_video_msaa, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.MSAA, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)},
-	{data = textImgNew(), itemname = 'airandomcolor', displayname = motif.option_info.menu_itemname_video_aipalette, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.AIRandomColor, motif.option_info.menu_itemname_video_aipalette_random, motif.option_info.menu_itemname_video_aipalette_default)},
-	{data = textImgNew(), itemname = 'postprocessingshader', displayname = "Shader", vardata = textImgNew(), vardisplay = t_shaderNames[config.PostProcessingShader]},
+options.t_advGameplayCfg = {
+	{data = textImgNew(), itemname = 'attackpowermul', displayname = motif.option_info.menu_itemname_gameplay_attackpowermul, vardata = textImgNew(), vardisplay = config['Attack.LifeToPowerMul']},
+	{data = textImgNew(), itemname = 'gethitpowermul', displayname = motif.option_info.menu_itemname_gameplay_gethitpowermul, vardata = textImgNew(), vardisplay = config['GetHit.LifeToPowerMul']},
+	{data = textImgNew(), itemname = 'superdefencemul', displayname = motif.option_info.menu_itemname_gameplay_superdefencemul, vardata = textImgNew(), vardisplay = config['Super.TargetDefenceMul']},
 	{data = textImgNew(), itemname = 'empty', displayname = ' '},
-	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_video_back},
+	{data = textImgNew(), itemname = 'singlemode', displayname = motif.option_info.menu_itemname_gameplay_singlemode, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.SingleTeamMode, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)},
+	{data = textImgNew(), itemname = 'numturns', displayname = motif.option_info.menu_itemname_gameplay_numturns, vardata = textImgNew(), vardisplay = options.f_checkTeamAmount(config.NumTurns, 1, motif.option_info.menu_itemname_disabled)},
+	{data = textImgNew(), itemname = 'numsimul', displayname = motif.option_info.menu_itemname_gameplay_numsimul, vardata = textImgNew(), vardisplay = options.f_checkTeamAmount(config.NumSimul, 1, motif.option_info.menu_itemname_disabled)},
+	{data = textImgNew(), itemname = 'numtag', displayname = motif.option_info.menu_itemname_gameplay_numtag, vardata = textImgNew(), vardisplay = options.f_checkTeamAmount(config.NumTag, 1, motif.option_info.menu_itemname_disabled)},
+	{data = textImgNew(), itemname = 'empty', displayname = ' '},
+	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_gameplay_back},
 }
-t_videoCfg = main.f_cleanTable(t_videoCfg)
+options.t_advGameplayCfg = main.f_cleanTable(options.t_advGameplayCfg, main.t_sort.option_info)
 
-function options.f_videoCfg()
+function options.f_advGameplayCfg()
 	main.f_cmdInput()
 	local cursorPosY = 1
 	local moveTxt = 0
 	local item = 1
-	local t = t_videoCfg
-	textImgSetText(txt_title, motif.option_info.title_text_video)
+	local t = options.t_advGameplayCfg
+	textImgSetText(txt_title, motif.option_info.title_text_advgameplay)
 	while true do
-		cursorPosY, moveTxt, item = options.f_menuCommon1(cursorPosY, moveTxt, item, t)
+		cursorPosY, moveTxt, item = options.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 		if esc() then
 			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
-			textImgSetText(txt_title, motif.option_info.title_text_main)
+			textImgSetText(txt_title, motif.option_info.title_text_gameplay)
 			break
-		--Resolution
-		elseif t[item].itemname == 'resolution' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
-			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-			options.f_resCfg()
-			t[item].vardisplay = config.Width .. 'x' .. config.Height
-		--Fullscreen
-		elseif t[item].itemname == 'fullscreen' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
-			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-			if config.Fullscreen then
-				config.Fullscreen = false
-			else
-				config.Fullscreen = true
+		--Attack.LifeToPowerMul
+		elseif t[item].itemname == 'attackpowermul' then
+			if commandGetState(main.p1Cmd, 'r') then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				config['Attack.LifeToPowerMul'] = options.f_precision(config['Attack.LifeToPowerMul'] + 0.1, '%.01f')
+				t[item].vardisplay = config['Attack.LifeToPowerMul']
+				setAttackLifeToPowerMul(config['Attack.LifeToPowerMul'])
+				modified = 1
+			elseif commandGetState(main.p1Cmd, 'l') and config['Attack.LifeToPowerMul'] > 0.1 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				config['Attack.LifeToPowerMul'] = options.f_precision(config['Attack.LifeToPowerMul'] - 0.1, '%.01f')
+				t[item].vardisplay = config['Attack.LifeToPowerMul']
+				setAttackLifeToPowerMul(config['Attack.LifeToPowerMul'])
+				modified = 1
 			end
-			t[item].vardisplay = options.f_boolDisplay(config.Fullscreen)
-			modified = 1
-			needReload = 1
-		elseif t[item].itemname == 'msaa' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
-			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-			if config.MSAA then
-				config.MSAA = false
-			else
-				config.MSAA = true
+		--GetHit.LifeToPowerMul
+		elseif t[item].itemname == 'gethitpowermul' then
+			if commandGetState(main.p1Cmd, 'r') then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				config['GetHit.LifeToPowerMul'] = options.f_precision(config['GetHit.LifeToPowerMul'] + 0.1, '%.01f')
+				t[item].vardisplay = config['GetHit.LifeToPowerMul']
+				setGetHitLifeToPowerMul(config['GetHit.LifeToPowerMul'])
+				modified = 1
+			elseif commandGetState(main.p1Cmd, 'l') and config['GetHit.LifeToPowerMul'] > 0.1 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				config['GetHit.LifeToPowerMul'] = options.f_precision(config['GetHit.LifeToPowerMul'] - 0.1, '%.01f')
+				t[item].vardisplay = config['GetHit.LifeToPowerMul']
+				setGetHitLifeToPowerMul(config['GetHit.LifeToPowerMul'])
+				modified = 1
 			end
-			t[item].vardisplay = options.f_boolDisplay(config.MSAA, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)
-			modified = 1
-			needReload = 1
-		--AI Palette
-		elseif t[item].itemname == 'airandomcolor' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
+		--Super.TargetDefenceMul
+		elseif t[item].itemname == 'superdefencemul' then
+			if commandGetState(main.p1Cmd, 'r') then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				config['Super.TargetDefenceMul'] = options.f_precision(config['Super.TargetDefenceMul'] + 0.1, '%.01f')
+				t[item].vardisplay = config['Super.TargetDefenceMul']
+				setSuperTargetDefenceMul(config['Super.TargetDefenceMul'])
+				modified = 1
+			elseif commandGetState(main.p1Cmd, 'l') and config['Super.TargetDefenceMul'] > 0.1 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				config['Super.TargetDefenceMul'] = options.f_precision(config['Super.TargetDefenceMul'] - 0.1, '%.01f')
+				t[item].vardisplay = config['Super.TargetDefenceMul']
+				setSuperTargetDefenceMul(config['Super.TargetDefenceMul'])
+				modified = 1
+			end
+		--Single Mode
+		elseif t[item].itemname == 'singlemode' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
 			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-			if config.AIRandomColor then
-				config.AIRandomColor = false
+			if config.SingleTeamMode then
+				config.SingleTeamMode = false
 			else
-				config.AIRandomColor = true
+				config.SingleTeamMode = true
 			end
-			t[item].vardisplay = options.f_boolDisplay(config.AIRandomColor, motif.option_info.menu_itemname_video_aipalette_random, motif.option_info.menu_itemname_video_aipalette_default)
+			t[item].vardisplay = options.f_boolDisplay(config.SingleTeamMode, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)
 			modified = 1
-		-- Postprocessing
-		elseif t[item].itemname == 'postprocessingshader' then
-			if commandGetState(main.p1Cmd, 'r') and config.PostProcessingShader < #t_shaderNames then
+		--Turns Limit
+		elseif t[item].itemname == 'numturns' then
+			if commandGetState(main.p1Cmd, 'r') and config.NumTurns < 8 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.PostProcessingShader = config.PostProcessingShader + 1
+				config.NumTurns = config.NumTurns + 1
+				t[item].vardisplay = config.NumTurns
 				modified = 1
-				needReload = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config.PostProcessingShader > 0 then
+			elseif commandGetState(main.p1Cmd, 'l') and config.NumTurns > 1 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.PostProcessingShader = config.PostProcessingShader - 1
-				modified = 1
-				needReload = 1
-			end
-			t[item].vardisplay = t_shaderNames[config.PostProcessingShader]
-		-- Back
-		elseif t[item].itemname == 'back' and main.f_btnPalNo(main.p1Cmd) > 0 then
-			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
-			textImgSetText(txt_title, motif.option_info.title_text_main)
-			break
-		end
-		options.f_menuCommon2(cursorPosY, moveTxt, item, t)
-	end
-end
-
---;===========================================================
---; RESOLUTION SETTINGS
---;===========================================================
-local t_resCfg = {
-	{data = textImgNew(), x = 320,  y = 240, displayname = motif.option_info.menu_itemname_res_320x240},
-	{data = textImgNew(), x = 640,  y = 480, displayname = motif.option_info.menu_itemname_res_640x480},
-	{data = textImgNew(), x = 1280, y = 960, displayname = motif.option_info.menu_itemname_res_1280x960},
-	{data = textImgNew(), x = 1600, y = 1200, displayname = motif.option_info.menu_itemname_res_1600x1200},
-	{data = textImgNew(), x = 960,  y = 720, displayname = motif.option_info.menu_itemname_res_960x720},
-	{data = textImgNew(), x = 1200, y = 900, displayname = motif.option_info.menu_itemname_res_1200x900},
-	{data = textImgNew(), x = 1440, y = 1080, displayname = motif.option_info.menu_itemname_res_1440x1080},
-	{data = textImgNew(), x = 1280, y = 720, displayname = motif.option_info.menu_itemname_res_1280x720},
-	{data = textImgNew(), x = 1600, y = 900, displayname = motif.option_info.menu_itemname_res_1600x900},
-	{data = textImgNew(), x = 1920, y = 1080, displayname = motif.option_info.menu_itemname_res_1920x1080},
-	{data = textImgNew(), x = 2560, y = 1440, displayname = motif.option_info.menu_itemname_res_2560x1440},
-	{data = textImgNew(), x = 3840, y = 2160, displayname = motif.option_info.menu_itemname_res_3840x2160},
-	{data = textImgNew(), itemname = 'empty', displayname = ' '},
-	{data = textImgNew(), itemname = 'custom', displayname = motif.option_info.menu_itemname_res_custom},
-	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_res_back},
-}
-t_resCfg = main.f_cleanTable(t_resCfg)
-
-function options.f_resCfg()
-	main.f_cmdInput()
-	local cursorPosY = 1
-	local moveTxt = 0
-	local item = 1
-	local t = t_resCfg
-	textImgSetText(txt_title, motif.option_info.title_text_res)
-	while true do
-		cursorPosY, moveTxt, item = options.f_menuCommon1(cursorPosY, moveTxt, item, t)
-		if esc() then
-			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
-			textImgSetText(txt_title, motif.option_info.title_text_video)
-			break
-		elseif main.f_btnPalNo(main.p1Cmd) > 0 then
-			--Back
-			if t[item].itemname == 'back' then
-				sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
-				textImgSetText(txt_title, motif.option_info.title_text_video)
-				break
-			--Custom
-			elseif t[item].itemname == 'custom' then
+				config.NumTurns = config.NumTurns - 1
+				t[item].vardisplay = options.f_checkTeamAmount(config.NumTurns, 1, motif.option_info.menu_itemname_disabled)
+				if config.NumTurns < 2 then
+					select.t_p1TeamMenu = select.f_getTeamMenu()
+					select.t_p1TeamMenu = main.f_cleanTable(select.t_p1TeamMenu, main.t_sort.select_info)
+					select.t_p2TeamMenu = select.f_getTeamMenu()
+					select.t_p2TeamMenu = main.f_cleanTable(select.t_p2TeamMenu, main.t_sort.select_info)
+				end
+				modified = 1
+			end
+		--Simul Limit
+		elseif t[item].itemname == 'numsimul' then
+			if commandGetState(main.p1Cmd, 'r') and config.NumSimul < 8 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				local width = tonumber(main.f_input(main.f_extractText(motif.option_info.input_text_reswidth), motif.option_info, motif.optionbgdef, 'string'))
-				if width ~= nil then
-					sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-					local height = tonumber(main.f_input(main.f_extractText(motif.option_info.input_text_resheight), motif.option_info, motif.optionbgdef, 'string'))
-					if height ~= nil then
-						config.Width = width
-						config.Height = height
-						sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
-						if (height / 3 * 4) ~= width then
-							main.f_warning(main.f_extractText(motif.warning_info.text_res), motif.option_info, motif.optionbgdef)
-						end
-						modified = 1
-						needReload = 1
-					else
-						sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
-					end
-				else
-					sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
+				config.NumSimul = config.NumSimul + 1
+				t[item].vardisplay = config.NumSimul
+				modified = 1
+			elseif commandGetState(main.p1Cmd, 'l') and config.NumSimul > 1 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				config.NumSimul = config.NumSimul - 1
+				t[item].vardisplay = options.f_checkTeamAmount(config.NumSimul, 1, motif.option_info.menu_itemname_disabled)
+				if config.NumSimul < 2 then
+					select.t_p1TeamMenu = select.f_getTeamMenu()
+					select.t_p1TeamMenu = main.f_cleanTable(select.t_p1TeamMenu, main.t_sort.select_info)
+					select.t_p2TeamMenu = select.f_getTeamMenu()
+					select.t_p2TeamMenu = main.f_cleanTable(select.t_p2TeamMenu, main.t_sort.select_info)
 				end
-				break
-			--Resolution
-			else
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
-				config.Width = t[item].x
-				config.Height = t[item].y
-				if (config.Height / 3 * 4) ~= config.Width then
-					main.f_warning(main.f_extractText(motif.warning_info.text_res), motif.option_info, motif.optionbgdef)
+				modified = 1
+			end
+		--Tag Limit
+		elseif t[item].itemname == 'numtag' then
+			if commandGetState(main.p1Cmd, 'r') and config.NumTag < 4 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				config.NumTag = config.NumTag + 1
+				t[item].vardisplay = config.NumTag
+				modified = 1
+			elseif commandGetState(main.p1Cmd, 'l') and config.NumTag > 1 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				config.NumTag = config.NumTag - 1
+				t[item].vardisplay = options.f_checkTeamAmount(config.NumTag, 1, motif.option_info.menu_itemname_disabled)
+				if config.NumTag < 2 then
+					select.t_p1TeamMenu = select.f_getTeamMenu()
+					select.t_p1TeamMenu = main.f_cleanTable(select.t_p1TeamMenu, main.t_sort.select_info)
+					select.t_p2TeamMenu = select.f_getTeamMenu()
+					select.t_p2TeamMenu = main.f_cleanTable(select.t_p2TeamMenu, main.t_sort.select_info)
 				end
 				modified = 1
-				needReload = 1
-				break
 			end
+		--Back
+		elseif t[item].itemname == 'back' and main.f_btnPalNo(main.p1Cmd) > 0 then
+			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
+			textImgSetText(txt_title, motif.option_info.title_text_gameplay)
+			break
 		end
-		options.f_menuCommon2(cursorPosY, moveTxt, item, t)
+		options.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
 	end
 end
 
 --;===========================================================
 --; ENGINE SETTINGS
 --;===========================================================
-local t_engineCfg = {
+options.t_engineCfg = {
 	{data = textImgNew(), itemname = 'allowdebugkeys', displayname = motif.option_info.menu_itemname_engine_allowdebugkeys, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.AllowDebugKeys, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)},
-	{data = textImgNew(), itemname = 'simulmode', displayname = motif.option_info.menu_itemname_gameplay_simulmode, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.SimulMode, motif.option_info.menu_itemname_disabled, motif.option_info.menu_itemname_enabled)},
+	{data = textImgNew(), itemname = 'simulmode', displayname = motif.option_info.menu_itemname_engine_simulmode, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.SimulMode, motif.option_info.menu_itemname_disabled, motif.option_info.menu_itemname_enabled)},
+	{data = textImgNew(), itemname = 'lifebarfontscale', displayname = motif.option_info.menu_itemname_engine_lifebarfontscale, vardata = textImgNew(), vardisplay = config.LifebarFontScale},
 	{data = textImgNew(), itemname = 'empty', displayname = ' '},
-	{data = textImgNew(), itemname = 'helpermax', displayname = motif.option_info.menu_itemname_video_helpermax, vardata = textImgNew(), vardisplay = config.HelperMax},
-	{data = textImgNew(), itemname = 'playerprojectilemax', displayname = motif.option_info.menu_itemname_video_playerprojectilemax, vardata = textImgNew(), vardisplay = config.PlayerProjectileMax},
-	{data = textImgNew(), itemname = 'explodmax', displayname = motif.option_info.menu_itemname_video_explodmax, vardata = textImgNew(), vardisplay = config.ExplodMax},
-	{data = textImgNew(), itemname = 'afterimagemax', displayname = motif.option_info.menu_itemname_video_afterimagemax, vardata = textImgNew(), vardisplay = config.AfterImageMax},
+	{data = textImgNew(), itemname = 'helpermax', displayname = motif.option_info.menu_itemname_engine_helpermax, vardata = textImgNew(), vardisplay = config.HelperMax},
+	{data = textImgNew(), itemname = 'playerprojectilemax', displayname = motif.option_info.menu_itemname_engine_playerprojectilemax, vardata = textImgNew(), vardisplay = config.PlayerProjectileMax},
+	{data = textImgNew(), itemname = 'explodmax', displayname = motif.option_info.menu_itemname_engine_explodmax, vardata = textImgNew(), vardisplay = config.ExplodMax},
+	{data = textImgNew(), itemname = 'afterimagemax', displayname = motif.option_info.menu_itemname_engine_afterimagemax, vardata = textImgNew(), vardisplay = config.AfterImageMax},
 	{data = textImgNew(), itemname = 'empty', displayname = ' '},
-	{data = textImgNew(), itemname = 'zoomactive', displayname = motif.option_info.menu_itemname_video_zoomactive, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.ZoomActive)},
-	{data = textImgNew(), itemname = 'maxzoomout', displayname = motif.option_info.menu_itemname_video_maxzoomout, vardata = textImgNew(), vardisplay = config.ZoomMin},
-	{data = textImgNew(), itemname = 'maxzoomin', displayname = motif.option_info.menu_itemname_video_maxzoomin, vardata = textImgNew(), vardisplay = config.ZoomMax},
-	{data = textImgNew(), itemname = 'zoomspeed', displayname = motif.option_info.menu_itemname_video_zoomspeed, vardata = textImgNew(), vardisplay = config.ZoomSpeed},
+	{data = textImgNew(), itemname = 'zoomactive', displayname = motif.option_info.menu_itemname_engine_zoomactive, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.ZoomActive)},
+	{data = textImgNew(), itemname = 'maxzoomout', displayname = motif.option_info.menu_itemname_engine_maxzoomout, vardata = textImgNew(), vardisplay = config.ZoomMin},
+	{data = textImgNew(), itemname = 'maxzoomin', displayname = motif.option_info.menu_itemname_engine_maxzoomin, vardata = textImgNew(), vardisplay = config.ZoomMax},
+	{data = textImgNew(), itemname = 'zoomspeed', displayname = motif.option_info.menu_itemname_engine_zoomspeed, vardata = textImgNew(), vardisplay = config.ZoomSpeed},
 	{data = textImgNew(), itemname = 'empty', displayname = ' '},
 	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_video_back},
 }
-t_engineCfg = main.f_cleanTable(t_engineCfg)
+options.t_engineCfg = main.f_cleanTable(options.t_engineCfg, main.t_sort.option_info)
 
 function options.f_engineCfg()
 	main.f_cmdInput()
 	local cursorPosY = 1
 	local moveTxt = 0
 	local item = 1
-	local t = t_engineCfg
+	local t = options.t_engineCfg
 	textImgSetText(txt_title, motif.option_info.title_text_engine)
 	while true do
-		cursorPosY, moveTxt, item = options.f_menuCommon1(cursorPosY, moveTxt, item, t)
+		cursorPosY, moveTxt, item = options.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 		if esc() then
 			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
 			textImgSetText(txt_title, motif.option_info.title_text_main)
 			break
+		--Allow Debug Keys
+		elseif t[item].itemname == 'allowdebugkeys' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
+			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+			if config.AllowDebugKeys then
+				config.AllowDebugKeys = false
+			else
+				config.AllowDebugKeys = true
+			end
+			t[item].vardisplay = options.f_boolDisplay(config.AllowDebugKeys, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)
+			setAllowDebugKeys(config.AllowDebugKeys)
+			modified = 1
+		--Legacy Tag Mode
+		elseif t[item].itemname == 'simulmode' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
+			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+			if config.SimulMode then
+				config.SimulMode = false
+			else
+				config.SimulMode = true
+			end
+			t[item].vardisplay = options.f_boolDisplay(config.SimulMode, motif.option_info.menu_itemname_disabled, motif.option_info.menu_itemname_enabled)
+			main.f_warning(main.f_extractText(motif.warning_info.text_simul), motif.option_info, motif.optionbgdef)
+			modified = 1
+		--Lifebar Font Scale
+		elseif t[item].itemname == 'lifebarfontscale' then
+			if commandGetState(main.p1Cmd, 'r') then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				config.LifebarFontScale = options.f_precision(config.LifebarFontScale + 0.1, '%.01f')
+				t[item].vardisplay = config.LifebarFontScale
+				modified = 1
+				needReload = 1
+			elseif commandGetState(main.p1Cmd, 'l') and config.LifebarFontScale > 0.1 then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+				config.LifebarFontScale = options.f_precision(config.LifebarFontScale - 0.1, '%.01f')
+				t[item].vardisplay = config.LifebarFontScale
+				modified = 1
+				needReload = 1
+			end
 		--HelperMax
 		elseif t[item].itemname == 'helpermax' then
 			if commandGetState(main.p1Cmd, 'r') then
@@ -1222,82 +1449,54 @@ function options.f_engineCfg()
 				t[item].vardisplay = config.ZoomSpeed
 				modified = 1
 			end
-		-- Leagcy TAG Mode
-		elseif t[item].itemname == 'simulmode' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
-			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-			if config.SimulMode then
-				config.SimulMode = false
-			else
-				config.SimulMode = true
-			end
-			t[item].vardisplay = options.f_boolDisplay(config.SimulMode, motif.option_info.menu_itemname_disabled, motif.option_info.menu_itemname_enabled)
-			modified = 1
-			needReload = 1
-		-- Allow Debug Keys
-		elseif t[item].itemname == 'allowdebugkeys' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
-			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-			if config.AllowDebugKeys then
-				config.AllowDebugKeys = false
-			else
-				config.AllowDebugKeys = true
-			end
-			t[item].vardisplay = options.f_boolDisplay(config.AllowDebugKeys, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)
-			modified = 1
-			needReload = 1
 		--Back
 		elseif t[item].itemname == 'back' and main.f_btnPalNo(main.p1Cmd) > 0 then
 			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
 			textImgSetText(txt_title, motif.option_info.title_text_main)
 			break
 		end
-		options.f_menuCommon2(cursorPosY, moveTxt, item, t)
+		options.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
 	end
 end
 
 --;===========================================================
 --; INPUT SETTINGS
 --;===========================================================
-local t_inputCfg = {
-	{data = textImgNew(), itemname = 'p1keyboard', displayname = motif.option_info.menu_itemname_input_p1keyboard},
-	{data = textImgNew(), itemname = 'p1gamepad', displayname = motif.option_info.menu_itemname_input_p1gamepad},
-	{data = textImgNew(), itemname = 'p2keyboard', displayname = motif.option_info.menu_itemname_input_p2keyboard},
-	{data = textImgNew(), itemname = 'p2gamepad', displayname = motif.option_info.menu_itemname_input_p2gamepad},
+options.t_inputCfg = {
+	{data = textImgNew(), itemname = 'keyboard', displayname = motif.option_info.menu_itemname_input_keyboard},
+	{data = textImgNew(), itemname = 'gamepad', displayname = motif.option_info.menu_itemname_input_gamepad},
+	--{data = textImgNew(), itemname = 'system', displayname = motif.option_info.menu_itemname_input_system},
 	{data = textImgNew(), itemname = 'empty', displayname = ' '},
 	{data = textImgNew(), itemname = 'defaultvalues', displayname = motif.option_info.menu_itemname_input_default},
 	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_input_back},
 }
-t_inputCfg = main.f_cleanTable(t_inputCfg)
+options.t_inputCfg = main.f_cleanTable(options.t_inputCfg, main.t_sort.option_info)
 
 function options.f_inputCfg()
 	main.f_cmdInput()
 	local cursorPosY = 1
 	local moveTxt = 0
 	local item = 1
-	local t = t_inputCfg
+	local t = options.t_inputCfg
 	textImgSetText(txt_title, motif.option_info.title_text_input)
 	while true do
-		cursorPosY, moveTxt, item = options.f_menuCommon1(cursorPosY, moveTxt, item, t)
+		cursorPosY, moveTxt, item = options.f_menuCommonCalc(cursorPosY, moveTxt, item, t)
 		if esc() then
 			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
 			textImgSetText(txt_title, motif.option_info.title_text_main)
 			break
 		elseif main.f_btnPalNo(main.p1Cmd) > 0 then
-			--P1 Keyboard
-			if t[item].itemname == 'p1keyboard' then
+			--Key Config
+			if t[item].itemname == 'keyboard' then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				options.f_keyCfg(1, -1)
-			--P1 Gamepad
-			elseif t[item].itemname == 'p1gamepad' then
+				options.f_keyCfg('KeyConfig', t[item].itemname)
+			--Joystick Config
+			elseif t[item].itemname == 'gamepad' then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				options.f_keyCfg(1, 0)
-			--P2 Keyboard
-			elseif t[item].itemname == 'p2keyboard' then
+				options.f_keyCfg('JoystickConfig', t[item].itemname)
+			--System Keys (not implemented yet)
+			elseif t[item].itemname == 'system' then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				options.f_keyCfg(2, -1)
-			--P2 Gamepad
-			elseif t[item].itemname == 'p2gamepad' then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				options.f_keyCfg(2, 1)
 			--Default Values
 			elseif t[item].itemname == 'defaultvalues' then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
@@ -1311,7 +1510,7 @@ function options.f_inputCfg()
 				break
 			end
 		end
-		options.f_menuCommon2(cursorPosY, moveTxt, item, t)
+		options.f_menuCommonDraw(cursorPosY, moveTxt, item, t)
 	end
 end
 
@@ -1319,162 +1518,505 @@ end
 --; KEY SETTINGS
 --;===========================================================
 local t_keyCfg = {
-	{data = textImgNew(), itemname = 'up', displayname = motif.option_info.menu_itemname_key_up, vardata = textImgNew(), vardisplay = ''},
-	{data = textImgNew(), itemname = 'down', displayname = motif.option_info.menu_itemname_key_down, vardata = textImgNew(), vardisplay = ''},
-	{data = textImgNew(), itemname = 'left', displayname = motif.option_info.menu_itemname_key_left, vardata = textImgNew(), vardisplay = ''},
-	{data = textImgNew(), itemname = 'right', displayname = motif.option_info.menu_itemname_key_right, vardata = textImgNew(), vardisplay = ''},
-	{data = textImgNew(), itemname = 'a', displayname = motif.option_info.menu_itemname_key_a, vardata = textImgNew(), vardisplay = ''},
-	{data = textImgNew(), itemname = 'b', displayname = motif.option_info.menu_itemname_key_b, vardata = textImgNew(), vardisplay = ''},
-	{data = textImgNew(), itemname = 'c', displayname = motif.option_info.menu_itemname_key_c, vardata = textImgNew(), vardisplay = ''},
-	{data = textImgNew(), itemname = 'x', displayname = motif.option_info.menu_itemname_key_x, vardata = textImgNew(), vardisplay = ''},
-	{data = textImgNew(), itemname = 'y', displayname = motif.option_info.menu_itemname_key_y, vardata = textImgNew(), vardisplay = ''},
-	{data = textImgNew(), itemname = 'z', displayname = motif.option_info.menu_itemname_key_z, vardata = textImgNew(), vardisplay = ''},
-	{data = textImgNew(), itemname = 'start', displayname = motif.option_info.menu_itemname_key_start, vardata = textImgNew(), vardisplay = ''},
-	{data = textImgNew(), itemname = 'v', displayname = motif.option_info.menu_itemname_key_v, vardata = textImgNew(), vardisplay = ''},
-	{data = textImgNew(), itemname = 'w', displayname = motif.option_info.menu_itemname_key_w, vardata = textImgNew(), vardisplay = ''},
-	{data = textImgNew(), itemname = 'empty', displayname = ' '},
-	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_key_back},
+	{data = textImgNew(), itemname = 'dummy', displayname = ''},
+	{data = textImgNew(), itemname = 'configall', displayname = motif.option_info.menu_itemname_key_all, infodata = textImgNew(), infodisplay = ''},
+	{data = textImgNew(), itemname = 'up', displayname = motif.option_info.menu_itemname_key_up, vardata = textImgNew()},
+	{data = textImgNew(), itemname = 'down', displayname = motif.option_info.menu_itemname_key_down, vardata = textImgNew()},
+	{data = textImgNew(), itemname = 'left', displayname = motif.option_info.menu_itemname_key_left, vardata = textImgNew()},
+	{data = textImgNew(), itemname = 'right', displayname = motif.option_info.menu_itemname_key_right, vardata = textImgNew()},
+	{data = textImgNew(), itemname = 'a', displayname = motif.option_info.menu_itemname_key_a, vardata = textImgNew()},
+	{data = textImgNew(), itemname = 'b', displayname = motif.option_info.menu_itemname_key_b, vardata = textImgNew()},
+	{data = textImgNew(), itemname = 'c', displayname = motif.option_info.menu_itemname_key_c, vardata = textImgNew()},
+	{data = textImgNew(), itemname = 'x', displayname = motif.option_info.menu_itemname_key_x, vardata = textImgNew()},
+	{data = textImgNew(), itemname = 'y', displayname = motif.option_info.menu_itemname_key_y, vardata = textImgNew()},
+	{data = textImgNew(), itemname = 'z', displayname = motif.option_info.menu_itemname_key_z, vardata = textImgNew()},
+	{data = textImgNew(), itemname = 'start', displayname = motif.option_info.menu_itemname_key_start, vardata = textImgNew()},
+	{data = textImgNew(), itemname = 'd', displayname = motif.option_info.menu_itemname_key_d, vardata = textImgNew()},
+	{data = textImgNew(), itemname = 'w', displayname = motif.option_info.menu_itemname_key_w, vardata = textImgNew()},
+	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_key_back, infodata = textImgNew(), infodisplay = motif.option_info.menu_itemname_info_esc},
 }
-t_keyCfg = main.f_cleanTable(t_keyCfg)
+--t_keyCfg = main.f_cleanTable(t_keyCfg, main.t_sort.option_info)
 
-function options.f_keyCfg(playerNo, controller)
+local txt_keyController = textImgNew()
+function options.f_keyCfg(cfgType, controller)
 	main.f_cmdInput()
-	local cursorPosY = 1
+	local cursorPosY = 2
 	local moveTxt = 0
-	local item = 1
+	local item = 2
+	local item_start = 2
 	local t = t_keyCfg
+	local t_pos = {motif.option_info.menu_key_p1_pos, motif.option_info.menu_key_p2_pos}
+	local configall = false
+	local key = ''
+	local t_keyList = {}
+	local t_conflict = {}
+	local btnReleased = 0
+	local player = 1
+	local btn = tostring(config[cfgType][player].Buttons[item - item_start])
+	local joyNum = 0
 	textImgSetText(txt_title, motif.option_info.title_text_key)
-	for i = 1, #t_keyCfg do
-		if controller == -1 then
-			t_keyCfg[i].vardisplay = config.KeyConfig[playerNo].Buttons[i]
-		else
-			t_keyCfg[i].vardisplay = config.JoystickConfig[playerNo].Buttons[i]
+	--count all button assignments on the same controller
+	for i = 1, #config[cfgType] do
+		joyNum = config[cfgType][i].Joystick
+		if t_keyList[joyNum] == nil then
+			t_keyList[joyNum] = {} --creates subtable for each controller (1 for keyboard or at least 2 for gamepads)
+			t_conflict[joyNum] = false --set default conflict flag for each controller
+		end
+		for k, v in pairs(config[cfgType][i].Buttons) do
+			v = tostring(v)
+			t_keyCfg[k + item_start]['vardisplay' .. i] = v --assign vardisplay entry (assigned button name) in t_keyCfg table
+			if v ~= tostring(motif.option_info.menu_itemname_info_disable) then --if button is not disabled
+				if t_keyList[joyNum][v] == nil then
+					t_keyList[joyNum][v] = 1
+				else
+					t_keyList[joyNum][v] = t_keyList[joyNum][v] + 1
+				end
+			end
 		end
 	end
+	joyNum = config[cfgType][player].Joystick
 	while true do
-		cursorPosY, moveTxt, item = options.f_menuCommon1(cursorPosY, moveTxt, item, t)
-		if esc() then
-			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
-			textImgSetText(txt_title, motif.option_info.title_text_input)
-			break
-		elseif main.f_btnPalNo(main.p1Cmd) > 0 then
-			--Back
-			if t[item].itemname == 'back' then
+		--Config all
+		if configall then
+			if cfgType == 'KeyConfig' then --detect keyboard key
+				key = getKey()
+			elseif getJoystickPresent(joyNum) == false then --ensure that gamepad is connected
+				main.f_warning(main.f_extractText(motif.warning_info.text_pad), motif.option_info, motif.optionbgdef)
+				configall = false
+				commandBufReset(main.p1Cmd)
+			else --detect gamepad key
+				local tmp = getKey()
+				if tonumber(tmp) == nil then --button released
+					btnReleased = 1
+				elseif btnReleased == 1 then --button pressed after releasing button once
+					key = tmp
+					btnReleased = 0
+				end
+			end
+			key = tostring(key)
+			if esc() then
 				sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
-				textImgSetText(txt_title, motif.option_info.title_text_input)
-				break
-			--Buttons
-			else
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				local key = main.f_input(main.f_extractText(motif.option_info.input_text_key), motif.option_info, motif.optionbgdef, 'key')
-				if (controller == -1 and key ~= '') or (controller ~= -1 and tonumber(key) ~= nil) then
-					sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
-					t[item].vardisplay = key
-					if controller == -1 then
-						config.KeyConfig[playerNo].Buttons[item] = key
+				configall = false
+				commandBufReset(main.p1Cmd)
+			--some key detected
+			elseif key ~= '' then
+				--spacebar (disable key)
+				if key == 'SPACE' then
+					sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+					--decrease old button count
+					if t_keyList[joyNum][btn] ~= nil and t_keyList[joyNum][btn] > 1 then
+						t_keyList[joyNum][btn] = t_keyList[joyNum][btn] - 1
+					else
+						t_keyList[joyNum][btn] = nil
+					end
+					--update vardisplay / config data
+					t[item]['vardisplay' .. player] = motif.option_info.menu_itemname_info_disable
+					config[cfgType][player].Buttons[item - item_start] = tostring(motif.option_info.menu_itemname_info_disable)
+					modified = 1
+					needReload = 1
+				--other keyboard or gamepad key
+				elseif cfgType == 'KeyConfig' or (cfgType == 'JoystickConfig' and tonumber(key) ~= nil) then
+					sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+					--decrease old button count
+					if t_keyList[joyNum][btn] ~= nil and t_keyList[joyNum][btn] > 1 then
+						t_keyList[joyNum][btn] = t_keyList[joyNum][btn] - 1
+					else
+						t_keyList[joyNum][btn] = nil
+					end
+					--increase new button count
+					if t_keyList[joyNum][key] == nil then
+						t_keyList[joyNum][key] = 1
 					else
-						config.JoystickConfig[playerNo].Buttons[item] = key
+						t_keyList[joyNum][key] = t_keyList[joyNum][key] + 1
 					end
+					--update vardisplay / config data
+					t[item]['vardisplay' .. player] = key
+					config[cfgType][player].Buttons[item - item_start] = tostring(key)
+					modified = 1
+					needReload = 1
+				--non gamepad key on gamepad controller
 				else
 					sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
 				end
+				--move to the next position
+				item = item + 1
+				if cursorPosY < motif.option_info.menu_window_visibleitems then
+					cursorPosY = cursorPosY + 1
+				end
+				if item > 15 then
+					item = item_start
+					cursorPosY = item_start
+					configall = false
+					commandBufReset(main.p1Cmd)
+				end
 			end
-			modified = 1
-			needReload = 1
+			resetKey()
+			key = ''
+		--move up / down / left / right
+		elseif commandGetState(main.p1Cmd, 'u') then
+			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+			item = item - 1
+		elseif commandGetState(main.p1Cmd, 'd') then
+			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+			item = item + 1
+		elseif commandGetState(main.p1Cmd, 'l') or commandGetState(main.p1Cmd, 'r') then
+			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+			if player == 1 then
+				player = 2
+			else
+				player = 1
+			end
+			joyNum = config[cfgType][player].Joystick
 		end
-		options.f_menuCommon2(cursorPosY, moveTxt, item, t)
-	end
-end
-
---;===========================================================
---; AUDIO SETTINGS
---;===========================================================
-local t_audioCfg = {
-	{data = textImgNew(), itemname = 'mastervolume', displayname = motif.option_info.menu_itemname_audio_mastervolume, vardata = textImgNew(), vardisplay = config.MasterVolume .. '%'},
-	{data = textImgNew(), itemname = 'bgmvolume', displayname = motif.option_info.menu_itemname_audio_bgmvolume, vardata = textImgNew(), vardisplay = config.BgmVolume .. '%'},
-	{data = textImgNew(), itemname = 'sfxvolume', displayname = motif.option_info.menu_itemname_audio_sfxvolume, vardata = textImgNew(), vardisplay = config.WavVolume .. '%'},
-	{data = textImgNew(), itemname = 'audioducking', displayname = motif.option_info.menu_itemname_audio_audioducking, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.AudioDucking, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)},
-	{data = textImgNew(), itemname = 'empty', displayname = ' '},
-	{data = textImgNew(), itemname = 'back', displayname = motif.option_info.menu_itemname_video_back},
-}
-t_audioCfg = main.f_cleanTable(t_audioCfg)
-
-function options.f_audioCfg()
-	main.f_cmdInput()
-	local cursorPosY = 1
-	local moveTxt = 0
-	local item = 1
-	local t = t_audioCfg
-	textImgSetText(txt_title, motif.option_info.title_text_audio)
-	while true do
-		cursorPosY, moveTxt, item = options.f_menuCommon1(cursorPosY, moveTxt, item, t)
-		if esc() then
-			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
-			textImgSetText(txt_title, motif.option_info.title_text_main)
-			break
-		-- Master Volume
-		elseif t[item].itemname == 'mastervolume' then
-			if commandGetState(main.p1Cmd, 'r') and config.MasterVolume < 200 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.MasterVolume = config.MasterVolume + 1
-				t[item].vardisplay = config.MasterVolume .. '%'
-				modified = 1
-				needReload = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config.MasterVolume > 0 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.MasterVolume = config.MasterVolume - 1
-				t[item].vardisplay = config.MasterVolume .. '%'
-				modified = 1
-				needReload = 1
+		--cursor position calculation
+		if item < item_start then
+			item = #t
+			if #t > motif.option_info.menu_window_visibleitems then
+				cursorPosY = motif.option_info.menu_window_visibleitems
+			else
+				cursorPosY = #t
 			end
-		-- BGM Volume
-		elseif t[item].itemname == 'bgmvolume' then
-			if commandGetState(main.p1Cmd, 'r') and config.BgmVolume < 100 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.BgmVolume = config.BgmVolume + 1
-				t[item].vardisplay = config.BgmVolume .. '%'
-				modified = 1
-				needReload = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config.BgmVolume > 0 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.BgmVolume = config.BgmVolume - 1
-				t[item].vardisplay = config.BgmVolume .. '%'
-				modified = 1
-				needReload = 1
+		elseif item > #t then
+			item = item_start
+			cursorPosY = item_start
+		elseif configall == false then
+			if commandGetState(main.p1Cmd, 'u') and cursorPosY > item_start then
+				cursorPosY = cursorPosY - 1
+			elseif commandGetState(main.p1Cmd, 'd') and cursorPosY < motif.option_info.menu_window_visibleitems then
+				cursorPosY = cursorPosY + 1
 			end
-		-- SFX Volume
-		elseif t[item].itemname == 'sfxvolume' then
-			if commandGetState(main.p1Cmd, 'r') and config.WavVolume < 100 then
-				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.WavVolume = config.WavVolume + 1
-				t[item].vardisplay = config.WavVolume .. '%'
-				modified = 1
-				needReload = 1
-			elseif commandGetState(main.p1Cmd, 'l') and config.WavVolume > 0 then
+		end
+		if cursorPosY == motif.option_info.menu_window_visibleitems then
+			moveTxt = (item - motif.option_info.menu_window_visibleitems) * motif.option_info.menu_item_spacing[2]
+		elseif cursorPosY == item_start then
+			moveTxt = (item - item_start) * motif.option_info.menu_item_spacing[2]
+		end
+		btn = tostring(config[cfgType][player].Buttons[item - item_start])
+		if configall == false then
+			if esc() and not t_conflict[joyNum] then
+				sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
+				textImgSetText(txt_title, motif.option_info.title_text_input)
+				break
+			--Config all
+			elseif (t[item].itemname == 'configall' and main.f_btnPalNo(main.p1Cmd) > 0) or getKey() == 'F1' or getKey() == 'F2' then
+				sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
+				if getKey() == 'F1' then
+					player = 1
+				elseif getKey() == 'F2' then
+					player = 2
+				end
+				if cfgType == 'JoystickConfig' and getJoystickPresent(joyNum) == false then
+					main.f_warning(main.f_extractText(motif.warning_info.text_pad), motif.option_info, motif.optionbgdef)
+					item = item_start
+					cursorPosY = item_start
+				else
+					resetKey()
+					item = item_start + 1
+					cursorPosY = item_start + 1
+					btnReleased = 0
+					configall = true
+				end
+			--Back
+			elseif (t[item].itemname == 'back' and main.f_btnPalNo(main.p1Cmd) > 0) then
+				if t_conflict[joyNum] then
+					main.f_warning(main.f_extractText(motif.warning_info.text_keys), motif.option_info, motif.optionbgdef)
+				else
+					sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
+					textImgSetText(txt_title, motif.option_info.title_text_input)
+					break
+				end
+			--individual buttons
+			elseif main.f_btnPalNo(main.p1Cmd) > 0 then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-				config.WavVolume = config.WavVolume - 1
-				t[item].vardisplay = config.WavVolume .. '%'
-				modified = 1
-				needReload = 1
+				if cfgType == 'JoystickConfig' and getJoystickPresent(joyNum) == false then
+					main.f_warning(main.f_extractText(motif.warning_info.text_pad), motif.option_info, motif.optionbgdef)
+				else
+					key = main.f_input(main.f_extractText(motif.option_info.input_text_key), motif.option_info, motif.optionbgdef, controller, joyNum, 'SPACE')
+					--spacebar (disable key)
+					if key == 'SPACE' then
+						sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
+						--decrease old button count
+						if t_keyList[joyNum][btn] ~= nil and t_keyList[joyNum][btn] > 1 then
+							t_keyList[joyNum][btn] = t_keyList[joyNum][btn] - 1
+						else
+							t_keyList[joyNum][btn] = nil
+						end
+						--update vardisplay / config data
+						t[item]['vardisplay' .. player] = motif.option_info.menu_itemname_info_disable
+						config[cfgType][player].Buttons[item - item_start] = motif.option_info.menu_itemname_info_disable
+						modified = 1
+						needReload = 1
+					--other keyboard or gamepad key
+					elseif (cfgType == 'KeyConfig' and key ~= '') or (cfgType == 'JoystickConfig' and tonumber(key) ~= nil) then
+						sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
+						--decrease old button count
+						if t_keyList[joyNum][btn] ~= nil and t_keyList[joyNum][btn] > 1 then
+							t_keyList[joyNum][btn] = t_keyList[joyNum][btn] - 1
+						else
+							t_keyList[joyNum][btn] = nil
+						end
+						--increase new button count
+						if t_keyList[joyNum][key] == nil then
+							t_keyList[joyNum][key] = 1
+						else
+							t_keyList[joyNum][key] = t_keyList[joyNum][key] + 1
+						end
+						--update vardisplay / config data
+						t[item]['vardisplay' .. player] = key
+						config[cfgType][player].Buttons[item - item_start] = tostring(key)
+						modified = 1
+						needReload = 1
+					else
+						sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
+					end
+					resetKey()
+					key = ''
+				end
 			end
-		-- Audio Ducking
-		elseif t[item].itemname == 'audioducking' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
-			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
-			if config.AudioDucking then
-				config.AudioDucking = false
-			else
-				config.AudioDucking = true
+		end
+		t_conflict[joyNum] = false
+		--draw clearcolor
+		clearColor(motif.optionbgdef.bgclearcolor[1], motif.optionbgdef.bgclearcolor[2], motif.optionbgdef.bgclearcolor[3])
+		--draw layerno = 0 backgrounds
+		bgDraw(motif.optionbgdef.bg, false)
+		--draw player num
+		for i = 1, 2 do
+			textImgDraw(main.f_updateTextImg(
+				txt_keyController,
+				motif.font_data[motif.option_info['menu_item_key_p' .. i .. '_font'][1]],
+				motif.option_info['menu_item_key_p' .. i .. '_font'][2],
+				motif.option_info['menu_item_key_p' .. i .. '_font'][3],
+				motif.option_info['menu_itemname_key_p' .. i],
+				motif.option_info['menu_item_p' .. i .. '_pos'][1],
+				motif.option_info['menu_item_p' .. i .. '_pos'][2],
+				motif.option_info['menu_item_key_p' .. i .. '_font_scale'][1],
+				motif.option_info['menu_item_key_p' .. i .. '_font_scale'][2],
+				motif.option_info['menu_item_key_p' .. i .. '_font'][4],
+				motif.option_info['menu_item_key_p' .. i .. '_font'][5],
+				motif.option_info['menu_item_key_p' .. i .. '_font'][6],
+				motif.option_info['menu_item_key_p' .. i .. '_font'][7],
+				motif.option_info['menu_item_key_p' .. i .. '_font'][8]
+			))
+		end
+		--draw menu box
+		if motif.option_info.menu_boxbg_visible == 1 then
+			local coord4 = 0
+			for i = 1, 2 do
+				if #t > motif.option_info.menu_window_visibleitems and moveTxt == (#t - motif.option_info.menu_window_visibleitems) * motif.option_info.menu_key_item_spacing[2] then
+					coord4 = motif.option_info.menu_window_visibleitems * (motif.option_info.menu_key_boxcursor_coords[4] - motif.option_info.menu_key_boxcursor_coords[2] + 1) + main.f_oddRounding(motif.option_info.menu_key_boxcursor_coords[2])
+				else
+					coord4 = #t * (motif.option_info.menu_key_boxcursor_coords[4] - motif.option_info.menu_key_boxcursor_coords[2] + 1) + main.f_oddRounding(motif.option_info.menu_key_boxcursor_coords[2])
+				end
+				fillRect(
+					t_pos[i][1] + motif.option_info.menu_key_boxcursor_coords[1],
+					t_pos[i][2] + motif.option_info.menu_key_boxcursor_coords[2],
+					motif.option_info.menu_key_boxcursor_coords[3] - motif.option_info.menu_key_boxcursor_coords[1] + 1,
+					coord4,
+					motif.option_info.menu_boxbg_col[1],
+					motif.option_info.menu_boxbg_col[2],
+					motif.option_info.menu_boxbg_col[3],
+					motif.option_info.menu_boxbg_alpha[1],
+					motif.option_info.menu_boxbg_alpha[2]
+				)
+			end
+		end
+		--draw title
+		textImgDraw(txt_title)
+		--draw menu items
+		for i = 1, #t do
+			for j = 1, 2 do
+				if i > item - cursorPosY then
+					if t[i].itemname == 'configall' then
+						if j == 1 then --player1 side (left)
+							t[i].infodisplay = motif.option_info.menu_itemname_info_f1
+						else --player2 side (right)
+							t[i].infodisplay = motif.option_info.menu_itemname_info_f2
+						end
+					end
+					if i == item and j == player then --active item
+						--draw displayname
+						textImgDraw(main.f_updateTextImg(
+							t[i].data,
+							motif.font_data[motif.option_info.menu_item_active_font[1]],
+							motif.option_info.menu_item_active_font[2],
+							motif.option_info.menu_item_active_font[3],
+							t[i].displayname,
+							t_pos[j][1],
+							t_pos[j][2] + (i - 1) * motif.option_info.menu_key_item_spacing[2] - moveTxt,
+							motif.option_info.menu_item_active_font_scale[1],
+							motif.option_info.menu_item_active_font_scale[2],
+							motif.option_info.menu_item_active_font[4],
+							motif.option_info.menu_item_active_font[5],
+							motif.option_info.menu_item_active_font[6],
+							motif.option_info.menu_item_active_font[7],
+							motif.option_info.menu_item_active_font[8]
+						))
+						--draw vardata
+						if t[i].vardata ~= nil then
+							if t_keyList[joyNum][tostring(t[i]['vardisplay' .. j])] ~= nil and t_keyList[joyNum][tostring(t[i]['vardisplay' .. j])] > 1 then
+								textImgDraw(main.f_updateTextImg(
+									t[i].vardata,
+									motif.font_data[motif.option_info.menu_item_value_conflict_font[1]],
+									motif.option_info.menu_item_value_conflict_font[2],
+									motif.option_info.menu_item_value_conflict_font[3],
+									t[i]['vardisplay' .. j],
+									t_pos[j][1] + motif.option_info.menu_key_item_spacing[1],
+									t_pos[j][2] + (i - 1) * motif.option_info.menu_key_item_spacing[2] - moveTxt,
+									motif.option_info.menu_item_value_conflict_font_scale[1],
+									motif.option_info.menu_item_value_conflict_font_scale[2],
+									motif.option_info.menu_item_value_conflict_font[4],
+									motif.option_info.menu_item_value_conflict_font[5],
+									motif.option_info.menu_item_value_conflict_font[6],
+									motif.option_info.menu_item_value_conflict_font[7],
+									motif.option_info.menu_item_value_conflict_font[8]
+								))
+								t_conflict[joyNum] = true
+							else
+								textImgDraw(main.f_updateTextImg(
+									t[i].vardata,
+									motif.font_data[motif.option_info.menu_item_value_active_font[1]],
+									motif.option_info.menu_item_value_active_font[2],
+									motif.option_info.menu_item_value_active_font[3],
+									t[i]['vardisplay' .. j],
+									t_pos[j][1] + motif.option_info.menu_key_item_spacing[1],
+									t_pos[j][2] + (i - 1) * motif.option_info.menu_key_item_spacing[2] - moveTxt,
+									motif.option_info.menu_item_value_active_font_scale[1],
+									motif.option_info.menu_item_value_active_font_scale[2],
+									motif.option_info.menu_item_value_active_font[4],
+									motif.option_info.menu_item_value_active_font[5],
+									motif.option_info.menu_item_value_active_font[6],
+									motif.option_info.menu_item_value_active_font[7],
+									motif.option_info.menu_item_value_active_font[8]
+								))
+							end
+						--draw infodata
+						elseif t[i].infodata ~= nil then
+							textImgDraw(main.f_updateTextImg(
+								t[i].infodata,
+								motif.font_data[motif.option_info.menu_item_info_active_font[1]],
+								motif.option_info.menu_item_info_active_font[2],
+								motif.option_info.menu_item_info_active_font[3],
+								t[i].infodisplay,
+								t_pos[j][1] + motif.option_info.menu_key_item_spacing[1],
+								t_pos[j][2] + (i - 1) * motif.option_info.menu_key_item_spacing[2] - moveTxt,
+								motif.option_info.menu_item_value_active_font_scale[1],
+								motif.option_info.menu_item_value_active_font_scale[2],
+								motif.option_info.menu_item_info_active_font[4],
+								motif.option_info.menu_item_info_active_font[5],
+								motif.option_info.menu_item_info_active_font[6],
+								motif.option_info.menu_item_info_active_font[7],
+								motif.option_info.menu_item_info_active_font[8]
+							))
+						end
+					else --inactive item
+						--draw displayname
+						textImgDraw(main.f_updateTextImg(
+							t[i].data,
+							motif.font_data[motif.option_info.menu_item_font[1]],
+							motif.option_info.menu_item_font[2],
+							motif.option_info.menu_item_font[3],
+							t[i].displayname,
+							t_pos[j][1],
+							t_pos[j][2] + (i - 1) * motif.option_info.menu_key_item_spacing[2] - moveTxt,
+							motif.option_info.menu_item_font_scale[1],
+							motif.option_info.menu_item_font_scale[2],
+							motif.option_info.menu_item_font[4],
+							motif.option_info.menu_item_font[5],
+							motif.option_info.menu_item_font[6],
+							motif.option_info.menu_item_font[7],
+							motif.option_info.menu_item_font[8]
+						))
+						--draw vardata
+						if t[i].vardata ~= nil then
+							if t_keyList[joyNum][tostring(t[i]['vardisplay' .. j])] ~= nil and t_keyList[joyNum][tostring(t[i]['vardisplay' .. j])] > 1 then
+								textImgDraw(main.f_updateTextImg(
+									t[i].vardata,
+									motif.font_data[motif.option_info.menu_item_value_conflict_font[1]],
+									motif.option_info.menu_item_value_conflict_font[2],
+									motif.option_info.menu_item_value_conflict_font[3],
+									t[i]['vardisplay' .. j],
+									t_pos[j][1] + motif.option_info.menu_key_item_spacing[1],
+									t_pos[j][2] + (i - 1) * motif.option_info.menu_key_item_spacing[2] - moveTxt,
+									motif.option_info.menu_item_value_conflict_font_scale[1],
+									motif.option_info.menu_item_value_conflict_font_scale[2],
+									motif.option_info.menu_item_value_conflict_font[4],
+									motif.option_info.menu_item_value_conflict_font[5],
+									motif.option_info.menu_item_value_conflict_font[6],
+									motif.option_info.menu_item_value_conflict_font[7],
+									motif.option_info.menu_item_value_conflict_font[8]
+								))
+								t_conflict[joyNum] = true
+							else
+								textImgDraw(main.f_updateTextImg(
+									t[i].vardata,
+									motif.font_data[motif.option_info.menu_item_value_font[1]],
+									motif.option_info.menu_item_value_font[2],
+									motif.option_info.menu_item_value_font[3],
+									t[i]['vardisplay' .. j],
+									t_pos[j][1] + motif.option_info.menu_key_item_spacing[1],
+									t_pos[j][2] + (i - 1) * motif.option_info.menu_key_item_spacing[2] - moveTxt,
+									motif.option_info.menu_item_value_font_scale[1],
+									motif.option_info.menu_item_value_font_scale[2],
+									motif.option_info.menu_item_value_font[4],
+									motif.option_info.menu_item_value_font[5],
+									motif.option_info.menu_item_value_font[6],
+									motif.option_info.menu_item_value_font[7],
+									motif.option_info.menu_item_value_font[8]
+								))
+							end
+						--draw infodata
+						elseif t[i].infodata ~= nil then
+							textImgDraw(main.f_updateTextImg(
+								t[i].infodata,
+								motif.font_data[motif.option_info.menu_item_info_font[1]],
+								motif.option_info.menu_item_info_font[2],
+								motif.option_info.menu_item_info_font[3],
+								t[i].infodisplay,
+								t_pos[j][1] + motif.option_info.menu_key_item_spacing[1],
+								t_pos[j][2] + (i - 1) * motif.option_info.menu_key_item_spacing[2] - moveTxt,
+								motif.option_info.menu_item_value_active_font_scale[1],
+								motif.option_info.menu_item_value_active_font_scale[2],
+								motif.option_info.menu_item_info_font[4],
+								motif.option_info.menu_item_info_font[5],
+								motif.option_info.menu_item_info_font[6],
+								motif.option_info.menu_item_info_font[7],
+								motif.option_info.menu_item_info_font[8]
+							))
+						end
+					end
+				end
+			end
+		end
+		--draw menu cursor
+		if motif.option_info.menu_boxcursor_visible == 1 then
+			local src, dst = main.f_boxcursorAlpha(
+				motif.option_info.menu_boxcursor_alpharange[1],
+				motif.option_info.menu_boxcursor_alpharange[2],
+				motif.option_info.menu_boxcursor_alpharange[3],
+				motif.option_info.menu_boxcursor_alpharange[4],
+				motif.option_info.menu_boxcursor_alpharange[5],
+				motif.option_info.menu_boxcursor_alpharange[6]
+			)
+			for i = 1, 2 do
+				if i == player then
+					fillRect(
+						t_pos[i][1] + motif.option_info.menu_key_boxcursor_coords[1],
+						t_pos[i][2] + motif.option_info.menu_key_boxcursor_coords[2] + (cursorPosY - 1) * motif.option_info.menu_key_item_spacing[2],
+						motif.option_info.menu_key_boxcursor_coords[3] - motif.option_info.menu_key_boxcursor_coords[1] + 1,
+						motif.option_info.menu_key_boxcursor_coords[4] - motif.option_info.menu_key_boxcursor_coords[2] + 1 + main.f_oddRounding(motif.option_info.menu_key_boxcursor_coords[2]),
+						motif.option_info.menu_boxcursor_col[1],
+						motif.option_info.menu_boxcursor_col[2],
+						motif.option_info.menu_boxcursor_col[3],
+						src,
+						dst
+					)
+				end
 			end
-			t[item].vardisplay = options.f_boolDisplay(config.AudioDucking, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)
-			modified = 1
-			needReload = 1
-		--Back
-		elseif t[item].itemname == 'back' and main.f_btnPalNo(main.p1Cmd) > 0 then
-			sndPlay(motif.files.snd_data, motif.option_info.cancel_snd[1], motif.option_info.cancel_snd[2])
-			textImgSetText(txt_title, motif.option_info.title_text_main)
-			break
 		end
-		options.f_menuCommon2(cursorPosY, moveTxt, item, t)
+		--draw layerno = 1 backgrounds
+		bgDraw(motif.optionbgdef.bg, true)
+		main.f_cmdInput()
+		refresh()
 	end
 end
 

--- a/script/randomtest.lua
+++ b/script/randomtest.lua
@@ -1,6 +1,6 @@
 -- Used for demo mode and generates AI rank data
 -- Demo mode uses AutoLevel a GO function that ranks characters based on his number of loses vs wins
--- AutoLevel is pallete dependent so if a char has a 12th pallete OP mode that mode can have more rank than his normal one
+-- AutoLevel is palette dependent so if a char has a 12th palette OP mode that mode can have more rank than his normal one
 
 local randomtest = {}
 
@@ -236,7 +236,6 @@ function randomtest.init()
   end
   setAutoLevel(true)
   setMatchNo(1)
-  selectStage(0)
   randomtest.rakuBenry()
   winner = 0
   wins = 0
@@ -252,6 +251,7 @@ function randomtest.run()
   while not esc() do
     randomtest.randSel(1, winner)
     randomtest.randSel(2, winner)
+    select.f_setStage()
     loadStart()
     local oldwinner = winner
     winner = game()

--- a/script/screenpack.lua
+++ b/script/screenpack.lua
@@ -26,7 +26,16 @@ end
 function main.CalculateLocalcoordValues()
 	-- We load the libar localcoord from the motif file
 	main.SP_Localcoord = main.ParseDefFileValue(config.Motif, "info", "localcoord", true)
-
+	local spOriginTemp = main.ParseDefFileValue(config.Motif, "info", "localcoord_origin", true)
+	local spCenterTemp = main.ParseDefFileValue(config.Motif, "info", "localcoord_center", false)
+	
+	-- We check if we got a valid value
+	if spCenterTemp  == nil then
+		spCenterTemp = "default"
+	else
+		spCenterTemp = spCenterTemp:lower()
+	end
+	
 	-- We check if what we got is valid
 	if main.SP_Localcoord == nil then
 		main.SP_Localcoord = {320, 240}
@@ -46,11 +55,11 @@ function main.CalculateLocalcoordValues()
 	tempMFF = nil
 	
 	-- We seach for the file
-	if main.file_exists(motifFileFolder .. lbFileName) then
+	if main.f_fileExists(motifFileFolder .. lbFileName) then
 		main.LB_Localcoord = main.ParseDefFileValue(motifFileFolder .. lbFileName, "info", "localcoord", true)
-	elseif main.file_exists("data/" .. lbFileName) then
+	elseif main.f_fileExists("data/" .. lbFileName) then
 		main.LB_Localcoord = main.ParseDefFileValue("data/" .. lbFileName, "info", "localcoord", true)
-	elseif main.file_exists(lbFileName) then
+	elseif main.f_fileExists(lbFileName) then
 		main.LB_Localcoord = main.ParseDefFileValue(lbFileName, "info", "localcoord", true)
 	else
 		main.LB_Localcoord = main.SP_Localcoord
@@ -80,8 +89,20 @@ function main.CalculateLocalcoordValues()
 	main.LB_ScreenDiference = (main.LB_ScreenWidth - 320) / (main.LB_ScreenWidth / 320)
 	--setLifebarPortaitScale(main.SP_Localcoord[1] / main.SP_Localcoord43[1])
 
-	-- TODO: Check if this calculation of 'main.SP_Center' is rigth.
-	main.SP_Center = main.SP_Localcoord[1] - main.SP_Localcoord43[1]
+	-- Now we load posible values of main.SP_Center
+	if spOriginTemp == nil then
+		if spCenterTemp == "center" then
+			main.SP_Center = main.SP_Localcoord[1] / 2
+		elseif spCenterTemp == "left" then
+			main.SP_Center = 0
+		elseif spCenterTemp == "right" then
+			main.SP_Center = main.SP_Localcoord[1]
+		else
+			main.SP_Center = main.SP_Localcoord[1] - main.SP_Localcoord43[1]
+		end
+	else 
+		main.SP_Center = spOriginTemp
+	end
 end
 
 function main.IntLifebarScale()
@@ -142,7 +163,7 @@ function main.ParseDefFileValue(argFile, searchBlock, searchParam, isNumber)
 					param = param:gsub('[%. ]', '_') -- change param . and space to _
 					param = param:lower() -- lowercase param
 				end
-				if param ~= nil and value ~= nil and param:match(searchParam) then -- param = value pattern matched
+				if param ~= nil and value ~= nil and param == searchParam then -- param = value pattern matched
 					value = value:gsub('"', '') -- remove brackets from value
 					if value:match('.+,.+') then -- multiple values
 						for i, c in ipairs(main.f_strsplit(',', value)) do -- split value using "," delimiter

--- a/script/select.lua
+++ b/script/select.lua
@@ -8,13 +8,7 @@ setSelColRow(motif.select_info.columns, motif.select_info.rows)
 --setRandomSpr(motif.selectbgdef.spr_data, motif.select_info.cell_random_spr[1], motif.select_info.cell_random_spr[2], motif.select_info.cell_random_scale[1], motif.select_info.cell_random_scale[2])
 --setCellSpr(motif.selectbgdef.spr_data, motif.select_info.cell_bg_spr[1], motif.select_info.cell_bg_spr[2], motif.select_info.cell_bg_scale[1], motif.select_info.cell_bg_scale[2])
 
--- cell.size type check
-if type(motif.select_info.cell_spacing) == "table" then
-	setSelCellSize(motif.select_info.cell_size[1] + motif.select_info.cell_spacing[1], motif.select_info.cell_size[2] + motif.select_info.cell_spacing[2])
-else
-	setSelCellSize(motif.select_info.cell_size[1] + motif.select_info.cell_spacing, motif.select_info.cell_size[2] + motif.select_info.cell_spacing)
-end
-
+setSelCellSize(motif.select_info.cell_size[1] + motif.select_info.cell_spacing[1], motif.select_info.cell_size[2] + motif.select_info.cell_spacing[2])
 setSelCellScale(motif.select_info.portrait_scale[1], motif.select_info.portrait_scale[2])
 
 --default team count after starting the game
@@ -43,7 +37,6 @@ local t_p1Selected = {}
 local t_p2Selected = {}
 local t_roster = {}
 local t_aiRamp = {}
-local continue = false
 local p1Cell = false
 local p2Cell = false
 local p1TeamEnd = false
@@ -55,6 +48,7 @@ local stageEnd = false
 local coopEnd = false
 local restoreTeam = false
 local resetgrid = false
+local continueStage = false
 local teamMode = 0
 local numChars = 0
 local p1NumChars = 0
@@ -79,9 +73,13 @@ local p2FaceY = 0
 local p1TeamMode = 0
 local p2TeamMode = 0
 local lastMatch = 0
+local currentOrder = 0
+local currentRosterIndex = 0
 local stageNo = 0
 local stageList = 0
-
+local fadeType = 'fadein'
+local continue = false
+local challenger = false
 local cnt = motif.select_info.columns + 1
 local row = 1
 local col = 0
@@ -94,14 +92,7 @@ for i = 1, (motif.select_info.rows + motif.select_info.rows_scrolling) * motif.s
 		t_grid[row] = {}
 	end
 	col = #t_grid[row] + 1
-	
-	-- cell.spacing type check
-	if type(motif.select_info.cell_spacing) == "table" then
-		t_grid[row][col] = {num = i - 1, x = (col - 1) * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing[1]), y = (row - 1) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing[2])}
-	else
-		t_grid[row][col] = {num = i - 1, x = (col - 1) * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing), y = (row - 1) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing)}
-	end
-	
+	t_grid[row][col] = {num = i - 1, x = (col - 1) * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing[1]), y = (row - 1) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing[2])}
 	if main.t_selChars[i].char ~= nil then
 		t_grid[row][col].char = main.t_selChars[i].char
 		t_grid[row][col].hidden = main.t_selChars[i].hidden
@@ -113,76 +104,81 @@ end
 --;===========================================================
 --; COMMON FUNCTIONS
 --;===========================================================
-function select.f_setZoom()
-	local zoom = config.ZoomActive
-	if main.t_selChars[t_p2Selected[1].cel + 1].zoom ~= nil then
-		if main.t_selChars[t_p2Selected[1].cel + 1].zoom == 1 then
-			zoom = true
-		else
-			zoom = false
-		end
-	elseif main.t_selStages[stageNo] ~= nil and main.t_selStages[stageNo].zoom ~= nil then
-		if main.t_selChars[stageNo].zoom == 1 then
-			zoom = true
-		else
-			zoom = false
-		end
-	end
-	setZoom(zoom)
-	local zoomMin = config.ZoomMin
-	if main.t_selStages[stageNo].zoommin ~= nil then
-		zoomMin = main.t_selStages[stageNo].zoommin
-	end
-	setZoomMin(zoomMin)
-	local zoomMax = config.ZoomMax
-	if main.t_selStages[stageNo].zoommax ~= nil then
-		zoomMax = main.t_selStages[stageNo].zoommax
-	end
-	setZoomMax(zoomMax)
-	local zoomSpeed = config.ZoomSpeed
-	if main.t_selStages[stageNo].zoomspeed ~= nil then
-		zoomSpeed = main.t_selStages[stageNo].zoomspeed
-	end
-	setZoomSpeed(zoomSpeed)
-end
-
 function select.f_makeRoster()
 	t_roster = {}
 	local t = {}
 	local cnt = 0
+	local orderCnt = 0
 	--Arcade
-	if main.gameMode == 'arcade' or main.gameMode == 'teamcoop' or main.gameMode == 'netplayteamcoop' then
-		if p2TeamMode == 0 then --Single
+	if gameMode('arcade') or gameMode('teamcoop') or gameMode('netplayteamcoop') then
+		if main.t_selChars[t_p1Selected[1].cel + 1].maxmatches ~= nil then
+			if p2TeamMode == 0 then --Single
+				t = main.t_selOptions[main.t_selChars[t_p1Selected[1].cel + 1].maxmatches .. "_arcademaxmatches"]
+			else --Team
+				t = main.t_selOptions[main.t_selChars[t_p1Selected[1].cel + 1].maxmatches .. "_teammaxmatches"]
+			end
+		elseif p2TeamMode == 0 then
 			t = main.t_selOptions.arcademaxmatches
-		else --Team
+		else
 			t = main.t_selOptions.teammaxmatches
 		end
 		for i = 1, #t do --for each order number
+			table.insert(t_roster, {})
 			cnt = t[i] * p2NumChars --set amount of matches to get from the table
-			if cnt > 0 and main.t_orderChars[i] ~= nil then --if it's more than 0 and there are characters with such order
-				while cnt > 0 do --do the following until amount of matches for particular order is reached
+			if cnt > 0 and main.t_orderChars[i] ~= nil then --if matches > 0 and there are characters with such order
+				if t[i] > #main.t_orderChars[i] then --if there is not enough chars with particular order reduce amount of matches
+					orderCnt = #main.t_orderChars[i] * p2NumChars
+				else
+					orderCnt = cnt
+				end
+				while orderCnt > 0 do --do the following until amount of matches for particular order is reached
 					main.f_shuffleTable(main.t_orderChars[i]) --randomize characters table
-					for j = 1, #main.t_orderChars[i] do --loop through chars associated with that particular order
-						t_roster[#t_roster + 1] = main.t_orderChars[i][j] --and add such character into new table
-						cnt = cnt - 1
-						if cnt == 0 then --but only if amount of matches for particular order has not been reached yet
+					for j = 1, #main.t_orderChars[i] do --loop through chars associated with this particular order
+						table.insert(t_roster[i], main.t_orderChars[i][j]) --and add such character into new table
+						orderCnt = orderCnt - 1
+						if orderCnt == 0 then --but only if amount of matches for particular order has not been reached yet
 							break
 						end
 					end
 				end
 			end
 		end
-	--Survival / Boss Rush / VS 100 Kumite
-	else
-		if main.gameMode == 'survival' or main.gameMode == 'survivalcoop' or main.gameMode == 'netplaysurvivalcoop' then
-			t = main.t_randomChars
-			cnt = #t
-			local i = 0
-			while cnt / p2NumChars ~= math.ceil(cnt / p2NumChars) do --not integer
-				i = i + 1
-				cnt = #t + i
+	--Survival
+	elseif gameMode('survival') or gameMode('survivalcoop') or gameMode('netplaysurvivalcoop') then
+		t = main.t_selOptions.survivalmaxmatches
+		for i = 1, #t do --for each order number
+			table.insert(t_roster, {})
+			--set amount of matches to get from the table
+			if t[i] == -1 and main.t_orderSurvival[i] ~= nil then --infinite matches
+				cnt = #main.t_orderSurvival[i] * p2NumChars --get value equal all characters with this order
+			else --finite matches
+				cnt = t[i] * p2NumChars --amount of matches as specified in survival.maxmatches column
+			end
+			if cnt > 0 and main.t_orderSurvival[i] ~= nil then --if matches > 0 and there are characters with such order
+				if t[i] > #main.t_orderSurvival[i] or t[i] < 0 then --if there is not enough chars with particular order reduce amount of matches
+					orderCnt = #main.t_orderSurvival[i] * p2NumChars
+				else
+					orderCnt = cnt
+				end
+				while orderCnt > 0 do --do the following until amount of matches for particular order is reached
+					main.f_shuffleTable(main.t_orderSurvival[i]) --randomize characters table
+					for j = 1, #main.t_orderSurvival[i] do --loop through chars associated with this particular order
+						table.insert(t_roster[i], main.t_orderSurvival[i][j]) --and add such character into new table
+						orderCnt = orderCnt - 1
+						if orderCnt == 0 then --but only if amount of matches for particular order has not been reached yet
+							break
+						end
+					end
+				end
+				if t[i] == -1 then --infinity matches against characters with order i, skip the rest
+					break
+				end
 			end
-		elseif main.gameMode == 'bossrush' then
+		end
+	--Boss Rush / VS 100 Kumite
+	else
+		table.insert(t_roster, {})
+		if gameMode('bossrush') then
 			t = main.t_bossChars
 			cnt = #t
 			local i = 0
@@ -190,14 +186,14 @@ function select.f_makeRoster()
 				i = i + 1
 				cnt = #t + i
 			end
-		elseif main.gameMode == '100kumite' then
+		elseif gameMode('100kumite') then
 			t = main.t_randomChars
 			cnt = 100 * p2NumChars
 		end
 		while cnt > 0 do
 			main.f_shuffleTable(t)
 			for i = 1, #t do
-				t_roster[#t_roster + 1] = t[i]
+				table.insert(t_roster[1], t[i])
 				cnt = cnt - 1
 				if cnt == 0 then
 					break
@@ -208,14 +204,16 @@ function select.f_makeRoster()
 	main.f_printTable(t_roster, 'debug/t_roster.txt')
 end
 
-function select.f_aiRamp()
+function select.f_aiRamp(currentMatch)
 	local start_match = 0
 	local start_diff = 0
 	local end_match = 0
 	local end_diff = 0
-	t_aiRamp = {}
+	if currentMatch == 1 then
+		t_aiRamp = {}
+	end
 	--Arcade
-	if main.gameMode == 'arcade' or main.gameMode == 'teamcoop' or main.gameMode == 'netplayteamcoop' then
+	if gameMode('arcade') or gameMode('teamcoop') or gameMode('netplayteamcoop') then
 		if p2TeamMode == 0 then --Single
 			start_match = main.t_selOptions.arcadestart.wins
 			start_diff = main.t_selOptions.arcadestart.offset
@@ -227,7 +225,7 @@ function select.f_aiRamp()
 			end_match =  main.t_selOptions.teamend.wins
 			end_diff = main.t_selOptions.teamend.offset
 		end
-	elseif main.gameMode == 'survival' or main.gameMode == 'survivalcoop' or main.gameMode == 'netplaysurvivalcoop' then
+	elseif gameMode('survival') or gameMode('survivalcoop') or gameMode('netplaysurvivalcoop') then
 		start_match = main.t_selOptions.survivalstart.wins
 		start_diff = main.t_selOptions.survivalstart.offset
 		end_match =  main.t_selOptions.survivalend.wins
@@ -245,27 +243,42 @@ function select.f_aiRamp()
 	elseif endAI < 1 then
 		endAI = 1
 	end
-	for i = 1, lastMatch do
+	for i = currentMatch, lastMatch do
 		if i - 1 <= start_match then
-			t_aiRamp[#t_aiRamp + 1] = startAI
+			table.insert(t_aiRamp, startAI)
 		elseif i - 1 <= end_match then
 			local curMatch = i - (start_match + 1)
-			t_aiRamp[#t_aiRamp + 1] = math.floor(curMatch * (endAI - startAI) / (end_match - start_match) + startAI)
+			table.insert(t_aiRamp, math.floor(curMatch * (endAI - startAI) / (end_match - start_match) + startAI))
 		else
-			t_aiRamp[#t_aiRamp + 1] = endAI
+			table.insert(t_aiRamp, endAI)
 		end
 	end
 	main.f_printTable(t_aiRamp, 'debug/t_aiRamp.txt')
 end
 
+function select.f_rivalsMatch(param)
+	if main.t_selChars[t_p1Selected[1].cel + 1].rivals ~= nil and main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo] ~= nil then
+		if param == nil then
+			return true
+		else
+			return main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo][param] ~= nil
+		end
+	end
+	return false
+end
+
 function select.f_difficulty(player, offset)
 	local t = {}
-	if player % 2 ~= 0 then --odd value
+	if player % 2 ~= 0 then --odd value (Player1 side)
 		local pos = math.floor(player / 2 + 0.5)
 		t = main.t_selChars[t_p1Selected[pos].cel + 1]
-	else --even value
+	else --even value (Player2 side)
 		local pos = math.floor(player / 2)
-		t = main.t_selChars[t_p2Selected[pos].cel + 1]
+		if pos == 1 and select.f_rivalsMatch('ai') then --player2 team leader and arcade mode and ai rivals param exists
+			t = main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo]
+		else
+			t = main.t_selChars[t_p2Selected[pos].cel + 1]
+		end
 	end
 	if t.ai ~= nil then
 		return t.ai
@@ -274,14 +287,15 @@ function select.f_difficulty(player, offset)
 	end
 end
 
-function select.f_aiLevel()
+function select.f_remapAI()
 	--Offset
 	local offset = 0
-	if config.AIRamping and main.gameMode == 'arcade' or main.gameMode == 'teamcoop' or main.gameMode == 'netplayteamcoop' or main.gameMode == 'survival' or main.gameMode == 'survivalcoop' or main.gameMode == 'netplaysurvivalcoop' then
+	if config.AIRamping and (gameMode('arcade') or gameMode('teamcoop') or gameMode('netplayteamcoop') or gameMode('survival') or gameMode('survivalcoop') or gameMode('netplaysurvivalcoop')) then
 		offset = t_aiRamp[matchNo] - config.Difficulty
 	end
 	--Player 1
 	if main.coop then
+		remapInput(3, 2) --P3 character uses P2 controls
 		setCom(1, 0)
 		setCom(3, 0)
 	elseif p1TeamMode == 0 then --Single
@@ -298,34 +312,26 @@ function select.f_aiLevel()
 		end
 		for i = 3, p1NumChars * 2 do
 			if i % 2 ~= 0 then --odd value
+				remapInput(i, 1) --P3/5/7 character uses P1 controls
 				setCom(i, select.f_difficulty(i, offset))
 			end
 		end
-	-- Legcy TAG
-	elseif p1TeamMode == 1 and config.SimulMode == false then
-		for i = 1, p1NumChars * 2 do
-			if i % 2 ~= 0 then --odd value
-				if main.p1In == 1 and not main.aiFight then
-					setCom(i, 0)
-				else
-					setCom(i, select.f_difficulty(i, offset))
-				end
-			end
-		end
 	elseif p1TeamMode == 2 then --Turns
 		for i = 1, p1NumChars * 2 do
-			if i % 2 ~= 0 then
+			if i % 2 ~= 0 then --odd value
 				if main.p1In == 1 and not main.aiFight then
+					remapInput(i, 1) --P1/3/5/7 character uses P1 controls
 					setCom(i, 0)
 				else
 					setCom(i, select.f_difficulty(i, offset))
 				end
 			end
 		end
-	else --Tag
+	else --p1TeamMode == 3 or (p1TeamMode == 1 and not config.SimulMode) --Tag
 		for i = 1, p1NumChars * 2 do
 			if i % 2 ~= 0 then --odd value
 				if main.p1In == 1 and not main.aiFight then
+					remapInput(i, 1) --P1/3/5/7 character uses P1 controls
 					setCom(i, 0)
 				else
 					setCom(i, select.f_difficulty(i, offset))
@@ -348,34 +354,26 @@ function select.f_aiLevel()
 		end
 		for i = 4, p2NumChars * 2 do
 			if i % 2 == 0 then --even value
+				remapInput(i, 2) --P4/6/8 character uses P2 controls
 				setCom(i, select.f_difficulty(i, offset))
 			end
 		end
-	-- Legcy TAG
-	elseif p2TeamMode == 1 and config.SimulMode == false then --Tag
-		for i = 2, p2NumChars * 2 do
-			if i % 2 == 0 then --even value
-				if main.p2In == 2 and not main.aiFight and not main.coop then
-					setCom(i, 0)
-				else
-					setCom(i, select.f_difficulty(i, offset))
-				end
-			end
-		end
 	elseif p2TeamMode == 2 then --Turns
 		for i = 2, p2NumChars * 2 do
-			if i % 2 == 0 then
+			if i % 2 == 0 then --even value
 				if main.p2In == 2 and not main.aiFight and not main.coop then
+					remapInput(i, 2) --P2/4/6/8 character uses P2 controls
 					setCom(i, 0)
 				else
 					setCom(i, select.f_difficulty(i, offset))
 				end
 			end
 		end
-	else --Tag
+	else --p2TeamMode == 3 or (p2TeamMode == 1 and not config.SimulMode) --Tag
 		for i = 2, p2NumChars * 2 do
 			if i % 2 == 0 then --even value
 				if main.p2In == 2 and not main.aiFight and not main.coop then
+					remapInput(i, 2) --P2/4/6/8 character uses P2 controls
 					setCom(i, 0)
 				else
 					setCom(i, select.f_difficulty(i, offset))
@@ -385,75 +383,277 @@ function select.f_aiLevel()
 	end
 end
 
-function select.f_assignMusic()
-	local track = ''
-	local trackVolume = 100
-	local tracloopstart,tracloopend = nil
-	if main.stageMenu then
-		if main.t_selStages[stageNo].music ~= nil then
-			track = math.random(1, #main.t_selStages[stageNo].music)
-			trackVolume = main.t_selStages[stageNo].music[track].bgmvolume
-			trackloopstart = main.t_selStages[stageNo].music[track].bgmloopstart
-			trackloopend = main.t_selStages[stageNo].music[track].bgmloopend
-			track = main.t_selStages[stageNo].music[track].bgmusic
-		end
+local lifebar = motif.files.fight
+function select.f_setRounds()
+	--lifebar
+	if main.t_charparam.lifebar and main.t_charparam.rivals and select.f_rivalsMatch('lifebar') then --lifebar assigned as rivals param
+		lifebar = main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo].lifebar:gsub('\\', '/')
+	elseif main.t_charparam.lifebar and main.t_selChars[t_p2Selected[1].cel + 1].lifebar ~= nil then --lifebar assigned as character param
+		lifebar = main.t_selChars[t_p2Selected[1].cel + 1].lifebar:gsub('\\', '/')
+	else --default lifebar
+		lifebar = motif.files.fight
+	end
+	if lifebar:lower() ~= main.currentLifebar:lower() then
+		main.currentLifebar = lifebar
+		loadLifebar(lifebar)
+	end
+	--round time
+	if gameMode('training') then
+		setRoundTime(-1)
+	elseif main.t_charparam.time and main.t_charparam.rivals and select.f_rivalsMatch('time') then --round time assigned as rivals param
+		setRoundTime(math.max(-1, main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo].time * getFramesPerCount()))
+	elseif main.t_charparam.time and main.t_selChars[t_p2Selected[1].cel + 1].time ~= nil then --round time assigned as character param
+		setRoundTime(math.max(-1, main.t_selChars[t_p2Selected[1].cel + 1].time * getFramesPerCount()))
+	else --default round time
+		setRoundTime(math.max(-1, config.RoundTime * getFramesPerCount()))
+	end
+	--rounds to win
+	if gameMode('survival') or gameMode('survivalcoop') or gameMode('netplaysurvivalcoop') or gameMode('100kumite') then --always 1 round to win in these modes
+		setMatchWins(1)
+		setMatchMaxDrawGames(0)
 	else
-		if main.t_selChars[t_p2Selected[1].cel + 1].music ~= nil then
-			track = math.random(1, #main.t_selChars[t_p2Selected[1].cel + 1].music)
-			trackVolume = main.t_selChars[t_p2Selected[1].cel + 1].music[track].bgmvolume
-			trackloopstart = main.t_selChars[t_p2Selected[1].cel + 1].music[track].bgmloopstart
-			trackloopend = main.t_selChars[t_p2Selected[1].cel + 1].music[track].bgmloopend
-			track = main.t_selChars[t_p2Selected[1].cel + 1].music[track].bgmusic
-		elseif main.t_selStages[stageNo].music ~= nil then
-			track = math.random(1, #main.t_selStages[stageNo].music)
-			trackVolume = main.t_selStages[stageNo].music[track].bgmvolume
-			trackloopstart = main.t_selStages[stageNo].music[track].bgmloopstart
-			trackloopend = main.t_selStages[stageNo].music[track].bgmloopend
-			track = main.t_selStages[stageNo].music[track].bgmusic
+		if main.t_charparam.rounds and main.t_charparam.rivals and select.f_rivalsMatch('rounds') then --round num assigned as rivals param
+			setMatchWins(main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo].rounds)
+		elseif main.t_charparam.rounds and main.t_selChars[t_p2Selected[1].cel + 1].rounds ~= nil then --round num assigned as character param
+			setMatchWins(main.t_selChars[t_p2Selected[1].cel + 1].rounds)
+		elseif p2TeamMode == 0 then --default rounds num (Single mode)
+			setMatchWins(options.roundsNumSingle)
+		else --default rounds num (Team mode)
+			setMatchWins(options.roundsNumTeam)
 		end
-		stageEnd = true
+		setMatchMaxDrawGames(options.maxDrawGames)
 	end
-	playBGM(track, true, 1, trackVolume, trackloopstart or "0", trackloopend or "0")
 end
 
-function select.f_selectStage()
-	if t_p2Selected[1].stageno ~= nil then
-		stageNo = t_p2Selected[1].stageno
-	elseif main.t_selChars[t_p2Selected[1].cel + 1].stage ~= nil then
-		stageNo = math.random(1, #main.t_selChars[t_p2Selected[1].cel + 1].stage)
-		stageNo = main.t_selChars[t_p2Selected[1].cel + 1].stage[stageNo]
-	else
-		stageNo = main.t_includeStage[math.random(1, #main.t_includeStage)]
+function select.f_setStage(num)
+	num = num or 0
+	--stage
+	if not main.stageMenu and not continueStage then
+		if main.t_charparam.stage and main.t_charparam.rivals and select.f_rivalsMatch('stage') then --stage assigned as rivals param
+			num = math.random(1, #main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo].stage)
+			num = main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo].stage[num]
+		elseif main.t_charparam.stage and main.t_selChars[t_p2Selected[1].cel + 1].stage ~= nil then --stage assigned as character param
+			num = math.random(1, #main.t_selChars[t_p2Selected[1].cel + 1].stage)
+			num = main.t_selChars[t_p2Selected[1].cel + 1].stage[num]
+		elseif (gameMode('arcade') or gameMode('teamcoop') or gameMode('netplayteamcoop')) and main.t_orderStages[main.t_selChars[t_p2Selected[1].cel + 1].order] ~= nil then --stage assigned as stage order param
+			num = math.random(1, #main.t_orderStages[main.t_selChars[t_p2Selected[1].cel + 1].order])
+			num = main.t_orderStages[main.t_selChars[t_p2Selected[1].cel + 1].order][num]
+		else --stage randomly selected
+			num = main.t_includeStage[1][math.random(1, #main.t_includeStage[1])]
+		end
+	end
+	setStage(num)
+	selectStage(num)
+	--zoom
+	local zoom = config.ZoomActive
+	local zoomMin = config.ZoomMin
+	local zoomMax = config.ZoomMax
+	local zoomSpeed = config.ZoomSpeed
+	if main.t_charparam.zoom and main.t_charparam.rivals and select.f_rivalsMatch('zoom') then --zoom assigned as rivals param
+		if main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo].zoom == 1 then
+			zoom = true
+		else
+			zoom = false
+		end
+	elseif main.t_charparam.zoom and main.t_selChars[t_p2Selected[1].cel + 1].zoom ~= nil then --zoom assigned as character param
+		if main.t_selChars[t_p2Selected[1].cel + 1].zoom == 1 then
+			zoom = true
+		else
+			zoom = false
+		end
+	elseif main.t_selStages[num] ~= nil and main.t_selStages[num].zoom ~= nil then --zoom assigned as stage param
+		if main.t_selStages[num].zoom == 1 then
+			zoom = true
+		else
+			zoom = false
+		end
+	end
+	if main.t_selStages[num] ~= nil then
+		if main.t_selStages[num].zoommin ~= nil then
+			zoomMin = main.t_selStages[num].zoommin
+		end
+		if main.t_selStages[num].zoommax ~= nil then
+			zoomMax = main.t_selStages[num].zoommax
+		end
+		if main.t_selStages[num].zoomspeed ~= nil then
+			zoomSpeed = main.t_selStages[num].zoomspeed
+		end
 	end
-	if stageNo == 0 then
-		stageNo = main.t_includeStage[math.random(1, #main.t_includeStage)]
+	setZoom(zoom)
+	setZoomMin(zoomMin)
+	setZoomMax(zoomMax)
+	setZoomSpeed(zoomSpeed)
+	--music
+	local t = {'music', 'musicalt', 'musiclife'}
+	for i = 1, #t do
+		local track = 0
+		local music = ''
+		local volume = 100
+		local loopstart = 0
+		local loopend = 0
+		if main.stageMenu then --game modes with stage selection screen
+			if main.t_selStages[num] ~= nil and main.t_selStages[num][t[i]] ~= nil then --music assigned as stage param
+				track = math.random(1, #main.t_selStages[num][t[i]])
+				music = main.t_selStages[num][t[i]][track].bgmusic
+				volume = main.t_selStages[num][t[i]][track].bgmvolume
+				loopstart = main.t_selStages[num][t[i]][track].bgmloopstart
+				loopend = main.t_selStages[num][t[i]][track].bgmloopend
+			end
+		elseif not gameMode('demo') or motif.demo_mode.fight_playbgm == 1 then --game modes other than demo (or demo with stage BGM param enabled)
+			if main.t_charparam.music and main.t_charparam.rivals and select.f_rivalsMatch(t[i]) then --music assigned as rivals param
+				track = math.random(1, #main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo][t[i]])
+				music = main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo][t[i]][track].bgmusic
+				volume = main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo][t[i]][track].bgmvolume
+				loopstart = main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo][t[i]][track].bgmloopstart
+				loopend = main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo][t[i]][track].bgmloopend
+			elseif main.t_charparam.music and main.t_selChars[t_p2Selected[1].cel + 1][t[i]] ~= nil then --music assigned as character param
+				track = math.random(1, #main.t_selChars[t_p2Selected[1].cel + 1][t[i]])
+				music = main.t_selChars[t_p2Selected[1].cel + 1][t[i]][track].bgmusic
+				volume = main.t_selChars[t_p2Selected[1].cel + 1][t[i]][track].bgmvolume
+				loopstart = main.t_selChars[t_p2Selected[1].cel + 1][t[i]][track].bgmloopstart
+				loopend = main.t_selChars[t_p2Selected[1].cel + 1][t[i]][track].bgmloopend
+			elseif main.t_selStages[num] ~= nil and main.t_selStages[num][t[i]] ~= nil then --music assigned as stage param
+				track = math.random(1, #main.t_selStages[num][t[i]])
+				music = main.t_selStages[num][t[i]][track].bgmusic
+				volume = main.t_selStages[num][t[i]][track].bgmvolume
+				loopstart = main.t_selStages[num][t[i]][track].bgmloopstart
+				loopend = main.t_selStages[num][t[i]][track].bgmloopend
+			end
+		end
+		if music ~= '' then
+			setStageBGM(i - 1, music, volume, loopstart, loopend)
+		end
+	end
+	return num
+end
+
+function select.f_reampPal(cell, num)
+	if main.t_selChars[cell + 1].pal_keymap[num] ~= nil then
+		return main.t_selChars[cell + 1].pal_keymap[num]
 	end
-	t_p2Selected[1].stageno = stageNo
-	setStage(stageNo)
-	selectStage(stageNo)
+	return num
 end
 
-function select.f_randomPal(cell)
-	--table with pal numbers already assigned
-	local t = {}
+function select.f_selectPal(cell)
+	--prepare palette tables
+	local t_assignedVals = {} --values = pal numbers already assigned
+	local t_assignedKeys = {} --keys = pal numbers already assigned
 	for i = 1, #t_p1Selected do
 		if t_p1Selected[i].cel == cell then
-			t[#t + 1] = t_p1Selected[i].pal
+			table.insert(t_assignedVals, select.f_reampPal(cell, t_p1Selected[i].pal))
+			t_assignedKeys[t_assignedVals[#t_assignedVals]] = ''
 		end
 	end
 	for i = 1, #t_p2Selected do
 		if t_p2Selected[i].cel == cell then
-			t[#t + 1] = t_p2Selected[i].pal
+			table.insert(t_assignedVals, select.f_reampPal(cell, t_p2Selected[i].pal))
+			t_assignedKeys[t_assignedVals[#t_assignedVals]] = ''
 		end
 	end
-	--table with pal numbers not assigned yet (or all if there are not enough pals for unique appearance of all characters)
-	local t2 = {}
-	for i = 1, #main.t_selChars[cell + 1].pal do
-		if t[main.t_selChars[cell + 1].pal[i]] == nil or #t >= #main.t_selChars[cell + 1].pal then
-			t2[#t2 + 1] = main.t_selChars[cell + 1].pal[i]
+	--return random palette
+	if config.AIRandomColor then
+		local t_uniqueVals = {} --values = pal numbers not assigned yet (or all if there are not enough pals for unique appearance of all characters)
+		for i = 1, #main.t_selChars[cell + 1].pal do
+			if t_assignedKeys[main.t_selChars[cell + 1].pal[i]] == nil or #t_assignedVals >= #main.t_selChars[cell + 1].pal then
+				table.insert(t_uniqueVals, main.t_selChars[cell + 1].pal[i])
+			end
+		end
+		return t_uniqueVals[math.random(1, #t_uniqueVals)]
+	end
+	--return first available default palette
+	for i = 1, #main.t_selChars[cell + 1].pal_defaults do
+		local d = main.t_selChars[cell + 1].pal_defaults[i]
+		if t_assignedKeys[d] == nil then
+			return select.f_reampPal(cell, d)
+		end
+	end
+	--no free default palettes available, force first default palette
+	return select.f_reampPal(cell, main.t_selChars[cell + 1].pal_defaults[1])
+end
+
+--Team modes enabling (also called from withing options screen)
+function select.f_getTeamMenu()
+	local t = {}
+	--Single mode check
+	if config.SingleTeamMode == true then
+		table.insert(t, {data = textImgNew(), itemname = 'single', displayname = motif.select_info.teammenu_itemname_single})
+	end
+	if config.SimulMode then --Simul mode enabled
+		--Simul mode check
+		if config.NumSimul > 1 then
+			table.insert(t, {data = textImgNew(), itemname = 'simul', displayname = motif.select_info.teammenu_itemname_simul})
+		end
+		--Tag mode check
+		if config.NumTag > 1 then
+			table.insert(t, {data = textImgNew(), itemname = 'tag', displayname = motif.select_info.teammenu_itemname_tag})
+		end
+	elseif config.NumTag > 1 then --Legacy Tag mode enabled
+		table.insert(t, {data = textImgNew(), itemname = 'simul', displayname = motif.select_info.teammenu_itemname_tag})
+	end
+	--Turns mode check
+	if config.NumTurns > 1 then
+		table.insert(t, {data = textImgNew(), itemname = 'turns', displayname = motif.select_info.teammenu_itemname_turns})
+	end
+	return t
+end
+
+function select.f_overwriteCharData()
+	--for now only survival mode uses this function
+	if not gameMode('survival') and not gameMode('survivalcoop') and not gameMode('netplaysurvivalcoop') then
+		return
+	end
+	--and it's skipped at first match
+	if matchNo <= 1 then
+		return
+	end
+	local lastRound = #t_gameStats.chars
+	local removedNum = 0
+	local p1Count = 0
+	--Turns
+	if p1TeamMode == 2 then
+		local t_p1Keys = {}
+		--for each round in the last match
+		for round = 1, #t_gameStats.chars do
+			--remove character from team if he/she has been defeated
+			if not t_gameStats.chars[round][1].win or t_gameStats.chars[round][1].ko then
+				table.remove(t_p1Selected, t_gameStats.chars[round][1].memberNo + 1 - removedNum)
+				removedNum = removedNum + 1
+				p1NumChars = p1NumChars - 1
+			--otherwise overwrite character's next match life (done after all rounds have been checked)
+			else
+				t_p1Keys[t_gameStats.chars[round][1].memberNo] = t_gameStats.chars[round][1].life
+			end
+		end
+		for k, v in pairs(t_p1Keys) do
+			p1Count = p1Count + 1
+			overwriteCharData(p1Count, {['life'] = v})
 		end
+	--Single / Simul / Tag
+	else
+		--for each player data in the last round
+		for player = 1, #t_gameStats.chars[lastRound] do
+			--only check P1 side characters
+			if player % 2 ~= 0 and player <= (p1NumChars + removedNum) * 2 then --odd value, team size check just in case
+				--remove character from team if he/she has been defeated
+				if not t_gameStats.chars[lastRound][player].win or t_gameStats.chars[lastRound][player].ko then
+					table.remove(t_p1Selected, t_gameStats.chars[lastRound][player].memberNo + 1 - removedNum)
+					removedNum = removedNum + 1
+					p1NumChars = p1NumChars - 1
+				--otherwise overwrite character's next match life
+				else
+					if p1Count == 0 then
+						p1Count = 1
+					else
+						p1Count = p1Count + 2
+					end
+					overwriteCharData(p1Count, {['life'] = t_gameStats.chars[lastRound][player].life})
+				end
+			end
+		end
+	end
+	if removedNum > 0 then
+		setTeamMode(1, p1TeamMode, p1NumChars)
 	end
-	return t2[math.random(1, #t2)]
 end
 
 function select.f_drawName(t, data, font, offsetX, offsetY, scaleX, scaleY, spacingX, spacingY, active_font, active_row)
@@ -480,28 +680,15 @@ function select.f_drawName(t, data, font, offsetX, offsetY, scaleX, scaleY, spac
 				scaleY,
 				f[4],
 				f[5],
-				f[6]
+				f[6],
+				f[7],
+				f[8]
 			)
 			textImgDraw(data)
 		end
 	end
 end
 
-function select.f_drawPortrait(t, offsetX, offsetY, facing, scaleX, scaleY, spacingX, spacingY, limit, func)
-	if facing == -1 then offsetX = offsetX + 1 end --fix for wrong offset after flipping sprites
-	for i = #t, 1, -1 do
-		if i <= limit then
-			if func == 'select' then
-				drawPortrait(t[i].cel, offsetX + (i - 1) * spacingX, offsetY + (i - 1) * spacingY, facing * scaleX, scaleY)
-			elseif func == 'versus' then
-				drawVersusPortrait(t[i].cel, offsetX + (i - 1) * spacingX, offsetY + (i - 1) * spacingY, facing * scaleX, scaleY)
-			elseif func == 'victory' then
-				drawVictoryPortrait(t[i].cel, offsetX + (i - 1) * spacingX, offsetY + (i - 1) * spacingY, facing * scaleX, scaleY)
-			end
-		end
-	end
-end
-
 function select.f_cellMovement(selX, selY, cmd, faceOffset, rowOffset, snd)
 	local tmpX = selX
 	local tmpY = selY
@@ -525,8 +712,7 @@ function select.f_cellMovement(selX, selY, cmd, faceOffset, rowOffset, snd)
 				faceOffset = faceOffset - motif.select_info.columns
 				rowOffset = rowOffset - 1
 			end
-			if (t_grid[selY + 1][selX + 1].char ~= nil and t_grid[selY + 1][selX + 1].hidden ~= 2)
-			or motif.select_info.moveoveremptyboxes == 1 then
+			if (t_grid[selY + 1][selX + 1].char ~= nil and t_grid[selY + 1][selX + 1].hidden ~= 2) or motif.select_info.moveoveremptyboxes == 1 then
 				break
 			elseif motif.select_info.searchemptyboxesup ~= 0 then
 				found, selX = select.f_searchEmptyBoxes(motif.select_info.searchemptyboxesup, selX, selY)
@@ -552,8 +738,7 @@ function select.f_cellMovement(selX, selY, cmd, faceOffset, rowOffset, snd)
 				faceOffset = faceOffset + motif.select_info.columns
 				rowOffset = rowOffset + 1
 			end
-			if (t_grid[selY + 1][selX + 1].char ~= nil and t_grid[selY + 1][selX + 1].hidden ~= 2)
-			or motif.select_info.moveoveremptyboxes == 1 then
+			if (t_grid[selY + 1][selX + 1].char ~= nil and t_grid[selY + 1][selX + 1].hidden ~= 2) or motif.select_info.moveoveremptyboxes == 1 then
 				break
 			elseif motif.select_info.searchemptyboxesdown ~= 0 then
 				found, selX = select.f_searchEmptyBoxes(motif.select_info.searchemptyboxesdown, selX, selY)
@@ -572,8 +757,7 @@ function select.f_cellMovement(selX, selY, cmd, faceOffset, rowOffset, snd)
 					selX = tmpX
 				end
 			end
-			if (t_grid[selY + 1][selX + 1].char ~= nil and t_grid[selY + 1][selX + 1].hidden ~= 2)
-			or motif.select_info.moveoveremptyboxes == 1 then
+			if (t_grid[selY + 1][selX + 1].char ~= nil and t_grid[selY + 1][selX + 1].hidden ~= 2) or motif.select_info.moveoveremptyboxes == 1 then
 				break
 			end
 		end
@@ -587,8 +771,7 @@ function select.f_cellMovement(selX, selY, cmd, faceOffset, rowOffset, snd)
 					selX = tmpX
 				end
 			end
-			if (t_grid[selY + 1][selX + 1].char ~= nil and t_grid[selY + 1][selX + 1].hidden ~= 2)
-			or motif.select_info.moveoveremptyboxes == 1 then
+			if (t_grid[selY + 1][selX + 1].char ~= nil and t_grid[selY + 1][selX + 1].hidden ~= 2) or motif.select_info.moveoveremptyboxes == 1 then
 				break
 			end
 		end
@@ -650,27 +833,28 @@ function select.f_resetGrid()
 			
 			--1Pのランダムセル表示位置 / 1P random cell display position
 			if t_grid[row + p1RowOffset][col].char == 'randomselect' or t_grid[row + p1RowOffset][col].hidden == 3 then
-				select.t_drawFace[#select.t_drawFace + 1] = {d = 1, p1 = t_grid[row + p1RowOffset][col].num, p2 = t_grid[row + p2RowOffset][col].num, x1 = p1FaceX + t_grid[row][col].x, x2 = p2FaceX + t_grid[row][col].x, y1 = p1FaceY + t_grid[row][col].y, y2 = p2FaceY + t_grid[row][col].y}
+				table.insert(select.t_drawFace, {d = 1, p1 = t_grid[row + p1RowOffset][col].num, p2 = t_grid[row + p2RowOffset][col].num, x1 = p1FaceX + t_grid[row][col].x, x2 = p2FaceX + t_grid[row][col].x, y1 = p1FaceY + t_grid[row][col].y, y2 = p2FaceY + t_grid[row][col].y})
 			--1Pのキャラ表示位置 / 1P character display position
 			elseif t_grid[row + p1RowOffset][col].char ~= nil and t_grid[row + p1RowOffset][col].hidden == 0 then
-				select.t_drawFace[#select.t_drawFace + 1] = {d = 2, p1 = t_grid[row + p1RowOffset][col].num, p2 = t_grid[row + p2RowOffset][col].num, x1 = p1FaceX + t_grid[row][col].x, x2 = p2FaceX + t_grid[row][col].x, y1 = p1FaceY + t_grid[row][col].y, y2 = p2FaceY + t_grid[row][col].y}
+				table.insert(select.t_drawFace, {d = 2, p1 = t_grid[row + p1RowOffset][col].num, p2 = t_grid[row + p2RowOffset][col].num, x1 = p1FaceX + t_grid[row][col].x, x2 = p2FaceX + t_grid[row][col].x, y1 = p1FaceY + t_grid[row][col].y, y2 = p2FaceY + t_grid[row][col].y})
+			--Empty boxes display position
 			elseif motif.select_info.showemptyboxes == 1 then
-				select.t_drawFace[#select.t_drawFace + 1] = {d = 0, p1 = t_grid[row + p1RowOffset][col].num, p2 = t_grid[row + p2RowOffset][col].num, x1 = p1FaceX + t_grid[row][col].x, x2 = p2FaceX + t_grid[row][col].x, y1 = p1FaceY + t_grid[row][col].y, y2 = p2FaceY + t_grid[row][col].y}
+				table.insert(select.t_drawFace, {d = 0, p1 = t_grid[row + p1RowOffset][col].num, p2 = t_grid[row + p2RowOffset][col].num, x1 = p1FaceX + t_grid[row][col].x, x2 = p2FaceX + t_grid[row][col].x, y1 = p1FaceY + t_grid[row][col].y, y2 = p2FaceY + t_grid[row][col].y})
 			end
 			
 			--2Pのランダムセル表示位置 / 2P random cell display position
 			if t_grid[row + p2RowOffset][col].char == 'randomselect' or t_grid[row + p2RowOffset][col].hidden == 3 then
-				select.t_drawFace[#select.t_drawFace + 1] = {d = 11, p1 = t_grid[row + p1RowOffset][col].num, p2 = t_grid[row + p2RowOffset][col].num, x1 = p1FaceX + t_grid[row][col].x, x2 = p2FaceX + t_grid[row][col].x, y1 = p1FaceY + t_grid[row][col].y, y2 = p2FaceY + t_grid[row][col].y}		
+				table.insert(select.t_drawFace, {d = 11, p1 = t_grid[row + p1RowOffset][col].num, p2 = t_grid[row + p2RowOffset][col].num, x1 = p1FaceX + t_grid[row][col].x, x2 = p2FaceX + t_grid[row][col].x, y1 = p1FaceY + t_grid[row][col].y, y2 = p2FaceY + t_grid[row][col].y}		)
 			--2Pのキャラ表示位置 / 2P character display position
 			elseif t_grid[row + p2RowOffset][col].char ~= nil and t_grid[row + p2RowOffset][col].hidden == 0 then
-				select.t_drawFace[#select.t_drawFace + 1] = {d = 12, p1 = t_grid[row + p1RowOffset][col].num, p2 = t_grid[row + p2RowOffset][col].num, x1 = p1FaceX + t_grid[row][col].x, x2 = p2FaceX + t_grid[row][col].x, y1 = p1FaceY + t_grid[row][col].y, y2 = p2FaceY + t_grid[row][col].y}
-			-- Empty boxes display position
+				table.insert(select.t_drawFace, {d = 12, p1 = t_grid[row + p1RowOffset][col].num, p2 = t_grid[row + p2RowOffset][col].num, x1 = p1FaceX + t_grid[row][col].x, x2 = p2FaceX + t_grid[row][col].x, y1 = p1FaceY + t_grid[row][col].y, y2 = p2FaceY + t_grid[row][col].y})
+			--Empty boxes display position
 			elseif motif.select_info.showemptyboxes == 1 then
-				select.t_drawFace[#select.t_drawFace + 1] = {d = 10, p1 = t_grid[row + p1RowOffset][col].num, p2 = t_grid[row + p2RowOffset][col].num, x1 = p1FaceX + t_grid[row][col].x, x2 = p2FaceX + t_grid[row][col].x, y1 = p1FaceY + t_grid[row][col].y, y2 = p2FaceY + t_grid[row][col].y}
+				table.insert(select.t_drawFace, {d = 10, p1 = t_grid[row + p1RowOffset][col].num, p2 = t_grid[row + p2RowOffset][col].num, x1 = p1FaceX + t_grid[row][col].x, x2 = p2FaceX + t_grid[row][col].x, y1 = p1FaceY + t_grid[row][col].y, y2 = p2FaceY + t_grid[row][col].y})
 			end
 		end
 	end
-	main.f_printTable(select.t_drawFace, "debug/t_drawFace.txt")
+	main.f_printTable(select.t_drawFace, 'debug/t_drawFace.txt')
 end
 
 function select.f_selectReset()
@@ -686,7 +870,7 @@ function select.f_selectReset()
 		p2FaceY = motif.select_info.pos[2]
 	end
 	select.f_resetGrid()
-	if main.gameMode == 'netplayversus' or main.gameMode == 'netplayteamcoop' or main.gameMode == 'netplaysurvivalcoop' then
+	if gameMode('netplayversus') or gameMode('netplayteamcoop') or gameMode('netplaysurvivalcoop') then
 		p1TeamMode = 0
 		p2TeamMode = 0
 		stageNo = 0
@@ -714,14 +898,17 @@ function select.f_selectReset()
 	stageEnd = false
 	coopEnd = false
 	restoreTeam = false
+	continueStage = false
 	p1NumChars = 1
 	p2NumChars = 1
+	winner = 0
 	matchNo = 0
 	setMatchNo(matchNo)
+	resetRemapInput()
 end
 
 --;===========================================================
---; SIMPLE LOOP (VS MODE, TRAINING, WATCH, BONUS GAMES)
+--; SIMPLE LOOP (VS MODE, TEAM VERSUS, TRAINING, WATCH, BONUS GAMES)
 --;===========================================================
 function select.f_selectSimple()
 	p1SelX = motif.select_info.p1_cursor_startcell[2]
@@ -735,37 +922,44 @@ function select.f_selectSimple()
 	stageList = 0
 	main.f_cmdInput()
 	while true do
-		main.f_resetBG(motif.select_info, motif.selectbgdef, motif.music.select_bgm, motif.music.select_bgm_loop, motif.music.select_bgm_volume, motif.music.select_bgm_loopstart, motif.music.select_bgm_loopend)
+		main.f_menuReset(motif.selectbgdef.bg, motif.music.select_bgm, motif.music.select_bgm_loop, motif.music.select_bgm_volume, motif.music.select_bgm_loopstart, motif.music.select_bgm_loopend)
+		fadeType = 'fadein'
 		select.f_selectReset()
 		selectStart()
 		while not selScreenEnd do
 			if esc() then
 				sndPlay(motif.files.snd_data, motif.select_info.cancel_snd[1], motif.select_info.cancel_snd[2])
-				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+				main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+				resetRemapInput()
 				return
 			end
 			select.f_selectScreen()
 		end
-		select.f_aiLevel()
-		if not main.stageMenu then
-			select.f_selectStage()
-		end
+		--fight initialization
+		select.f_remapAI()
+		select.f_setRounds()
+		stageNo = select.f_setStage(stageNo)
 		select.f_selectVersus()
 		if esc() then break end
-		select.f_setZoom()
-		select.f_assignMusic()
 		loadStart()
 		winner, t_gameStats = game()
+		main.f_printTable(t_gameStats, 'debug/t_gameStats.txt')
+		--victory screen
+		if motif.victory_screen.vs_enabled == 1 and winner >= 1 and (gameMode('versus') or gameMode('netplayversus')) then
+			select.f_selectVictory()
+		end
+		if challenger then
+			break
+		end
 		main.f_cmdInput()
 		refresh()
 	end
 end
 
 --;===========================================================
---; ADVANCE LOOP (ARCADE, TEAM CO-OP, SURVIVAL, SURVIVAL CO-OP, VS 100 KUMITE, BOSS RUSH)
+--; ARRANGED LOOP (SURVIVAL, SURVIVAL CO-OP, VS 100 KUMITE, BOSS RUSH)
 --;===========================================================
-function select.f_selectAdvance()
-getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
+function select.f_selectArranged()
 	p1SelX = motif.select_info.p1_cursor_startcell[2]
 	p1SelY = motif.select_info.p1_cursor_startcell[1]
 	p2SelX = motif.select_info.p2_cursor_startcell[2]
@@ -774,21 +968,21 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 	p2FaceOffset = 0
 	p1RowOffset = 0
 	p2RowOffset = 0
-	winner = 0
 	winCnt = 0
 	looseCnt = 0
+	stageList = 0
 	main.f_cmdInput()
 	select.f_selectReset()
-	t_p2Selected = {}
-	stageEnd = true
 	local t_enemySelected = {}
 	while true do
-		main.f_resetBG(motif.select_info, motif.selectbgdef, motif.music.select_bgm, motif.music.select_bgm_loop, motif.music.select_bgm_volume, motif.music.select_bgm_loopstart, motif.music.select_bgm_loopend)
+		main.f_menuReset(motif.selectbgdef.bg, motif.music.select_bgm, motif.music.select_bgm_loop, motif.music.select_bgm_volume, motif.music.select_bgm_loopstart, motif.music.select_bgm_loopend)
+		fadeType = 'fadein'
 		selectStart()
 		while not selScreenEnd do
 			if esc() then
 				sndPlay(motif.files.snd_data, motif.select_info.cancel_snd[1], motif.select_info.cancel_snd[2])
-				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+				main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+				resetRemapInput()
 				return
 			end
 			select.f_selectScreen()
@@ -805,23 +999,27 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 			end
 			--generate roster
 			select.f_makeRoster()
-			lastMatch = #t_roster / p2NumChars
-			matchNo = 1
-			--generate AI ramping table
-			select.f_aiRamp()
-			--intro
-			if main.gameMode == 'arcade' or main.gameMode == 'teamcoop' or main.gameMode == 'netplayteamcoop' then
-				local tPos = main.t_selChars[t_p1Selected[1].cel + 1]
-				if tPos.intro ~= nil and main.f_fileExists(tPos.intro) then
-					storyboard.f_storyboard(tPos.intro)
+			--sum all upcoming matches and set starting order group
+			currentOrder = 0
+			currentRosterIndex = 1
+			lastMatch = 0
+			for i = 1, #t_roster do
+				if #t_roster[i] > 0 then
+					if currentOrder == 0 then
+						currentOrder = i
+					end
+					lastMatch = lastMatch + #t_roster[i] / p2NumChars
 				end
 			end
+			matchNo = 1
+			--generate AI ramping table
+			select.f_aiRamp(1)
 		--player exit the match via ESC in VS 100 Kumite mode
-		elseif winner == -1 and main.gameMode == '100kumite' then
+		elseif winner == -1 and gameMode('100kumite') then
 			--counter
 			looseCnt = looseCnt + 1
 			--result
-			select.f_result('lost')
+			select.f_result()
 			--game over
 			if motif.game_over_screen.enabled == 1 and motif.game_over_screen.storyboard ~= '' then
 				storyboard.f_storyboard(motif.game_over_screen.storyboard)
@@ -830,36 +1028,48 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 			if motif.files.intro_storyboard ~= '' then
 				storyboard.f_storyboard(motif.files.intro_storyboard)
 			end
-			main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+			main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+			resetRemapInput()
 			return
-		--player won (also if lost in VS 100 Kumite)
-		elseif winner == 1 or main.gameMode == '100kumite' then
+		--player won
+		elseif winner == 1 then
 			--counter
-			if winner == 1 then
-				winCnt = winCnt + 1
-			else --only true in VS 100 Kumite mode
-				looseCnt = looseCnt + 1
-			end
-			--victory screen
-			if main.gameMode == 'arcade' or main.gameMode == 'teamcoop' or main.gameMode == 'netplayteamcoop' then
-				if motif.victory_screen.enabled == 1 and (main.t_selChars[t_p2Selected[1].cel + 1].winscreen == nil or main.t_selChars[t_p2Selected[1].cel + 1].winscreen == 1) then
-					select.f_selectVictory()
+			winCnt = winCnt + 1
+			--last match in the current order group
+			if currentRosterIndex == #t_roster[currentOrder] / p2NumChars then
+				if (gameMode('survival') or gameMode('survivalcoop') or gameMode('netplaysurvivalcoop')) and main.t_selOptions.survivalmaxmatches[currentOrder] == -1 then --survival mode infinite fights
+					--randomly rearrange array entries positions of the current order group
+					main.f_shuffleTable(t_roster[currentOrder])
+					--ensure that the next fight won't be against team members we've just fought
+					local t_lastRefs = {}
+					for i = 1, #t_p2Selected do
+						t_lastRefs[t_p2Selected[i].cel] = '' --store last enemy team refs as keys
+					end
+					for i = 1, #t_p2Selected do
+						if t_lastRefs[t_roster[currentOrder][i]] ~= nil then
+							table.remove(t_roster[currentOrder], i) --remove char ref from the given position of an array
+							table.insert(t_roster[currentOrder], t_p2Selected[i].cel) --and inserts it in the last position of the array
+						end
+					end
+					--update variables
+					local lastMatchRamp = lastMatch + 1
+					lastMatch = lastMatch + #t_roster[currentOrder] / p2NumChars --with this value the mode should go infinitely
+					--append new entries to existing AI ramping table
+					select.f_aiRamp(lastMatchRamp)
+				else --survival mode finite fights or other modes
+					for i = currentOrder + 1, #t_roster do --find next order group with assigned characters
+						if #t_roster[i] > 0 then
+							currentOrder = i
+							break
+						end
+					end
 				end
+				currentRosterIndex = 0
 			end
-			t_p2Selected = {}
 			--no more matches left
 			if matchNo == lastMatch then
-				--ending
-				if main.gameMode == 'arcade' or main.gameMode == 'teamcoop' or main.gameMode == 'netplayteamcoop' then
-					local tPos = main.t_selChars[t_p1Selected[1].cel + 1]
-					if tPos.ending ~= nil and main.f_fileExists(tPos.ending) then
-						storyboard.f_storyboard(tPos.ending)
-					elseif motif.default_ending.enabled == 1 and motif.default_ending.storyboard ~= '' then
-						storyboard.f_storyboard(motif.default_ending.storyboard)
-					end
-				end
 				--result
-				select.f_result(true)
+				select.f_result()
 				--credits
 				if motif.end_credits.enabled == 1 and motif.end_credits.storyboard ~= '' then
 					storyboard.f_storyboard(motif.end_credits.storyboard)
@@ -872,24 +1082,21 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 				if motif.files.intro_storyboard ~= '' then
 					storyboard.f_storyboard(motif.files.intro_storyboard)
 				end
-				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+				main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+				resetRemapInput()
 				return
 			--next match available
 			else
 				matchNo = matchNo + 1
+				currentRosterIndex = currentRosterIndex + 1
+				t_p2Selected = {}
 			end
-		--player lost and doesn't have any credits left
-		elseif main.credits == 0 then
+		--player lost
+		else
 			--counter
 			looseCnt = looseCnt + 1
-			--victory screen
-			if main.gameMode == 'arcade' or main.gameMode == 'teamcoop' or main.gameMode == 'netplayteamcoop' then
-				if motif.victory_screen.enabled == 1 and winner >= 1 and (main.t_selChars[t_p2Selected[1].cel + 1].winscreen == nil or main.t_selChars[t_p2Selected[1].cel + 1].winscreen == 1) then
-					select.f_selectVictory()
-				end
-			end
 			--result
-			select.f_result(false)
+			select.f_result()
 			--game over
 			if motif.game_over_screen.enabled == 1 and motif.game_over_screen.storyboard ~= '' then
 				storyboard.f_storyboard(motif.game_over_screen.storyboard)
@@ -898,58 +1105,12 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 			if motif.files.intro_storyboard ~= '' then
 				storyboard.f_storyboard(motif.files.intro_storyboard)
 			end
-			main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+			main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+			resetRemapInput()
 			return
-		--player lost but can continue
-		else
-			--counter
-			looseCnt = looseCnt + 1
-			--victory screen
-			if motif.victory_screen.enabled == 1 and winner >= 1 and (main.t_selChars[t_p2Selected[1].cel + 1].winscreen == nil or main.t_selChars[t_p2Selected[1].cel + 1].winscreen == 1) then
-				select.f_selectVictory()
-			end
-			--continue screen
-			select.f_continue()
-			if not continue then
-				--game over
-				if motif.continue_screen.external_gameover == 1 and motif.game_over_screen.storyboard ~= '' then
-					storyboard.f_storyboard(motif.game_over_screen.storyboard)
-				end
-				--intro
-				if motif.files.intro_storyboard ~= '' then
-					storyboard.f_storyboard(motif.files.intro_storyboard)
-				end
-				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
-				return
-			end
-			if config.ContSelection then --true if 'Char change at Continue' option is enabled
-				t_p1Selected = {}
-				p1SelEnd = false
-				if main.coop then
-					p1NumChars = 1
-					numChars = p2NumChars
-					p2NumChars = 1
-					t_p2Selected = {}
-					p2SelEnd = false
-				end
-				selScreenEnd = false
-				while not selScreenEnd do
-					if esc() then
-						sndPlay(motif.files.snd_data, motif.select_info.cancel_snd[1], motif.select_info.cancel_snd[2])
-						main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
-						return
-					end
-					select.f_selectScreen()
-				end
-			elseif esc() then
-				sndPlay(motif.files.snd_data, motif.select_info.cancel_snd[1], motif.select_info.cancel_snd[2])
-				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
-				return
-			end
 		end
 		--coop swap
 		if main.coop then
-			remapInput(3,2) --P2 controls assigned to P3 character
 			if winner == -1 or winner == 2 then
 				p1NumChars = 2
 				p2NumChars = numChars
@@ -962,53 +1123,333 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 		if #t_p2Selected == 0 then
 			local shuffle = true
 			for i = 1, p2NumChars do
-				if i == 1 and (main.gameMode == 'arcade' or main.gameMode == 'teamcoop' or main.gameMode == 'netplayteamcoop') and main.t_selChars[t_p1Selected[1].cel + 1][matchNo] ~= nil then
-					p2Cell = main.t_charDef[main.t_selChars[t_p1Selected[1].cel + 1][matchNo]]
-					shuffle = false
-				else
-					p2Cell = t_roster[matchNo * p2NumChars - i + 1]
-				end
-				local updateAnim = true
-				for j = 1, #t_p2Selected do
-					if t_p2Selected[j].cel == p2Cell then
-						updateAnim = false
-					end
-				end
-				t_p2Selected[#t_p2Selected + 1] = {cel = p2Cell, pal = select.f_randomPal(p2Cell), up = updateAnim}
+				p2Cell = t_roster[currentOrder][currentRosterIndex * p2NumChars - i + 1]
+				table.insert(t_p2Selected, {cel = p2Cell, pal = select.f_selectPal(p2Cell)})
 				if shuffle then
 					main.f_shuffleTable(t_p2Selected)
 				end
 			end
 			t_enemySelected = t_p2Selected
 		end
-		--Team conversion to Single match if bonus paramvalue on any opponents is detected
-		if p2NumChars > 1 then
-			for i = 1, #t_p2Selected do
-				if main.t_selChars[t_p2Selected[i].cel + 1].bonus ~= nil and main.t_selChars[t_p2Selected[i].cel + 1].bonus == 1 then
-					teamMode = p2TeamMode
-					numChars = p2NumChars
-					p2TeamMode = 0
-					p2NumChars = 1
-					setTeamMode(2, 0, 1)
-					p2Cell = main.t_charDef[main.t_selChars[t_p2Selected[i].cel + 1].char]
+		--fight initialization
+		setMatchNo(matchNo)
+		select.f_overwriteCharData()
+		select.f_remapAI()
+		select.f_setRounds()
+		stageNo = select.f_setStage(stageNo)
+		select.f_selectVersus()
+		--if esc() then break end
+		loadStart()
+		winner, t_gameStats = game()
+		main.f_printTable(t_gameStats, 'debug/t_gameStats.txt')
+		resetRemapInput()
+		main.f_cmdInput()
+		refresh()
+	end
+end
+
+--;===========================================================
+--; ARCADE LOOP (ARCADE, TEAM ARCADE, TEAM CO-OP)
+--;===========================================================
+function select.f_selectArcade()
+	p1SelX = motif.select_info.p1_cursor_startcell[2]
+	p1SelY = motif.select_info.p1_cursor_startcell[1]
+	p2SelX = motif.select_info.p2_cursor_startcell[2]
+	p2SelY = motif.select_info.p2_cursor_startcell[1]
+	p1FaceOffset = 0
+	p2FaceOffset = 0
+	p1RowOffset = 0
+	p2RowOffset = 0
+	winCnt = 0
+	looseCnt = 0
+	main.f_cmdInput()
+	select.f_selectReset()
+	stageEnd = true
+	local t_enemySelected = {}
+	while true do
+		main.f_menuReset(motif.selectbgdef.bg, motif.music.select_bgm, motif.music.select_bgm_loop, motif.music.select_bgm_volume, motif.music.select_bgm_loopstart, motif.music.select_bgm_loopend)
+		fadeType = 'fadein'
+		selectStart()
+		while not selScreenEnd do
+			if esc() then
+				sndPlay(motif.files.snd_data, motif.select_info.cancel_snd[1], motif.select_info.cancel_snd[2])
+				main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+				resetRemapInput()
+				return
+			end
+			select.f_selectScreen()
+		end
+		--if last match was not against a challenger
+		if not challenger then
+			--first match
+			if matchNo == 0 then
+				--coop swap
+				if main.coop then
+					p1TeamMode = 1
+					p1NumChars = 2
+					setTeamMode(1, p1TeamMode, p1NumChars)
+					t_p1Selected[2] = {cel = t_p2Selected[1].cel, pal = t_p2Selected[1].pal}
+					t_p2Selected = t_enemySelected
+				end
+				--generate roster
+				select.f_makeRoster()
+				--sum all upcoming matches and set starting order group
+				currentOrder = 0
+				currentRosterIndex = 1
+				lastMatch = 0
+				for i = 1, #t_roster do
+					if #t_roster[i] > 0 then
+						if currentOrder == 0 then
+							currentOrder = i
+						end
+						lastMatch = lastMatch + #t_roster[i] / p2NumChars
+					end
+				end
+				matchNo = 1
+				--generate AI ramping table
+				select.f_aiRamp(1)
+				--intro
+				local tPos = main.t_selChars[t_p1Selected[1].cel + 1]
+				if tPos.intro ~= nil and main.f_fileExists(tPos.intro) then
+					storyboard.f_storyboard(tPos.intro)
+				end
+			--player won
+			elseif winner == 1 then
+				--counter
+				winCnt = winCnt + 1
+				--last match in the current order group
+				if currentRosterIndex == #t_roster[currentOrder] / p2NumChars then
+					for i = currentOrder + 1, #t_roster do --find next order group with assigned characters
+						if #t_roster[i] > 0 then
+							currentOrder = i
+							break
+						end
+					end
+					currentRosterIndex = 0
+				end
+				--victory screen
+				if motif.victory_screen.enabled == 1 then
+					select.f_selectVictory()
+				end
+				--no more matches left
+				if matchNo == lastMatch then
+					--ending
+					local tPos = main.t_selChars[t_p1Selected[1].cel + 1]
+					if tPos.ending ~= nil and main.f_fileExists(tPos.ending) then
+						storyboard.f_storyboard(tPos.ending)
+					elseif motif.default_ending.enabled == 1 and motif.default_ending.storyboard ~= '' then
+						storyboard.f_storyboard(motif.default_ending.storyboard)
+					end
+					--credits
+					if motif.end_credits.enabled == 1 and motif.end_credits.storyboard ~= '' then
+						storyboard.f_storyboard(motif.end_credits.storyboard)
+					end
+					--game over
+					if motif.game_over_screen.enabled == 1 and motif.game_over_screen.storyboard ~= '' then
+						storyboard.f_storyboard(motif.game_over_screen.storyboard)
+					end
+					--intro
+					if motif.files.intro_storyboard ~= '' then
+						storyboard.f_storyboard(motif.files.intro_storyboard)
+					end
+					main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+					resetRemapInput()
+					return
+				--next match available
+				else
+					matchNo = matchNo + 1
+					currentRosterIndex = currentRosterIndex + 1
+					continueStage = false
 					t_p2Selected = {}
-					t_p2Selected[1] = {cel = p2Cell, pal = select.f_randomPal(p2Cell), up = true}
-					restoreTeam = true
-					break
+				end
+			--player lost and doesn't have any credits left
+			elseif main.credits == 0 then
+				--counter
+				looseCnt = looseCnt + 1
+				--victory screen
+				if motif.victory_screen.cpu_enabled == 1 and winner >= 2 then
+					select.f_selectVictory()
+				end
+				--game over
+				if motif.game_over_screen.enabled == 1 and motif.game_over_screen.storyboard ~= '' then
+					storyboard.f_storyboard(motif.game_over_screen.storyboard)
+				end
+				--intro
+				if motif.files.intro_storyboard ~= '' then
+					storyboard.f_storyboard(motif.files.intro_storyboard)
+				end
+				main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+				resetRemapInput()
+				return
+			--player lost but can continue
+			else
+				--counter
+				looseCnt = looseCnt + 1
+				--victory screen
+				if motif.victory_screen.cpu_enabled == 1 and winner >= 2 then
+					select.f_selectVictory()
+				end
+				--continue screen
+				select.f_continue()
+				if not continue then
+					--game over
+					if motif.continue_screen.external_gameover == 1 and motif.game_over_screen.storyboard ~= '' then
+						storyboard.f_storyboard(motif.game_over_screen.storyboard)
+					end
+					--intro
+					if motif.files.intro_storyboard ~= '' then
+						storyboard.f_storyboard(motif.files.intro_storyboard)
+					end
+					main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+					resetRemapInput()
+					return
+				end
+				if config.ContSelection then --true if 'Char change at Continue' option is enabled
+					t_p1Selected = {}
+					p1SelEnd = false
+					if main.coop then
+						p1NumChars = 1
+						numChars = p2NumChars
+						p2NumChars = 1
+						t_p2Selected = {}
+						p2SelEnd = false
+					end
+					fadeType = 'fadein'
+					--selectStart()
+					selScreenEnd = false
+					while not selScreenEnd do
+						if esc() then
+							sndPlay(motif.files.snd_data, motif.select_info.cancel_snd[1], motif.select_info.cancel_snd[2])
+							main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+							resetRemapInput()
+							return
+						end
+						select.f_selectScreen()
+					end
+				elseif esc() then
+					sndPlay(motif.files.snd_data, motif.select_info.cancel_snd[1], motif.select_info.cancel_snd[2])
+					main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+					resetRemapInput()
+					return
+				end
+				continueStage = true
+			end
+			--coop swap
+			if main.coop then
+				if winner == -1 or winner == 2 then
+					p1NumChars = 2
+					p2NumChars = numChars
+					t_p1Selected[2] = {cel = t_p2Selected[1].cel, pal = t_p2Selected[1].pal}
+					t_p2Selected = t_enemySelected
+				end
+			end
+			--assign enemy team
+			--t_p2Selected = {}
+			if #t_p2Selected == 0 then
+				local shuffle = true
+				for i = 1, p2NumChars do
+					if i == 1 and select.f_rivalsMatch('char_ref') then --enemy assigned as rivals param
+						p2Cell = main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo].char_ref
+						shuffle = false
+					else
+						p2Cell = t_roster[currentOrder][currentRosterIndex * p2NumChars - i + 1]
+					end
+					table.insert(t_p2Selected, {cel = p2Cell, pal = select.f_selectPal(p2Cell)})
+					if shuffle then
+						main.f_shuffleTable(t_p2Selected)
+					end
+				end
+				t_enemySelected = t_p2Selected
+			end
+			--Team conversion to Single match if onlyme paramvalue on any opponents is detected
+			if p2NumChars > 1 then
+				for i = 1, #t_p2Selected do
+					local onlyme = false
+					if select.f_rivalsMatch('char_ref') and main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo].onlyme == 1 then --team conversion assigned as rivals param
+						p2Cell = main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo].char_ref
+						onlyme = true
+					elseif main.t_selChars[t_p2Selected[i].cel + 1].onlyme == 1 then --team conversion assigned as character param
+						p2Cell = main.t_selChars[t_p2Selected[i].cel + 1].char_ref
+						onlyme = true
+					end
+					if onlyme then
+						teamMode = p2TeamMode
+						numChars = p2NumChars
+						p2TeamMode = 0
+						p2NumChars = 1
+						setTeamMode(2, p2TeamMode, p2NumChars)
+						t_p2Selected = {}
+						t_p2Selected[1] = {cel = p2Cell, pal = select.f_selectPal(p2Cell), up = true}
+						restoreTeam = true
+						break
+					end
 				end
 			end
 		end
+		--fight initialization
 		setMatchNo(matchNo)
-		select.f_aiLevel()
-		if not main.stageMenu then
-			select.f_selectStage()
-		end
+		select.f_remapAI()
+		select.f_setRounds()
+		stageNo = select.f_setStage(stageNo)
 		select.f_selectVersus()
 		if esc() then break end
-		select.f_setZoom()
-		select.f_assignMusic()
 		loadStart()
 		winner, t_gameStats = game()
+		main.f_printTable(t_gameStats, 'debug/t_gameStats.txt')
+		--here comes a new challenger
+		challenger = false
+		if t_gameStats.challenger > 0 then
+			refresh() --needed to clean inputs
+			challenger = true
+			--save values
+			local p2TeamMenu_sav = main.f_copyTable(main.p2TeamMenu)
+			local t_p2Selected_sav = main.f_copyTable(t_p2Selected)
+			local t_charparam_sav = main.f_copyTable(main.t_charparam)
+			local p1Cell_sav = p1Cell
+			local p2Cell_sav = p2Cell
+			local matchNo_sav = matchNo
+			local stageNo_sav = stageNo
+			local p2TeamMode_sav = p2TeamMode
+			local p2NumChars_sav = p2NumChars
+			local gameMode = gameMode()
+			main.f_resetCharparam()
+			--temp values
+			textImgSetText(main.txt_mainSelect, motif.select_info.title_text_teamversus)
+			setHomeTeam(1)
+			main.p2In = 2
+			main.p2SelectMenu = true
+			main.stageMenu = true
+			main.p2Faces = true
+			main.p1TeamMenu = nil
+			main.p2TeamMenu = nil
+			setGameMode('teamversus')
+			--start challenger match
+			select.f_selectSimple()
+			--reload values
+			textImgSetText(main.txt_mainSelect, motif.select_info.title_text_arcade)
+			setHomeTeam(2)
+			main.p2In = 1
+			main.p2SelectMenu = false
+			main.stageMenu = false
+			main.p2Faces = false
+			--move player2 characters into player1 side and remap buttons if needed
+			if winner == 2 then
+				--TODO: when player1 team loose continue playing the arcade mode as player2 team
+			end
+			--restore values
+			main.p2TeamMenu = main.f_copyTable(p2TeamMenu_sav)
+			t_p2Selected = main.f_copyTable(t_p2Selected_sav)
+			main.t_charparam = main.f_copyTable(t_charparam_sav)
+			p1Cell = p1Cell_sav
+			p2Cell = p2Cell_sav
+			matchNo = matchNo_sav
+			stageNo = stageNo_sav
+			p2TeamMode = p2TeamMode_sav
+			p2NumChars = p2NumChars_sav
+			setTeamMode(2, p2TeamMode, p2NumChars)
+			setGameMode(gameMode)
+			continueStage = true
+		end
 		--restore P2 Team settings if needed
 		if restoreTeam then
 			p2TeamMode = teamMode
@@ -1018,7 +1459,6 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 		end
 		resetRemapInput()
 		main.f_cmdInput()
-		--main.f_printTable(_G)
 		refresh()
 	end
 end
@@ -1026,7 +1466,7 @@ end
 --;===========================================================
 --; TOURNAMENT LOOP
 --;===========================================================
-function select.f_selectTournament()
+function select.f_selectTournament(size)
 	p1SelX = motif.select_info.p1_cursor_startcell[2]
 	p1SelY = motif.select_info.p1_cursor_startcell[1]
 	p2SelX = motif.select_info.p2_cursor_startcell[2]
@@ -1038,20 +1478,23 @@ function select.f_selectTournament()
 	stageList = 0
 	main.f_cmdInput()
 	while true do
-		main.f_resetBG(motif.tournament_info, motif.tournamentbgdef, motif.music.tournament_bgm, motif.music.tournament_bgm_loop, motif.music.tournament_bgm_volume, motif.music.tournament_bgm_loopstart, motif.music.tournament_bgm_loopend)
+		main.f_menuReset(motif.tournamentbgdef.bg, motif.music.tournament_bgm, motif.music.tournament_bgm_loop, motif.music.tournament_bgm_volume, motif.music.tournament_bgm_loopstart, motif.music.tournament_bgm_loopend)
+		fadeType = 'fadein'
 		select.f_selectReset()
 		while not selScreenEnd do
 			if esc() then
 				sndPlay(motif.files.snd_data, motif.select_info.cancel_snd[1], motif.select_info.cancel_snd[2])
-				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+				main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+				resetRemapInput()
 				return
 			end
-			select.f_selectTournamentScreen()
+			select.f_selectTournamentScreen(size)
 		end
-		select.f_aiLevel()
+		--fight initialization
+		select.f_remapAI()
+		select.f_setRounds()
+		stageNo = select.f_setStage(stageNo)
 		select.f_selectVersus()
-		select.f_setZoom()
-		select.f_assignMusic()
 		loadStart()
 		winner, t_gameStats = game()
 		main.f_cmdInput()
@@ -1062,21 +1505,32 @@ end
 --;===========================================================
 --; TOURNAMENT SCREEN
 --;===========================================================
-function select.f_selectTournamentScreen()
+function select.f_selectTournamentScreen(size)
 	--draw clearcolor
-	animDraw(motif.tournamentbgdef.bgclearcolor_data)
+	clearColor(motif.tournamentbgdef.bgclearcolor[1], motif.tournamentbgdef.bgclearcolor[2], motif.tournamentbgdef.bgclearcolor[3])
 	--draw layerno = 0 backgrounds
-	main.f_drawBG(motif.tournamentbgdef.bg_data, motif.tournamentbgdef.bg, 0, motif.tournamentbgdef.timer, {320,240})
+	bgDraw(motif.tournamentbgdef.bg, false)
 	
 	--draw layerno = 1 backgrounds
-	main.f_drawBG(motif.tournamentbgdef.bg_data, motif.tournamentbgdef.bg, 1, motif.tournamentbgdef.timer, {320,240})
-	--draw fadein
-	animDraw(motif.tournament_info.fadein_data)
-	animUpdate(motif.tournament_info.fadein_data)
-	--update timer
-	motif.tournamentbgdef.timer = motif.tournamentbgdef.timer + 1
-	--end loop
-	main.f_cmdInput()
+	bgDraw(motif.tournamentbgdef.bg, true)
+	--draw fadein / fadeout
+	main.fadeActive = fadeScreen(
+		fadeType,
+		main.fadeStart,
+		motif.vs_screen[fadeType .. '_time'],
+		motif.vs_screen[fadeType .. '_col'][1],
+		motif.vs_screen[fadeType .. '_col'][2],
+		motif.vs_screen[fadeType .. '_col'][3]
+	)
+	--frame transition
+	if main.fadeActive then
+		commandBufReset(main.p1Cmd)
+	elseif fadeType == 'fadeout' then
+		commandBufReset(main.p1Cmd)
+		return --skip last frame rendering
+	else
+		main.f_cmdInput()
+	end
 	refresh()
 end
 
@@ -1094,34 +1548,44 @@ local txt_p1Name = main.f_createTextImg(
 	motif.select_info.p1_name_font_scale[2],
 	motif.select_info.p1_name_font[4],
 	motif.select_info.p1_name_font[5],
-	motif.select_info.p1_name_font[6]
+	motif.select_info.p1_name_font[6],
+	motif.select_info.p1_name_font[7],
+	motif.select_info.p1_name_font[8]
 )
-
 local p1RandomCount = 0
 local p1RandomPortrait = 0
 if #main.t_randomChars > 0 then p1RandomPortrait = main.t_randomChars[math.random(1, #main.t_randomChars)] end
 local txt_p2Name = main.f_createTextImg(
-	motif.font_data[motif.select_info.p2_name_font[1]], 
-	motif.select_info.p2_name_font[2], 
-	motif.select_info.p2_name_font[3], 
-	'', 
-	0, 
-	0, 
+	motif.font_data[motif.select_info.p2_name_font[1]],
+	motif.select_info.p2_name_font[2],
+	motif.select_info.p2_name_font[3],
+	'',
+	0,
+	0,
 	motif.select_info.p2_name_font_scale[1],
 	motif.select_info.p2_name_font_scale[2],
 	motif.select_info.p2_name_font[4],
 	motif.select_info.p2_name_font[5],
-	motif.select_info.p2_name_font[6]
+	motif.select_info.p2_name_font[6],
+	motif.select_info.p2_name_font[7],
+	motif.select_info.p2_name_font[8]
 )
 local p2RandomCount = 0
 local p2RandomPortrait = 0
 if #main.t_randomChars > 0 then p2RandomPortrait = main.t_randomChars[math.random(1, #main.t_randomChars)] end
 
+function select.f_alignOffset(align)
+	if align == -1 then
+		return 1 --fix for wrong offset after flipping sprites
+	end
+	return 0
+end
+
 function select.f_selectScreen()
 	--draw clearcolor
-	animDraw(motif.selectbgdef.bgclearcolor_data)
+	clearColor(motif.selectbgdef.bgclearcolor[1], motif.selectbgdef.bgclearcolor[2], motif.selectbgdef.bgclearcolor[3])
 	--draw layerno = 0 backgrounds
-	main.f_drawBG(motif.selectbgdef.bg_data, motif.selectbgdef.bg, 0, motif.selectbgdef.timer, {320,240})
+	bgDraw(motif.selectbgdef.bg, false)
 	--draw title
 	textImgDraw(main.txt_mainSelect)
 	if p1Cell then
@@ -1136,28 +1600,26 @@ function select.f_selectScreen()
 					p1RandomCount = 0
 				end
 				sndPlay(motif.files.snd_data, motif.select_info.p1_random_move_snd[1], motif.select_info.p1_random_move_snd[2])
-				t_portrait[1] = {cel = p1RandomPortrait}
+				t_portrait[1] = p1RandomPortrait
 			elseif main.t_selChars[p1Cell + 1].hidden ~= 2 then
-				t_portrait[1] = {cel = p1Cell}
+				t_portrait[1] = p1Cell
 			end
 		end
 		for i = #t_p1Selected, 1, -1 do
-			if motif.select_info.p1_face_num > #t_portrait then
-				t_portrait[#t_portrait + 1] = {cel = t_p1Selected[i].cel}
-			end
-		end
-		select.f_drawPortrait(
-			main.f_reversedTable(t_portrait),
-			motif.select_info.p1_face_offset[1],
-			motif.select_info.p1_face_offset[2],
-			motif.select_info.p1_face_facing,
-			motif.select_info.p1_face_scale[1],
-			motif.select_info.p1_face_scale[2],
-			motif.select_info.p1_face_spacing[1],
-			motif.select_info.p1_face_spacing[2],
-			#t_portrait,
-			'select'
-		)
+			if #t_portrait < motif.select_info.p1_face_num then
+				table.insert(t_portrait, t_p1Selected[i].cel)
+			end
+		end
+		t_portrait = main.f_reversedTable(t_portrait)
+		for n = #t_portrait, 1, -1 do
+			drawPortrait(
+				t_portrait[n],
+				motif.select_info.p1_face_offset[1] + motif.select_info['p1_c' .. n .. '_face_offset'][1] + (n - 1) * motif.select_info.p1_face_spacing[1] + select.f_alignOffset(motif.select_info.p1_face_facing),
+				motif.select_info.p1_face_offset[2] + motif.select_info['p1_c' .. n .. '_face_offset'][2] + (n - 1) * motif.select_info.p1_face_spacing[2],
+				motif.select_info.p1_face_facing * motif.select_info.p1_face_scale[1] * motif.select_info['p1_c' .. n .. '_face_scale'][1],
+				motif.select_info.p1_face_scale[2] * motif.select_info['p1_c' .. n .. '_face_scale'][2]
+			)
+		end
 	end
 	if p2Cell then
 		--draw p2 portrait
@@ -1171,28 +1633,26 @@ function select.f_selectScreen()
 					p2RandomCount = 0
 				end
 				sndPlay(motif.files.snd_data, motif.select_info.p2_random_move_snd[1], motif.select_info.p2_random_move_snd[2])
-				t_portrait[1] = {cel = p2RandomPortrait}
+				t_portrait[1] = p2RandomPortrait
 			elseif main.t_selChars[p2Cell + 1].hidden ~= 2 then
-				t_portrait[1] = {cel = p2Cell}
+				t_portrait[1] = p2Cell
 			end
 		end
 		for i = #t_p2Selected, 1, -1 do
-			if motif.select_info.p2_face_num > #t_portrait then
-				t_portrait[#t_portrait + 1] = {cel = t_p2Selected[i].cel}
-			end
-		end
-		select.f_drawPortrait(
-			main.f_reversedTable(t_portrait),
-			motif.select_info.p2_face_offset[1],
-			motif.select_info.p2_face_offset[2],
-			motif.select_info.p2_face_facing,
-			motif.select_info.p2_face_scale[1],
-			motif.select_info.p2_face_scale[2],
-			motif.select_info.p2_face_spacing[1],
-			motif.select_info.p2_face_spacing[2],
-			#t_portrait,
-			'select'
-		)
+			if #t_portrait < motif.select_info.p2_face_num then
+				table.insert(t_portrait, t_p2Selected[i].cel)
+			end
+		end
+		t_portrait = main.f_reversedTable(t_portrait)
+		for n = #t_portrait, 1, -1 do
+			drawPortrait(
+				t_portrait[n],
+				motif.select_info.p2_face_offset[1] + motif.select_info['p2_c' .. n .. '_face_offset'][1] + (n - 1) * motif.select_info.p2_face_spacing[1] + select.f_alignOffset(motif.select_info.p2_face_facing),
+				motif.select_info.p2_face_offset[2] + motif.select_info['p2_c' .. n .. '_face_offset'][2] + (n - 1) * motif.select_info.p2_face_spacing[2],
+				motif.select_info.p2_face_facing * motif.select_info.p2_face_scale[1] * motif.select_info['p2_c' .. n .. '_face_scale'][1],
+				motif.select_info.p2_face_scale[2] * motif.select_info['p2_c' .. n .. '_face_scale'][2]
+			)
+		end
 	end
 	--draw cell art (slow for large rosters, this will be likely moved to 'drawFace' function in future)
 	for i = 1, #select.t_drawFace do
@@ -1302,19 +1762,33 @@ function select.f_selectScreen()
 		elseif main.coop and not coopEnd then
 			coopEnd = true
 			p2TeamEnd = false
-		else
+		elseif fadeType == 'fadein' then
+			main.fadeStart = getFrameCount()
+			fadeType = 'fadeout'
+		elseif not main.fadeActive then
 			selScreenEnd = true
 		end
 	end
 	--draw layerno = 1 backgrounds
-	main.f_drawBG(motif.selectbgdef.bg_data, motif.selectbgdef.bg, 1, motif.selectbgdef.timer, {320,240})
-	--draw fadein
-	animDraw(motif.select_info.fadein_data)
-	animUpdate(motif.select_info.fadein_data)
-	--update timer
-	motif.selectbgdef.timer = motif.selectbgdef.timer + 1
-	--end loop
-	main.f_cmdInput()
+	bgDraw(motif.selectbgdef.bg, true)
+	--draw fadein / fadeout
+	main.fadeActive = fadeScreen(
+		fadeType,
+		main.fadeStart,
+		motif.select_info[fadeType .. '_time'],
+		motif.select_info[fadeType .. '_col'][1],
+		motif.select_info[fadeType .. '_col'][2],
+		motif.select_info[fadeType .. '_col'][3]
+	)
+	--frame transition
+	if main.fadeActive then
+		commandBufReset(main.p1Cmd)
+	elseif fadeType == 'fadeout' then
+		commandBufReset(main.p1Cmd)
+		return --skip last frame rendering
+	else
+		main.f_cmdInput()
+	end
 	refresh()
 end
 
@@ -1332,7 +1806,9 @@ local txt_p1TeamSelfTitle = main.f_createTextImg(
 	motif.select_info.p1_teammenu_selftitle_font_scale[2],
 	motif.select_info.p1_teammenu_selftitle_font[4],
 	motif.select_info.p1_teammenu_selftitle_font[5],
-	motif.select_info.p1_teammenu_selftitle_font[6]
+	motif.select_info.p1_teammenu_selftitle_font[6],
+	motif.select_info.p1_teammenu_selftitle_font[7],
+	motif.select_info.p1_teammenu_selftitle_font[8]
 )
 local txt_p1TeamEnemyTitle = main.f_createTextImg(
 	motif.font_data[motif.select_info.p1_teammenu_enemytitle_font[1]],
@@ -1345,56 +1821,21 @@ local txt_p1TeamEnemyTitle = main.f_createTextImg(
 	motif.select_info.p1_teammenu_enemytitle_font_scale[2],
 	motif.select_info.p1_teammenu_enemytitle_font[4],
 	motif.select_info.p1_teammenu_enemytitle_font[5],
-	motif.select_info.p1_teammenu_enemytitle_font[6]
+	motif.select_info.p1_teammenu_enemytitle_font[6],
+	motif.select_info.p1_teammenu_enemytitle_font[7],
+	motif.select_info.p1_teammenu_enemytitle_font[8]
 )
 
--- Legacy TAG check and mode enabing
-function main.GetTeamMenu()
-	local temptag789TeamMenu = {}
-	local tempPos = 1
-
-	-- Single mode check
-	if config.SingleTeamMode == true then
-		temptag789TeamMenu[1] = {data = textImgNew(), itemname = 'single', displayname = motif.select_info.teammenu_itemname_single}
-		tempPos = tempPos + 1
-	end
-
-	if config.SimulMode then
-		-- Simul mode check
-		if config.NumSimul > 1 then
-			temptag789TeamMenu[tempPos] = {data = textImgNew(), itemname = 'simul', displayname = motif.select_info.teammenu_itemname_simul}
-			tempPos = tempPos + 1
-		end
-		-- Tag mode check
-		if config.NumTag > 1 then
-			temptag789TeamMenu[tempPos] = {data = textImgNew(), itemname = 'tag', displayname = motif.select_info.teammenu_itemname_tag}
-			tempPos = tempPos + 1
-		end
-	else
-		-- Legacy Tag mode enable
-		temptag789TeamMenu[tempPos] = {data = textImgNew(), itemname = 'simul', displayname = motif.select_info.teammenu_itemname_tag}
-		tempPos = tempPos + 1
-	end
-
-	-- Turns mode check
-	if config.NumTurns > 1 then
-		temptag789TeamMenu[tempPos] = {data = textImgNew(), itemname = 'turns', displayname = motif.select_info.teammenu_itemname_turns}
-	end
-
-	return temptag789TeamMenu
-end
-
--- Set tag mode
-local t_p1TeamMenu = main.GetTeamMenu()
-t_p1TeamMenu = main.f_cleanTable(t_p1TeamMenu)
+select.t_p1TeamMenu = select.f_getTeamMenu()
+select.t_p1TeamMenu = main.f_cleanTable(select.t_p1TeamMenu, main.t_sort.select_info)
 
 local p1TeamActiveCount = 0
 local p1TeamActiveFont = 'p1_teammenu_item_active_font'
 
 function select.f_p1TeamMenu()
 	if main.p1TeamMenu ~= nil then --Predefined team
-		p1NumChars = main.p1TeamMenu.chars
 		p1TeamMode = main.p1TeamMenu.mode
+		p1NumChars = main.p1TeamMenu.chars
 		setTeamMode(1, p1TeamMode, p1NumChars)
 		p1TeamEnd = true
 	else
@@ -1405,17 +1846,17 @@ function select.f_p1TeamMenu()
 				p1TeamMenu = p1TeamMenu - 1
 			elseif motif.select_info.teammenu_move_wrapping == 1 then
 				sndPlay(motif.files.snd_data, motif.select_info.p1_teammenu_move_snd[1], motif.select_info.p1_teammenu_move_snd[2])
-				p1TeamMenu = #t_p1TeamMenu
+				p1TeamMenu = #select.t_p1TeamMenu
 			end
 		elseif commandGetState(main.p1Cmd, 'd') then
-			if p1TeamMenu + 1 <= #t_p1TeamMenu then
+			if p1TeamMenu + 1 <= #select.t_p1TeamMenu then
 				sndPlay(motif.files.snd_data, motif.select_info.p1_teammenu_move_snd[1], motif.select_info.p1_teammenu_move_snd[2])
 				p1TeamMenu = p1TeamMenu + 1
 			elseif motif.select_info.teammenu_move_wrapping == 1 then
 				sndPlay(motif.files.snd_data, motif.select_info.p1_teammenu_move_snd[1], motif.select_info.p1_teammenu_move_snd[2])
 				p1TeamMenu = 1
 			end
-		elseif t_p1TeamMenu[p1TeamMenu].itemname == 'simul' then
+		elseif select.t_p1TeamMenu[p1TeamMenu].itemname == 'simul' then
 			if commandGetState(main.p1Cmd, 'l') then
 				if p1NumSimul - 1 >= 2 then
 					sndPlay(motif.files.snd_data, motif.select_info.p1_teammenu_value_snd[1], motif.select_info.p1_teammenu_value_snd[2])
@@ -1427,9 +1868,9 @@ function select.f_p1TeamMenu()
 					p1NumSimul = p1NumSimul + 1
 				end
 			end
-		elseif t_p1TeamMenu[p1TeamMenu].itemname == 'turns' then
+		elseif select.t_p1TeamMenu[p1TeamMenu].itemname == 'turns' then
 			if commandGetState(main.p1Cmd, 'l') then
-				if p1NumTurns - 1 >= 2 then
+				if p1NumTurns - 1 >= 1 then
 					sndPlay(motif.files.snd_data, motif.select_info.p1_teammenu_value_snd[1], motif.select_info.p1_teammenu_value_snd[2])
 					p1NumTurns = p1NumTurns - 1
 				end
@@ -1439,7 +1880,7 @@ function select.f_p1TeamMenu()
 					p1NumTurns = p1NumTurns + 1
 				end
 			end
-		elseif t_p1TeamMenu[p1TeamMenu].itemname == 'tag' then
+		elseif select.t_p1TeamMenu[p1TeamMenu].itemname == 'tag' then
 			if commandGetState(main.p1Cmd, 'l') then
 				if p1NumTag - 1 >= 2 then
 					sndPlay(motif.files.snd_data, motif.select_info.p1_teammenu_value_snd[1], motif.select_info.p1_teammenu_value_snd[2])
@@ -1465,7 +1906,7 @@ function select.f_p1TeamMenu()
 		animUpdate(motif.select_info.p1_teammenu_selftitle_data)
 		animDraw(motif.select_info.p1_teammenu_selftitle_data)
 		textImgDraw(txt_p1TeamSelfTitle)
-		for i = 1, #t_p1TeamMenu do
+		for i = 1, #select.t_p1TeamMenu do
 			if i == p1TeamMenu then
 				if p1TeamActiveCount < 2 then --delay change
 					p1TeamActiveCount = p1TeamActiveCount + 1
@@ -1478,38 +1919,42 @@ function select.f_p1TeamMenu()
 				end
 				--Draw team active font
 				textImgDraw(main.f_updateTextImg(
-					t_p1TeamMenu[i].data,
+					select.t_p1TeamMenu[i].data,
 					motif.font_data[motif.select_info[p1TeamActiveFont][1]],
 					motif.select_info[p1TeamActiveFont][2],
-					motif.select_info.p1_teammenu_item_font[3], --mugen ignores active font facing
-					t_p1TeamMenu[i].displayname,
+					motif.select_info[p1TeamActiveFont][3], --p1_teammenu_item_font (winmugen ignores active font facing? Fixed in mugen 1.0)
+					select.t_p1TeamMenu[i].displayname,
 					motif.select_info.p1_teammenu_pos[1] + motif.select_info.p1_teammenu_item_offset[1] + motif.select_info.p1_teammenu_item_font_offset[1] + (i - 1) * motif.select_info.p1_teammenu_item_spacing[1],
 					motif.select_info.p1_teammenu_pos[2] + motif.select_info.p1_teammenu_item_offset[2] + motif.select_info.p1_teammenu_item_font_offset[2] + (i - 1) * motif.select_info.p1_teammenu_item_spacing[2],
 					motif.select_info[p1TeamActiveFont .. '_scale'][1],
 					motif.select_info[p1TeamActiveFont .. '_scale'][2],
 					motif.select_info[p1TeamActiveFont][4],
 					motif.select_info[p1TeamActiveFont][5],
-					motif.select_info[p1TeamActiveFont][6]
+					motif.select_info[p1TeamActiveFont][6],
+					motif.select_info[p1TeamActiveFont][7],
+					motif.select_info[p1TeamActiveFont][8]
 				))
 			else
 				--Draw team not active font
 				textImgDraw(main.f_updateTextImg(
-					t_p1TeamMenu[i].data,
+					select.t_p1TeamMenu[i].data,
 					motif.font_data[motif.select_info.p1_teammenu_item_font[1]],
 					motif.select_info.p1_teammenu_item_font[2],
 					motif.select_info.p1_teammenu_item_font[3],
-					t_p1TeamMenu[i].displayname,
+					select.t_p1TeamMenu[i].displayname,
 					motif.select_info.p1_teammenu_pos[1] + motif.select_info.p1_teammenu_item_offset[1] + motif.select_info.p1_teammenu_item_font_offset[1] + (i - 1) * motif.select_info.p1_teammenu_item_spacing[1],
 					motif.select_info.p1_teammenu_pos[2] + motif.select_info.p1_teammenu_item_offset[2] + motif.select_info.p1_teammenu_item_font_offset[2] + (i - 1) * motif.select_info.p1_teammenu_item_spacing[2],
 					motif.select_info.p1_teammenu_item_font_scale[1],
 					motif.select_info.p1_teammenu_item_font_scale[2],
 					motif.select_info.p1_teammenu_item_font[4],
 					motif.select_info.p1_teammenu_item_font[5],
-					motif.select_info.p1_teammenu_item_font[6]
+					motif.select_info.p1_teammenu_item_font[6],
+					motif.select_info.p1_teammenu_item_font[7],
+					motif.select_info.p1_teammenu_item_font[8]
 				))
 			end
 			--Draw team icons
-			if t_p1TeamMenu[i].itemname == 'simul' then
+			if select.t_p1TeamMenu[i].itemname == 'simul' then
 				for j = 1, config.NumSimul do
 					if j <= p1NumSimul then
 						main.f_animPosDraw(
@@ -1525,7 +1970,7 @@ function select.f_p1TeamMenu()
 						)
 					end
 				end
-			elseif t_p1TeamMenu[i].itemname == 'turns' then
+			elseif select.t_p1TeamMenu[i].itemname == 'turns' then
 				for j = 1, config.NumTurns do
 					if j <= p1NumTurns then
 						main.f_animPosDraw(
@@ -1541,7 +1986,7 @@ function select.f_p1TeamMenu()
 						)
 					end
 				end
-			elseif t_p1TeamMenu[i].itemname == 'tag' then
+			elseif select.t_p1TeamMenu[i].itemname == 'tag' then
 				for j = 1, config.NumTag do
 					if j <= p1NumTag then
 						main.f_animPosDraw(
@@ -1562,16 +2007,16 @@ function select.f_p1TeamMenu()
 		--Confirmed team selection
 		if main.f_btnPalNo(main.p1Cmd) > 0 then
 			sndPlay(motif.files.snd_data, motif.select_info.p1_teammenu_done_snd[1], motif.select_info.p1_teammenu_done_snd[2])
-			if t_p1TeamMenu[p1TeamMenu].itemname == 'single' then
+			if select.t_p1TeamMenu[p1TeamMenu].itemname == 'single' then
 				p1TeamMode = 0
 				p1NumChars = 1
-			elseif t_p1TeamMenu[p1TeamMenu].itemname == 'simul' then
+			elseif select.t_p1TeamMenu[p1TeamMenu].itemname == 'simul' then
 				p1TeamMode = 1
 				p1NumChars = p1NumSimul
-			elseif t_p1TeamMenu[p1TeamMenu].itemname == 'turns' then
+			elseif select.t_p1TeamMenu[p1TeamMenu].itemname == 'turns' then
 				p1TeamMode = 2
 				p1NumChars = p1NumTurns
-			elseif t_p1TeamMenu[p1TeamMenu].itemname == 'tag' then
+			elseif select.t_p1TeamMenu[p1TeamMenu].itemname == 'tag' then
 				p1TeamMode = 3
 				p1NumChars = p1NumTag
 			end
@@ -1596,7 +2041,9 @@ local txt_p2TeamSelfTitle = main.f_createTextImg(
 	motif.select_info.p2_teammenu_selftitle_font_scale[2],
 	motif.select_info.p2_teammenu_selftitle_font[4],
 	motif.select_info.p2_teammenu_selftitle_font[5],
-	motif.select_info.p2_teammenu_selftitle_font[6]
+	motif.select_info.p2_teammenu_selftitle_font[6],
+	motif.select_info.p2_teammenu_selftitle_font[7],
+	motif.select_info.p2_teammenu_selftitle_font[8]
 )
 local txt_p2TeamEnemyTitle = main.f_createTextImg(
 	motif.font_data[motif.select_info.p2_teammenu_enemytitle_font[1]],
@@ -1609,20 +2056,21 @@ local txt_p2TeamEnemyTitle = main.f_createTextImg(
 	motif.select_info.p2_teammenu_enemytitle_font_scale[2],
 	motif.select_info.p2_teammenu_enemytitle_font[4],
 	motif.select_info.p2_teammenu_enemytitle_font[5],
-	motif.select_info.p2_teammenu_enemytitle_font[6]
+	motif.select_info.p2_teammenu_enemytitle_font[6],
+	motif.select_info.p2_teammenu_enemytitle_font[7],
+	motif.select_info.p2_teammenu_enemytitle_font[8]
 )
 
--- Set tag mode
-local t_p2TeamMenu = main.GetTeamMenu()
-t_p2TeamMenu = main.f_cleanTable(t_p2TeamMenu)
+select.t_p2TeamMenu = select.f_getTeamMenu()
+select.t_p2TeamMenu = main.f_cleanTable(select.t_p2TeamMenu, main.t_sort.select_info)
 
 local p2TeamActiveCount = 0
 local p2TeamActiveFont = 'p2_teammenu_item_active_font'
 
 function select.f_p2TeamMenu()
 	if main.p2TeamMenu ~= nil then --Predefined team
-		p2NumChars = main.p2TeamMenu.chars
 		p2TeamMode = main.p2TeamMenu.mode
+		p2NumChars = main.p2TeamMenu.chars
 		setTeamMode(2, p2TeamMode, p2NumChars)
 		p2TeamEnd = true
 	else
@@ -1638,17 +2086,17 @@ function select.f_p2TeamMenu()
 				p2TeamMenu = p2TeamMenu - 1
 			elseif motif.select_info.teammenu_move_wrapping == 1 then
 				sndPlay(motif.files.snd_data, motif.select_info.p2_teammenu_move_snd[1], motif.select_info.p2_teammenu_move_snd[2])
-				p2TeamMenu = #t_p2TeamMenu
+				p2TeamMenu = #select.t_p2TeamMenu
 			end
 		elseif commandGetState(cmd, 'd') then
-			if p2TeamMenu + 1 <= #t_p2TeamMenu then
+			if p2TeamMenu + 1 <= #select.t_p2TeamMenu then
 				sndPlay(motif.files.snd_data, motif.select_info.p2_teammenu_move_snd[1], motif.select_info.p2_teammenu_move_snd[2])
 				p2TeamMenu = p2TeamMenu + 1
 			elseif motif.select_info.teammenu_move_wrapping == 1 then
 				sndPlay(motif.files.snd_data, motif.select_info.p2_teammenu_move_snd[1], motif.select_info.p2_teammenu_move_snd[2])
 				p2TeamMenu = 1
 			end
-		elseif t_p2TeamMenu[p2TeamMenu].itemname == 'simul' then
+		elseif select.t_p2TeamMenu[p2TeamMenu].itemname == 'simul' then
 			if commandGetState(cmd, 'r') then
 				if p2NumSimul - 1 >= 2 then
 					sndPlay(motif.files.snd_data, motif.select_info.p2_teammenu_value_snd[1], motif.select_info.p2_teammenu_value_snd[2])
@@ -1660,9 +2108,9 @@ function select.f_p2TeamMenu()
 					p2NumSimul = p2NumSimul + 1
 				end
 			end
-		elseif t_p2TeamMenu[p2TeamMenu].itemname == 'turns' then
+		elseif select.t_p2TeamMenu[p2TeamMenu].itemname == 'turns' then
 			if commandGetState(cmd, 'r') then
-				if p2NumTurns - 1 >= 2 then
+				if p2NumTurns - 1 >= 1 then
 					sndPlay(motif.files.snd_data, motif.select_info.p2_teammenu_value_snd[1], motif.select_info.p2_teammenu_value_snd[2])
 					p2NumTurns = p2NumTurns - 1
 				end
@@ -1672,7 +2120,7 @@ function select.f_p2TeamMenu()
 					p2NumTurns = p2NumTurns + 1
 				end
 			end
-		elseif t_p2TeamMenu[p2TeamMenu].itemname == 'tag' then
+		elseif select.t_p2TeamMenu[p2TeamMenu].itemname == 'tag' then
 			if commandGetState(cmd, 'r') then
 				if p2NumTag - 1 >= 2 then
 					sndPlay(motif.files.snd_data, motif.select_info.p2_teammenu_value_snd[1], motif.select_info.p2_teammenu_value_snd[2])
@@ -1704,7 +2152,7 @@ function select.f_p2TeamMenu()
 			animDraw(motif.select_info.p2_teammenu_selftitle_data)
 			textImgDraw(txt_p2TeamSelfTitle)
 		end
-		for i = 1, #t_p2TeamMenu do
+		for i = 1, #select.t_p2TeamMenu do
 			if i == p2TeamMenu then
 				if p2TeamActiveCount < 2 then --delay change
 					p2TeamActiveCount = p2TeamActiveCount + 1
@@ -1717,38 +2165,42 @@ function select.f_p2TeamMenu()
 				end
 				--Draw team active font
 				textImgDraw(main.f_updateTextImg(
-					t_p2TeamMenu[i].data,
+					select.t_p2TeamMenu[i].data,
 					motif.font_data[motif.select_info[p2TeamActiveFont][1]],
 					motif.select_info[p2TeamActiveFont][2],
-					motif.select_info.p2_teammenu_item_font[3], --mugen ignores active font facing
-					t_p2TeamMenu[i].displayname,
+					motif.select_info[p2TeamActiveFont][3], --p2_teammenu_item_font (winmugen ignores active font facing? Fixed in mugen 1.0)
+					select.t_p2TeamMenu[i].displayname,
 					motif.select_info.p2_teammenu_pos[1] + motif.select_info.p2_teammenu_item_offset[1] + motif.select_info.p2_teammenu_item_font_offset[1] + (i - 1) * motif.select_info.p2_teammenu_item_spacing[1],
 					motif.select_info.p2_teammenu_pos[2] + motif.select_info.p2_teammenu_item_offset[2] + motif.select_info.p2_teammenu_item_font_offset[2] + (i - 1) * motif.select_info.p2_teammenu_item_spacing[2],
 					motif.select_info[p2TeamActiveFont .. '_scale'][1],
 					motif.select_info[p2TeamActiveFont .. '_scale'][2],
 					motif.select_info[p2TeamActiveFont][4],
 					motif.select_info[p2TeamActiveFont][5],
-					motif.select_info[p2TeamActiveFont][6]
+					motif.select_info[p2TeamActiveFont][6],
+					motif.select_info[p2TeamActiveFont][7],
+					motif.select_info[p2TeamActiveFont][8]
 				))
 			else
 				--Draw team not active font
 				textImgDraw(main.f_updateTextImg(
-					t_p2TeamMenu[i].data,
+					select.t_p2TeamMenu[i].data,
 					motif.font_data[motif.select_info.p2_teammenu_item_font[1]],
 					motif.select_info.p2_teammenu_item_font[2],
 					motif.select_info.p2_teammenu_item_font[3],
-					t_p2TeamMenu[i].displayname,
+					select.t_p2TeamMenu[i].displayname,
 					motif.select_info.p2_teammenu_pos[1] + motif.select_info.p2_teammenu_item_offset[1] + motif.select_info.p2_teammenu_item_font_offset[1] + (i - 1) * motif.select_info.p2_teammenu_item_spacing[1],
 					motif.select_info.p2_teammenu_pos[2] + motif.select_info.p2_teammenu_item_offset[2] + motif.select_info.p2_teammenu_item_font_offset[2] + (i - 1) * motif.select_info.p2_teammenu_item_spacing[2],
 					motif.select_info.p2_teammenu_item_font_scale[1],
 					motif.select_info.p2_teammenu_item_font_scale[2],
 					motif.select_info.p2_teammenu_item_font[4],
 					motif.select_info.p2_teammenu_item_font[5],
-					motif.select_info.p2_teammenu_item_font[6]
+					motif.select_info.p2_teammenu_item_font[6],
+					motif.select_info.p2_teammenu_item_font[7],
+					motif.select_info.p2_teammenu_item_font[8]
 				))
 			end
 			--Draw team icons
-			if t_p2TeamMenu[i].itemname == 'simul' then
+			if select.t_p2TeamMenu[i].itemname == 'simul' then
 				for j = 1, config.NumSimul do
 					if j <= p2NumSimul then
 						main.f_animPosDraw(
@@ -1764,7 +2216,7 @@ function select.f_p2TeamMenu()
 						)
 					end
 				end
-			elseif t_p2TeamMenu[i].itemname == 'turns' then
+			elseif select.t_p2TeamMenu[i].itemname == 'turns' then
 				for j = 1, config.NumTurns do
 					if j <= p2NumTurns then
 						main.f_animPosDraw(
@@ -1780,7 +2232,7 @@ function select.f_p2TeamMenu()
 						)
 					end
 				end
-			elseif t_p2TeamMenu[i].itemname == 'tag' then
+			elseif select.t_p2TeamMenu[i].itemname == 'tag' then
 				for j = 1, config.NumTag do
 					if j <= p2NumTag then
 						main.f_animPosDraw(
@@ -1801,16 +2253,16 @@ function select.f_p2TeamMenu()
 		--Confirmed team selection
 		if main.f_btnPalNo(cmd) > 0 then
 			sndPlay(motif.files.snd_data, motif.select_info.p2_teammenu_done_snd[1], motif.select_info.p2_teammenu_done_snd[2])
-			if t_p2TeamMenu[p2TeamMenu].itemname == 'single' then
+			if select.t_p2TeamMenu[p2TeamMenu].itemname == 'single' then
 				p2TeamMode = 0
 				p2NumChars = 1
-			elseif t_p2TeamMenu[p2TeamMenu].itemname == 'simul' then
+			elseif select.t_p2TeamMenu[p2TeamMenu].itemname == 'simul' then
 				p2TeamMode = 1
 				p2NumChars = p2NumSimul
-			elseif t_p2TeamMenu[p2TeamMenu].itemname == 'turns' then
+			elseif select.t_p2TeamMenu[p2TeamMenu].itemname == 'turns' then
 				p2TeamMode = 2
 				p2NumChars = p2NumTurns
-			elseif t_p2TeamMenu[p2TeamMenu].itemname == 'tag' then
+			elseif select.t_p2TeamMenu[p2TeamMenu].itemname == 'tag' then
 				p2TeamMode = 3
 				p2NumChars = p2NumTag
 			end
@@ -1832,7 +2284,7 @@ function select.f_p1SelectMenu()
 			if t[main.p1Char[i]] == nil then
 				t[main.p1Char[i]] = ''
 			end
-			t_p1Selected[i] = {cel = main.p1Char[i], pal = select.f_randomPal(main.p1Char[i])}
+			t_p1Selected[i] = {cel = main.p1Char[i], pal = select.f_selectPal(main.p1Char[i])}
 		end
 		p1SelEnd = true
 		return
@@ -1843,17 +2295,8 @@ function select.f_p1SelectMenu()
 		p1SelX, p1SelY, p1FaceOffset, p1RowOffset = select.f_cellMovement(p1SelX, p1SelY, main.p1Cmd, p1FaceOffset, p1RowOffset, motif.select_info.p1_cursor_move_snd)
 		p1Cell = p1SelX + motif.select_info.columns * p1SelY
 		--draw active cursor
-		-- cell.spacing type check
-		local cursorX = 0
-		local cursorY = 0
-		if type(motif.select_info.cell_spacing) == "table" then
-			cursorX = p1FaceX + p1SelX * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing[1])
-			cursorY = p1FaceY + (p1SelY - p1RowOffset) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing[2])
-		else
-			cursorX = p1FaceX + p1SelX * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing)
-			cursorY = p1FaceY + (p1SelY - p1RowOffset) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing)
-		end
-		
+		local cursorX = p1FaceX + p1SelX * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing[1])
+		local cursorY = p1FaceY + (p1SelY - p1RowOffset) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing[2])
 		if resetgrid == true then
 			select.f_resetGrid()
 		end
@@ -1867,7 +2310,7 @@ function select.f_p1SelectMenu()
 			if main.t_selChars[selected + 1].char == 'randomselect' or main.t_selChars[selected + 1].hidden == 3 then
 				selected = main.t_randomChars[math.random(1, #main.t_randomChars)]
 			end
-			t_p1Selected[#t_p1Selected + 1] = {cel = selected, pal = main.f_btnPalNo(main.p1Cmd), cursor = {cursorX, cursorY, p1RowOffset}}
+			table.insert(t_p1Selected, {cel = selected, pal = main.f_btnPalNo(main.p1Cmd), cursor = {cursorX, cursorY, p1RowOffset}})
 			if #t_p1Selected == p1NumChars then
 				if main.p2In == 1 and matchNo == 0 then
 					p2TeamEnd = false
@@ -1892,7 +2335,7 @@ function select.f_p2SelectMenu()
 			if t[main.p2Char[i]] == nil then
 				t[main.p2Char[i]] = ''
 			end
-			t_p2Selected[i] = {cel = main.p2Char[i], pal = select.f_randomPal(main.p2Char[i])}
+			t_p2Selected[i] = {cel = main.p2Char[i], pal = select.f_selectPal(main.p2Char[i])}
 		end
 		p2SelEnd = true
 		return
@@ -1907,16 +2350,8 @@ function select.f_p2SelectMenu()
 		p2SelX, p2SelY, p2FaceOffset, p2RowOffset = select.f_cellMovement(p2SelX, p2SelY, main.p2Cmd, p2FaceOffset, p2RowOffset, motif.select_info.p2_cursor_move_snd)
 		p2Cell = p2SelX + motif.select_info.columns * p2SelY
 		--draw active cursor
-		-- cell.spacing type check
-		local cursorX = 0
-		local cursorY = 0
-		if type(motif.select_info.cell_spacing) == "table" then
-			cursorX = p2FaceX + p2SelX * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing[1])
-			cursorY = p2FaceY + (p2SelY - p2RowOffset) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing[2])
-		else
-			cursorX = p2FaceX + p2SelX * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing)
-			cursorY = p2FaceY + (p2SelY - p2RowOffset) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing)
-		end
+		local cursorX = p2FaceX + p2SelX * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing[1])
+		local cursorY = p2FaceY + (p2SelY - p2RowOffset) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing[2])
 		if resetgrid == true then
 			select.f_resetGrid()
 		end
@@ -1928,7 +2363,7 @@ function select.f_p2SelectMenu()
 			if main.t_selChars[selected + 1].char == 'randomselect' or main.t_selChars[selected + 1].hidden == 3 then
 				selected = main.t_randomChars[math.random(1, #main.t_randomChars)]
 			end
-			t_p2Selected[#t_p2Selected + 1] = {cel = selected, pal = main.f_btnPalNo(main.p2Cmd), cursor = {cursorX, cursorY, p2RowOffset}}
+			table.insert(t_p2Selected, {cel = selected, pal = main.f_btnPalNo(main.p2Cmd), cursor = {cursorX, cursorY, p2RowOffset}})
 			if #t_p2Selected == p2NumChars then
 				p2SelEnd = true
 			end
@@ -1949,34 +2384,42 @@ function select.f_stageMenu()
 	if commandGetState(main.p1Cmd, 'l') then
 		sndPlay(motif.files.snd_data, motif.select_info.stage_move_snd[1], motif.select_info.stage_move_snd[2])
 		stageList = stageList - 1
-		if stageList < 0 then stageList = #main.t_includeStage end
+		if stageList < 0 then stageList = #main.t_includeStage[2] end
 	elseif commandGetState(main.p1Cmd, 'r') then
 		sndPlay(motif.files.snd_data, motif.select_info.stage_move_snd[1], motif.select_info.stage_move_snd[2])
 		stageList = stageList + 1
-		if stageList > #main.t_includeStage then stageList = 0 end
+		if stageList > #main.t_includeStage[2] then stageList = 0 end
 	elseif commandGetState(main.p1Cmd, 'u') then
 		sndPlay(motif.files.snd_data, motif.select_info.stage_move_snd[1], motif.select_info.stage_move_snd[2])
 		for i = 1, 10 do
 			stageList = stageList - 1
-			if stageList < 0 then stageList = #main.t_includeStage end
+			if stageList < 0 then stageList = #main.t_includeStage[2] end
 		end
 	elseif commandGetState(main.p1Cmd, 'd') then
 		sndPlay(motif.files.snd_data, motif.select_info.stage_move_snd[1], motif.select_info.stage_move_snd[2])
 		for i = 1, 10 do
 			stageList = stageList + 1
-			if stageList > #main.t_includeStage then stageList = 0 end
-		end
+			if stageList > #main.t_includeStage[2] then stageList = 0 end
+		end
+	end
+	if stageList == 0 then --draw random stage portrait loaded from screenpack SFF
+		animUpdate(motif.select_info.stage_portrait_random_data)
+		animDraw(motif.select_info.stage_portrait_random_data)	
+	else --draw stage portrait loaded from stage SFF
+		drawStagePortrait(
+			stageList,
+			motif.select_info.stage_pos[1] + motif.select_info.stage_portrait_offset[1],
+			motif.select_info.stage_pos[2] + motif.select_info.stage_portrait_offset[2],
+			--[[motif.select_info.stage_portrait_facing * ]]motif.select_info.stage_portrait_scale[1],
+			motif.select_info.stage_portrait_scale[2]
+		)
 	end
 	if main.f_btnPalNo(main.p1Cmd) > 0 then
 		sndPlay(motif.files.snd_data, motif.select_info.stage_done_snd[1], motif.select_info.stage_done_snd[2])
 		if stageList == 0 then
-			stageNo = main.t_includeStage[math.random(1, #main.t_includeStage)]
-			setStage(stageNo)
-			selectStage(stageNo)
+			stageNo = main.t_includeStage[2][math.random(1, #main.t_includeStage[2])]
 		else
-			stageNo = main.t_includeStage[stageList]
-			setStage(stageNo)
-			selectStage(stageNo)
+			stageNo = main.t_includeStage[2][stageList]
 		end
 		stageActiveFont = 'stage_done_font'
 		stageEnd = true
@@ -1994,9 +2437,9 @@ function select.f_stageMenu()
 	end
 	local t_txt = {}
 	if stageList == 0 then
-		t_txt = main.f_extractText(motif.select_info.stage_text, '', 'Random')
+		t_txt[1] = motif.select_info.stage_random_text
 	else
-		t_txt = main.f_extractText(motif.select_info.stage_text, stageList, getStageName(main.t_includeStage[stageList]):match('^["%s]*(.-)["%s]*$'))
+		t_txt = main.f_extractText(motif.select_info.stage_text, stageList, getStageName(main.t_includeStage[2][stageList]))
 	end
 	for i = 1, #t_txt do
 		textImgDraw(main.f_updateTextImg(
@@ -2011,7 +2454,9 @@ function select.f_stageMenu()
 			motif.select_info[stageActiveFont .. '_scale'][2],
 			motif.select_info[stageActiveFont][4],
 			motif.select_info[stageActiveFont][5],
-			motif.select_info[stageActiveFont][6]
+			motif.select_info[stageActiveFont][6],
+			motif.select_info[stageActiveFont][7],
+			motif.select_info[stageActiveFont][8]
 		))
 	end
 end
@@ -2020,74 +2465,75 @@ end
 --; VERSUS SCREEN
 --;===========================================================
 local txt_p1NameVS = main.f_createTextImg(
-	motif.font_data[motif.vs_screen.p1_name_font[1]], 
-	motif.vs_screen.p1_name_font[2], 
-	motif.vs_screen.p1_name_font[3], 
-	'', 
-	0, 
-	0, 
-	motif.vs_screen.p1_name_font_scale[1], 
+	motif.font_data[motif.vs_screen.p1_name_font[1]],
+	motif.vs_screen.p1_name_font[2],
+	motif.vs_screen.p1_name_font[3],
+	'',
+	0,
+	0,
+	motif.vs_screen.p1_name_font_scale[1],
 	motif.vs_screen.p1_name_font_scale[2],
-	motif.vs_screen.p1_name_font[4], 
-	motif.vs_screen.p1_name_font[5], 
-	motif.vs_screen.p1_name_font[6]
+	motif.vs_screen.p1_name_font[4],
+	motif.vs_screen.p1_name_font[5],
+	motif.vs_screen.p1_name_font[6],
+	motif.vs_screen.p1_name_font[7],
+	motif.vs_screen.p1_name_font[8]
+	
 )
 local txt_p2NameVS = main.f_createTextImg(
-	motif.font_data[motif.vs_screen.p2_name_font[1]], 
-	motif.vs_screen.p2_name_font[2], 
-	motif.vs_screen.p2_name_font[3], 
-	'', 
-	0, 
-	0, 
-	motif.vs_screen.p2_name_font_scale[1], 
+	motif.font_data[motif.vs_screen.p2_name_font[1]],
+	motif.vs_screen.p2_name_font[2],
+	motif.vs_screen.p2_name_font[3],
+	'',
+	0,
+	0,
+	motif.vs_screen.p2_name_font_scale[1],
 	motif.vs_screen.p2_name_font_scale[2],
-	motif.vs_screen.p2_name_font[4], 
-	motif.vs_screen.p2_name_font[5], 
-	motif.vs_screen.p2_name_font[6]
+	motif.vs_screen.p2_name_font[4],
+	motif.vs_screen.p2_name_font[5],
+	motif.vs_screen.p2_name_font[6],
+	motif.vs_screen.p2_name_font[7],
+	motif.vs_screen.p2_name_font[8]
 )
 local txt_matchNo = main.f_createTextImg(
-	motif.font_data[motif.vs_screen.match_font[1]], 
-	motif.vs_screen.match_font[2], 
-	motif.vs_screen.match_font[3], 
-	'', 
-	motif.vs_screen.match_offset[1], 
-	motif.vs_screen.match_offset[2], 
-	motif.vs_screen.match_font_scale[1], 
+	motif.font_data[motif.vs_screen.match_font[1]],
+	motif.vs_screen.match_font[2],
+	motif.vs_screen.match_font[3],
+	'',
+	motif.vs_screen.match_offset[1],
+	motif.vs_screen.match_offset[2],
+	motif.vs_screen.match_font_scale[1],
 	motif.vs_screen.match_font_scale[2],
-	motif.vs_screen.match_font[4], 
-	motif.vs_screen.match_font[5], 
-	motif.vs_screen.match_font[6]
+	motif.vs_screen.match_font[4],
+	motif.vs_screen.match_font[5],
+	motif.vs_screen.match_font[6],
+	motif.vs_screen.match_font[7],
+	motif.vs_screen.match_font[8]
 )
 
+function select.f_selectChar(player, t)
+	for i = 1, #t do
+		selectChar(player, t[i].cel, t[i].pal)
+	end
+end
+
 function select.f_selectVersus()
-	local text = main.f_extractText(motif.vs_screen.match_text, matchNo)
-	textImgSetText(txt_matchNo, text[1])
-	local delay = 0
-	local minTime = 15 --let's reserve few extra ticks in case selectChar function needs time to load data, also prevents sound from being interrupted
-	main.f_resetBG(motif.vs_screen, motif.versusbgdef, motif.music.vs_bgm, motif.music.vs_bgm_loop, motif.music.vs_bgm_volume, motif.music.vs_bgm_loopstart, motif.music.vs_bgm_loopend)
 	if not main.versusScreen then
-		delay = minTime
 		select.f_selectChar(1, t_p1Selected)
 		select.f_selectChar(2, t_p2Selected)
-		while true do
-			if delay > 0 then
-				delay = delay - 1
-			else
-				main.f_cmdInput()
-				break
-			end
-			main.f_cmdInput()
-			refresh()
-		end
+		return
 	else
+		local text = main.f_extractText(motif.vs_screen.match_text, matchNo)
+		textImgSetText(txt_matchNo, text[1])
+		main.f_menuReset(motif.versusbgdef.bg, motif.music.vs_bgm, motif.music.vs_bgm_loop, motif.music.vs_bgm_volume, motif.music.vs_bgm_loopstart, motif.music.vs_bgm_loopend)
 		local p1Confirmed = false
 		local p2Confirmed = false
 		local p1Row = 1
 		local p2Row = 1
 		local t_tmp = {}
-		local orderTime = motif.vs_screen.time
+		local orderTime = 0
 		if main.p1In == 1 and main.p2In == 2 and (#t_p1Selected > 1 or #t_p2Selected > 1) and not main.coop then
-			orderTime = orderTime + (math.max(#t_p1Selected, #t_p2Selected) - 1) * motif.vs_screen.time_order
+			orderTime = math.max(#t_p1Selected, #t_p2Selected) - 1 * motif.vs_screen.time_order
 			if #t_p1Selected == 1 then
 				select.f_selectChar(1, t_p1Selected)
 				p1Confirmed = true
@@ -2097,45 +2543,43 @@ function select.f_selectVersus()
 				p2Confirmed = true
 			end
 		elseif #t_p1Selected > 1 and not main.coop then
-			orderTime = orderTime + (#t_p1Selected - 1) * motif.vs_screen.time_order
+			orderTime = #t_p1Selected - 1 * motif.vs_screen.time_order
 		else
 			select.f_selectChar(1, t_p1Selected)
 			p1Confirmed = true
 			select.f_selectChar(2, t_p2Selected)
 			p2Confirmed = true
-			delay = motif.vs_screen.time
-			orderTime = -1
 		end
 		main.f_cmdInput()
+		main.fadeStart = getFrameCount()
+		local counter = 0 - motif.vs_screen.fadein_time
+		fadeType = 'fadein'
 		while true do
 			if esc() then
 				sndPlay(motif.files.snd_data, motif.select_info.cancel_snd[1], motif.select_info.cancel_snd[2])
-				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+				main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+				resetRemapInput()
 				break
 			elseif p1Confirmed and p2Confirmed then
-				if orderTime == -1 and main.f_btnPalNo(main.p1Cmd) > 0 and delay > motif.versusbgdef.timer + minTime then
-					delay = motif.versusbgdef.timer + minTime
-				elseif delay < motif.versusbgdef.timer then
-					break
+				if fadeType == 'fadein' and (counter >= motif.vs_screen.time or main.f_btnPalNo(main.p1Cmd) > 0) then
+					main.fadeStart = getFrameCount()
+					fadeType = 'fadeout'
 				end
-			elseif orderTime <= motif.versusbgdef.timer then
+			elseif counter >= motif.vs_screen.time + orderTime then
 				if not p1Confirmed then
 					select.f_selectChar(1, t_p1Selected)
 					p1Confirmed = true
-					delay = motif.versusbgdef.timer + minTime
 				end
 				if not p2Confirmed then
 					select.f_selectChar(2, t_p2Selected)
 					p2Confirmed = true
-					delay = motif.versusbgdef.timer + minTime
 				end
 			else
-				local sndRef = ''
 				--if Player1 has not confirmed the order yet
 				if not p1Confirmed then
 					if main.f_btnPalNo(main.p1Cmd) > 0 then
 						if not p1Confirmed then
-							sndRef = 'p1_cursor_done_snd'
+							sndPlay(motif.files.snd_data, motif.vs_screen.p1_cursor_done_snd[1], motif.vs_screen.p1_cursor_done_snd[2])
 							select.f_selectChar(1, t_p1Selected)
 							p1Confirmed = true
 						end
@@ -2147,19 +2591,19 @@ function select.f_selectVersus()
 						end
 					elseif commandGetState(main.p1Cmd, 'u') then
 						if #t_p1Selected > 1 then
-							sndRef = 'p1_cursor_move_snd'
+							sndPlay(motif.files.snd_data, motif.vs_screen.p1_cursor_move_snd[1], motif.vs_screen.p1_cursor_move_snd[2])
 							p1Row = p1Row - 1
 							if p1Row == 0 then p1Row = #t_p1Selected end
 						end
 					elseif commandGetState(main.p1Cmd, 'd') then
 						if #t_p1Selected > 1 then
-							sndRef = 'p1_cursor_move_snd'
+							sndPlay(motif.files.snd_data, motif.vs_screen.p1_cursor_move_snd[1], motif.vs_screen.p1_cursor_move_snd[2])
 							p1Row = p1Row + 1
 							if p1Row > #t_p1Selected then p1Row = 1 end
 						end
 					elseif commandGetState(main.p1Cmd, 'l') then
 						if p1Row - 1 > 0 then
-							sndRef = 'p1_cursor_move_snd'
+							sndPlay(motif.files.snd_data, motif.vs_screen.p1_cursor_move_snd[1], motif.vs_screen.p1_cursor_move_snd[2])
 							p1Row = p1Row - 1
 							t_tmp = {}
 							t_tmp[p1Row] = t_p1Selected[p1Row + 1]
@@ -2175,7 +2619,7 @@ function select.f_selectVersus()
 						end
 					elseif commandGetState(main.p1Cmd, 'r') then
 						if p1Row + 1 <= #t_p1Selected then
-							sndRef = 'p1_cursor_move_snd'
+							sndPlay(motif.files.snd_data, motif.vs_screen.p1_cursor_move_snd[1], motif.vs_screen.p1_cursor_move_snd[2])
 							p1Row = p1Row + 1
 							t_tmp = {}
 							t_tmp[p1Row] = t_p1Selected[p1Row - 1]
@@ -2195,25 +2639,25 @@ function select.f_selectVersus()
 				if not p2Confirmed and main.p2In ~= 1 then
 					if main.f_btnPalNo(main.p2Cmd) > 0 then
 						if not p2Confirmed then
-							sndRef = 'p2_cursor_done_snd'
+							sndPlay(motif.files.snd_data, motif.vs_screen.p2_cursor_done_snd[1], motif.vs_screen.p2_cursor_done_snd[2])
 							select.f_selectChar(2, t_p2Selected)
 							p2Confirmed = true
 						end
 					elseif commandGetState(main.p2Cmd, 'u') then
 						if #t_p2Selected > 1 then
-							sndRef = 'p2_cursor_move_snd'
+							sndPlay(motif.files.snd_data, motif.vs_screen.p2_cursor_move_snd[1], motif.vs_screen.p2_cursor_move_snd[2])
 							p2Row = p2Row - 1
 							if p2Row == 0 then p2Row = #t_p2Selected end
 						end
 					elseif commandGetState(main.p2Cmd, 'd') then
 						if #t_p2Selected > 1 then
-							sndRef = 'p2_cursor_move_snd'
+							sndPlay(motif.files.snd_data, motif.vs_screen.p2_cursor_move_snd[1], motif.vs_screen.p2_cursor_move_snd[2])
 							p2Row = p2Row + 1
 							if p2Row > #t_p2Selected then p2Row = 1 end
 						end
 					elseif commandGetState(main.p2Cmd, 'l') then
 						if p2Row + 1 <= #t_p2Selected then
-							sndRef = 'p2_cursor_move_snd'
+							sndPlay(motif.files.snd_data, motif.vs_screen.p2_cursor_move_snd[1], motif.vs_screen.p2_cursor_move_snd[2])
 							p2Row = p2Row + 1
 							t_tmp = {}
 							t_tmp[p2Row] = t_p2Selected[p2Row - 1]
@@ -2229,7 +2673,7 @@ function select.f_selectVersus()
 						end
 					elseif commandGetState(main.p2Cmd, 'r') then
 						if p2Row - 1 > 0 then
-							sndRef = 'p2_cursor_move_snd'
+							sndPlay(motif.files.snd_data, motif.vs_screen.p2_cursor_move_snd[1], motif.vs_screen.p2_cursor_move_snd[2])
 							p2Row = p2Row - 1
 							t_tmp = {}
 							t_tmp[p2Row] = t_p2Selected[p2Row + 1]
@@ -2245,43 +2689,46 @@ function select.f_selectVersus()
 						end
 					end
 				end
-				--sndPlay separated to not play more than 1 sound at once
-				if sndRef ~= '' then
-					sndPlay(motif.files.snd_data, motif.vs_screen[sndRef][1], motif.vs_screen[sndRef][2])
-					delay = motif.versusbgdef.timer + minTime
-				end
 			end
+			counter = counter + 1
 			--draw clearcolor
-			animDraw(motif.versusbgdef.bgclearcolor_data)
-			--draw clearcolor
-			animDraw(motif.versusbgdef.bgclearcolor_data)
+			clearColor(motif.versusbgdef.bgclearcolor[1], motif.versusbgdef.bgclearcolor[2], motif.versusbgdef.bgclearcolor[3])
 			--draw layerno = 0 backgrounds
-			main.f_drawBG(motif.versusbgdef.bg_data, motif.versusbgdef.bg, 0, motif.versusbgdef.timer, {320,240})
-			--draw portraits
-			select.f_drawPortrait(
-				t_p1Selected,
-				motif.vs_screen.p1_pos[1] + motif.vs_screen.p1_offset[1],
-				motif.vs_screen.p1_pos[2] + motif.vs_screen.p1_offset[2],
-				motif.vs_screen.p1_facing,
-				motif.vs_screen.p1_scale[1],
-				motif.vs_screen.p1_scale[2],
-				motif.vs_screen.p1_spacing[1],
-				motif.vs_screen.p1_spacing[2],
-				motif.vs_screen.p1_num,
-				'versus'
-			)
-			select.f_drawPortrait(
-				t_p2Selected,
-				motif.vs_screen.p2_pos[1] + motif.vs_screen.p2_offset[1],
-				motif.vs_screen.p2_pos[2] + motif.vs_screen.p2_offset[2],
-				motif.vs_screen.p2_facing,
-				motif.vs_screen.p2_scale[1],
-				motif.vs_screen.p2_scale[2],
-				motif.vs_screen.p2_spacing[1],
-				motif.vs_screen.p2_spacing[2],
-				motif.vs_screen.p2_num,
-				'versus'
-			)
+			bgDraw(motif.versusbgdef.bg, false)
+			--draw p1 portraits
+			local t_portrait = {}
+			for i = #t_p1Selected, 1, -1 do
+				if #t_portrait < motif.vs_screen.p1_num then
+					table.insert(t_portrait, t_p1Selected[i].cel)
+				end
+			end
+			t_portrait = main.f_reversedTable(t_portrait)
+			for n = #t_portrait, 1, -1 do
+				drawPortrait(
+					t_portrait[n],
+					motif.vs_screen.p1_pos[1] + motif.vs_screen.p1_offset[1] + motif.vs_screen['p1_c' .. n .. '_offset'][1] + (n - 1) * motif.vs_screen.p1_spacing[1] + select.f_alignOffset(motif.vs_screen.p1_facing),
+					motif.vs_screen.p1_pos[2] + motif.vs_screen.p1_offset[2] + motif.vs_screen['p1_c' .. n .. '_offset'][2] + (n - 1) * motif.vs_screen.p1_spacing[2],
+					motif.vs_screen.p1_facing * motif.vs_screen.p1_scale[1] * motif.vs_screen['p1_c' .. n .. '_scale'][1],
+					motif.vs_screen.p1_scale[2] * motif.vs_screen['p1_c' .. n .. '_scale'][2]
+				)
+			end
+			--draw p2 portraits
+			t_portrait = {}
+			for i = #t_p2Selected, 1, -1 do
+				if #t_portrait < motif.vs_screen.p2_num then
+					table.insert(t_portrait, t_p2Selected[i].cel)
+				end
+			end
+			t_portrait = main.f_reversedTable(t_portrait)
+			for n = #t_portrait, 1, -1 do
+				drawPortrait(
+					t_portrait[n],
+					motif.vs_screen.p2_pos[1] + motif.vs_screen.p2_offset[1] + motif.vs_screen['p2_c' .. n .. '_offset'][1] + (n - 1) * motif.vs_screen.p2_spacing[1] + select.f_alignOffset(motif.vs_screen.p2_facing),
+					motif.vs_screen.p2_pos[2] + motif.vs_screen.p2_offset[2] + motif.vs_screen['p2_c' .. n .. '_offset'][2] + (n - 1) * motif.vs_screen.p2_spacing[2],
+					motif.vs_screen.p2_facing * motif.vs_screen.p2_scale[1] * motif.vs_screen['p2_c' .. n .. '_scale'][1],
+					motif.vs_screen.p2_scale[2] * motif.vs_screen['p2_c' .. n .. '_scale'][2]
+				)
+			end
 			--draw names
 			select.f_drawName(
 				t_p1Selected,
@@ -2314,25 +2761,33 @@ function select.f_selectVersus()
 				textImgDraw(txt_matchNo)
 			end
 			--draw layerno = 1 backgrounds
-			main.f_drawBG(motif.versusbgdef.bg_data, motif.versusbgdef.bg, 1, motif.versusbgdef.timer, {320,240})
-			--draw fadein
-			animDraw(motif.vs_screen.fadein_data)
-			animUpdate(motif.vs_screen.fadein_data)
-			--update timer
-			motif.versusbgdef.timer = motif.versusbgdef.timer + 1
-			--end loop
-			main.f_cmdInput()
+			bgDraw(motif.versusbgdef.bg, true)
+			--draw fadein / fadeout
+			main.fadeActive = fadeScreen(
+				fadeType,
+				main.fadeStart,
+				motif.vs_screen[fadeType .. '_time'],
+				motif.vs_screen[fadeType .. '_col'][1],
+				motif.vs_screen[fadeType .. '_col'][2],
+				motif.vs_screen[fadeType .. '_col'][3]
+			)
+			--frame transition
+			if main.fadeActive then
+				commandBufReset(main.p1Cmd)
+				commandBufReset(main.p2Cmd)
+			elseif fadeType == 'fadeout' then
+				commandBufReset(main.p1Cmd)
+				commandBufReset(main.p2Cmd)
+				clearColor(motif.versusbgdef.bgclearcolor[1], motif.versusbgdef.bgclearcolor[2], motif.versusbgdef.bgclearcolor[3]) --skip last frame rendering
+				break
+			else
+				main.f_cmdInput()
+			end
 			refresh()
 		end
 	end
 end
 
-function select.f_selectChar(player, t)
-	for i = 1, #t do
-		selectChar(player, t[i].cel, t[i].pal)
-	end
-end
-
 --;===========================================================
 --; RESULT SCREEN
 --;===========================================================
@@ -2347,7 +2802,9 @@ local txt_resultSurvival = main.f_createTextImg(
 	motif.survival_results_screen.winstext_font_scale[2],
 	motif.survival_results_screen.winstext_font[4],
 	motif.survival_results_screen.winstext_font[5],
-	motif.survival_results_screen.winstext_font[6]
+	motif.survival_results_screen.winstext_font[6],
+	motif.survival_results_screen.winstext_font[7],
+	motif.survival_results_screen.winstext_font[8]
 )
 local txt_resultVS100 = main.f_createTextImg(
 	motif.font_data[motif.vs100kumite_results_screen.winstext_font[1]],
@@ -2358,44 +2815,47 @@ local txt_resultVS100 = main.f_createTextImg(
 	motif.vs100kumite_results_screen.winstext_offset[2],
 	motif.vs100kumite_results_screen.winstext_font_scale[1],
 	motif.vs100kumite_results_screen.winstext_font_scale[2],
-	motif.survival_results_screen.winstext_font[4],
-	motif.survival_results_screen.winstext_font[5],
-	motif.survival_results_screen.winstext_font[6]
+	motif.vs100kumite_results_screen.winstext_font[4],
+	motif.vs100kumite_results_screen.winstext_font[5],
+	motif.vs100kumite_results_screen.winstext_font[6],
+	motif.vs100kumite_results_screen.winstext_font[7],
+	motif.vs100kumite_results_screen.winstext_font[8]
 )
 
-function select.f_result(state)
-	--if state == true then --win
-	--elseif state == false then --loose
-	--end
+function select.f_result()
 	local t = {}
 	local t_resultText = {}
 	local txt = ''
-	if main.gameMode == 'survival' or main.gameMode == 'survivalcoop' or main.gameMode == 'netplaysurvivalcoop' then
+	if gameMode('bossrush') then
+		return
+	elseif gameMode('survival') or gameMode('survivalcoop') or gameMode('netplaysurvivalcoop') then
 		t = motif.survival_results_screen
 		t_resultText = main.f_extractText(t.winstext_text, winCnt)
 		txt = txt_resultSurvival
-	elseif main.gameMode == '100kumite' then
+	elseif gameMode('100kumite') then
 		t = motif.vs100kumite_results_screen
 		t_resultText = main.f_extractText(t.winstext_text, winCnt, looseCnt)
 		txt = txt_resultVS100
-	else
-		return
 	end
-	main.f_resetBG(t, motif.resultsbgdef, motif.music.results_bgm, motif.music.results_bgm_loop, motif.music.results_bgm_volume, motif.music.results_bgm_loopstart, motif.music.results_bgm_loopend)
+	main.f_menuReset(motif.resultsbgdef.bg, motif.music.results_bgm, motif.music.results_bgm_loop, motif.music.results_bgm_volume, motif.music.results_bgm_loopstart, motif.music.results_bgm_loopend)
 	main.f_cmdInput()
+	main.fadeStart = getFrameCount()
+	local counter = 0 - t.fadein_time
+	fadeType = 'fadein'
 	while true do
-		if esc() or main.f_btnPalNo(main.p1Cmd) > 0 then
-			main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
-			break
-		elseif motif.resultsbgdef.timer >= t.show_time then
-			--add fadeout code here
-			main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+		if esc() then
+			main.f_menuReset(motif.titlebgdef.bg, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
+			resetRemapInput()
 			break
+		elseif fadeType == 'fadein' and (counter >= t.show_time or main.f_btnPalNo(main.p1Cmd) > 0) then
+			main.fadeStart = getFrameCount()
+			fadeType = 'fadeout'
 		end
-		--draw clearcolor
-		--animDraw(motif.resultsbgdef.bgclearcolor_data) --disabled to not cover game screen
+		counter = counter + 1
+		--draw clearcolor (disabled to not cover game screen)
+		--clearColor(motif.resultsbgdef.bgclearcolor[1], motif.resultsbgdef.bgclearcolor[2], motif.resultsbgdef.bgclearcolor[3])
 		--draw layerno = 0 backgrounds
-		main.f_drawBG(motif.resultsbgdef.bg_data, motif.resultsbgdef.bg, 0, motif.resultsbgdef.timer, {320,240})
+		bgDraw(motif.resultsbgdef.bg, false)
 		--draw text
 		for i = 1, #t_resultText do
 			textImgSetText(txt, t_resultText[i])
@@ -2407,14 +2867,26 @@ function select.f_result(state)
 			textImgDraw(txt)
 		end
 		--draw layerno = 1 backgrounds
-		main.f_drawBG(motif.resultsbgdef.bg_data, motif.resultsbgdef.bg, 1, motif.resultsbgdef.timer, {320,240})
-		--draw fadein
-		animDraw(t.fadein_data)
-		animUpdate(t.fadein_data)
-		--update timer
-		motif.resultsbgdef.timer = motif.resultsbgdef.timer + 1
-		--end loop
-		main.f_cmdInput()
+		bgDraw(motif.resultsbgdef.bg, true)
+		--draw fadein / fadeout
+		main.fadeActive = fadeScreen(
+			fadeType,
+			main.fadeStart,
+			t[fadeType .. '_time'],
+			t[fadeType .. '_col'][1],
+			t[fadeType .. '_col'][2],
+			t[fadeType .. '_col'][3]
+		)
+		--frame transition
+		if main.fadeActive then
+			commandBufReset(main.p1Cmd)
+		elseif fadeType == 'fadeout' then
+			commandBufReset(main.p1Cmd)
+			clearColor(motif.resultsbgdef.bgclearcolor[1], motif.resultsbgdef.bgclearcolor[2], motif.resultsbgdef.bgclearcolor[3]) --skip last frame rendering
+			break
+		else
+			main.f_cmdInput()
+		end
 		refresh()
 	end
 end
@@ -2423,17 +2895,19 @@ end
 --; VICTORY SCREEN
 --;===========================================================
 local txt_winquote = main.f_createTextImg(
-	motif.font_data[motif.victory_screen.winquote_font[1]], 
-	motif.victory_screen.winquote_font[2], 
-	motif.victory_screen.winquote_font[3], 
-	'', 
-	0, 
-	0, 
-	motif.victory_screen.winquote_font_scale[1], 
+	motif.font_data[motif.victory_screen.winquote_font[1]],
+	motif.victory_screen.winquote_font[2],
+	motif.victory_screen.winquote_font[3],
+	'',
+	0,
+	0,
+	motif.victory_screen.winquote_font_scale[1],
 	motif.victory_screen.winquote_font_scale[2],
 	motif.victory_screen.winquote_font[4],
 	motif.victory_screen.winquote_font[5],
-	motif.victory_screen.winquote_font[6]
+	motif.victory_screen.winquote_font[6],
+	motif.victory_screen.winquote_font[7],
+	motif.victory_screen.winquote_font[8]
 )
 local txt_p1_winquoteName = main.f_createTextImg(
 	motif.font_data[motif.victory_screen.p1_name_font[1]],
@@ -2446,7 +2920,9 @@ local txt_p1_winquoteName = main.f_createTextImg(
 	motif.victory_screen.p1_name_font_scale[2],
 	motif.victory_screen.p1_name_font[4],
 	motif.victory_screen.p1_name_font[5],
-	motif.victory_screen.p1_name_font[6]
+	motif.victory_screen.p1_name_font[6],
+	motif.victory_screen.p1_name_font[7],
+	motif.victory_screen.p1_name_font[8]
 )
 local txt_p2_winquoteName = main.f_createTextImg(
 	motif.font_data[motif.victory_screen.p2_name_font[1]],
@@ -2459,76 +2935,144 @@ local txt_p2_winquoteName = main.f_createTextImg(
 	motif.victory_screen.p2_name_font_scale[2],
 	motif.victory_screen.p2_name_font[4],
 	motif.victory_screen.p2_name_font[5],
-	motif.victory_screen.p2_name_font[6]
+	motif.victory_screen.p2_name_font[6],
+	motif.victory_screen.p2_name_font[7],
+	motif.victory_screen.p2_name_font[8]
 )
 
+function select.f_teamOrder(teamNo, allow_ko)
+	local allow_ko = allow_ko or 0
+	local playerNo = -1
+	local selectNo = -1
+	local t = {}
+	local done = false
+	for k, v in pairs(t_gameStats.chars[t_gameStats.lastRound]) do --loop through all last round participants
+		if k % 2 ~= teamNo then --only if character belongs to selected team
+			if v.win then --win team
+				if not v.ko and not done then --first not KOed win team member
+					playerNo = k
+					selectNo = v.selectNo
+					done = true
+				elseif not v.ko or allow_ko == 1 then --other win team members
+					table.insert(t, v.selectNo)
+				end
+			elseif not done then --first loose team member
+				playerNo = k
+				selectNo = v.selectNo
+				done = true
+			else --other loose team members
+				table.insert(t, v.selectNo)
+			end
+		end
+	end
+	return playerNo, selectNo, t
+end
+
 function select.f_selectVictory()
+	local wpn = -1
+	local wsn = -1
+	local lpn = -1
+	local lsn = -1
+	local t = {}
+	local t2 = {}
+	for i = 0, 1 do
+		if i == t_gameStats.winTeam then
+			wpn, wsn, t = select.f_teamOrder(i, motif.victory_screen.winner_teamko_enabled)
+		else
+			lpn, lsn, t2 = select.f_teamOrder(i, true)
+		end
+	end
+	if wpn == -1 or wsn == -1 then
+		return
+	elseif not main.t_charparam.winscreen then
+		return
+	elseif main.t_charparam.rivals and select.f_rivalsMatch('winscreen') then --winscreen assigned as rivals param
+		if main.t_selChars[t_p1Selected[1].cel + 1].rivals[matchNo].winscreen == 0 then
+			return
+		end
+	elseif main.t_selChars[wsn + 1].winscreen == 0 then --winscreen assigned as character param
+		return
+	end
 	if motif.music.victory_bgm == '' then
-		main.f_resetBG(motif.victory_screen, motif.victorybgdef)
+		main.f_menuReset(motif.victorybgdef.bg)
 	else
-		main.f_resetBG(motif.victory_screen, motif.victorybgdef, motif.music.victory_bgm, motif.music.victory_bgm_loop, motif.music.victory_bgm_volume, motif.music.victory_bgm_loopstart, motif.music.victory_bgm_loopend)
-	end
-	local winquote = ''
-	local winnerNum = 0
-	local p1Num = t_gameStats.chars[t_gameStats.lastRound][1].selectNo
-	local p2Num = t_gameStats.chars[t_gameStats.lastRound][2].selectNo
-	local txt_winquoteName = ''
-	if winner == 1 then
-		winquote = getCharVictoryQuote(1)
-		txt_winquoteName = txt_p1_winquoteName
-		winnerNum = p1Num
-	else
-		winquote = getCharVictoryQuote(2)
-		txt_winquoteName = txt_p2_winquoteName
-		winnerNum = p2Num
+		main.f_menuReset(motif.victorybgdef.bg, motif.music.victory_bgm, motif.music.victory_bgm_loop, motif.music.victory_bgm_volume, motif.music.victory_bgm_loopstart, motif.music.victory_bgm_loopend)
 	end
-	if winquote == nil or winquote == '' then
+	local winquote = getCharVictoryQuote(wpn)
+	if winquote == '' then
 		winquote = motif.victory_screen.winquote_text
 	end
-	textImgSetText(txt_p1_winquoteName, main.f_getName(p1Num))
-	textImgSetText(txt_p2_winquoteName, main.f_getName(p2Num))
+	textImgSetText(txt_p1_winquoteName, main.f_getName(wsn))
+	textImgSetText(txt_p2_winquoteName, main.f_getName(lsn))
 	local i = 0
 	main.f_cmdInput()
+	main.fadeStart = getFrameCount()
+	local counter = 0 - motif.victory_screen.fadein_time
+	fadeType = 'fadein'
 	while true do
-		if esc() or main.f_btnPalNo(main.p1Cmd) > 0 then
-			main.f_cmdInput()
-			break
-		elseif motif.victorybgdef.timer >= motif.victory_screen.time then
-			--add fadeout code here
+		if esc() then
 			main.f_cmdInput()
 			break
+		elseif fadeType == 'fadein' and (counter >= motif.victory_screen.time or main.f_btnPalNo(main.p1Cmd) > 0) then
+			main.fadeStart = getFrameCount()
+			fadeType = 'fadeout'
 		end
+		counter = counter + 1
 		--draw clearcolor
-		animDraw(motif.victorybgdef.bgclearcolor_data)
+		clearColor(motif.victorybgdef.bgclearcolor[1], motif.victorybgdef.bgclearcolor[2], motif.victorybgdef.bgclearcolor[3])
 		--draw layerno = 0 backgrounds
-		main.f_drawBG(motif.victorybgdef.bg_data, motif.victorybgdef.bg, 0, motif.victorybgdef.timer, {320,240})
+		bgDraw(motif.victorybgdef.bg, false)
 		--draw portraits
-		if motif.victory_screen.p2_display == 0 then
+		-- looser team portraits
+		for n = 1, #t2 do
+			if n > motif.victory_screen.p2_num then
+				break
+			end
 			drawVictoryPortrait(
-				winnerNum,
-				motif.victory_screen.p1_offset[1],
-				motif.victory_screen.p1_offset[2],
-				motif.victory_screen.p1_facing * motif.victory_screen.p1_scale[1],
-				motif.victory_screen.p1_scale[2]
+				t[n],
+				motif.victory_screen.p2_pos[1] + motif.victory_screen.p2_offset[1] + motif.victory_screen['p2_c' .. n + 1 .. '_offset'][1] + select.f_alignOffset(motif.victory_screen.p2_facing),
+				motif.victory_screen.p2_pos[2] + motif.victory_screen.p2_offset[2] + motif.victory_screen['p2_c' .. n + 1 .. '_offset'][2],
+				motif.victory_screen.p2_facing * motif.victory_screen.p2_scale[1] * motif.victory_screen['p2_c' .. n + 1 .. '_scale'][1],
+				motif.victory_screen.p2_scale[2] * motif.victory_screen['p2_c' .. n + 1 .. '_scale'][2]
 			)
-		else
+		end
+		-- looser portrait
+		if motif.victory_screen.p2_num > 0 then
 			drawVictoryPortrait(
-				p1Num,
-				motif.victory_screen.p1_offset[1],
-				motif.victory_screen.p1_offset[2],
-				motif.victory_screen.p1_facing * motif.victory_screen.p1_scale[1],
-				motif.victory_screen.p1_scale[2]
+				lsn,
+				motif.victory_screen.p2_pos[1] + motif.victory_screen.p2_offset[1] + motif.victory_screen.p2_c1_offset[1] + select.f_alignOffset(motif.victory_screen.p2_facing),
+				motif.victory_screen.p2_pos[2] + motif.victory_screen.p2_offset[2] + motif.victory_screen.p2_c1_offset[2],
+				motif.victory_screen.p2_facing * motif.victory_screen.p2_scale[1] * motif.victory_screen.p2_c1_scale[1],
+				motif.victory_screen.p2_scale[2] * motif.victory_screen.p2_c1_scale[2]
 			)
+		end
+		-- winner team portraits
+		for n = 1, #t do
+			if n > motif.victory_screen.p1_num then
+				break
+			end
 			drawVictoryPortrait(
-				p2Num,
-				motif.victory_screen.p2_offset[1],
-				motif.victory_screen.p2_offset[2],
-				motif.victory_screen.p2_facing * motif.victory_screen.p2_scale[1],
-				motif.victory_screen.p2_scale[2]
+				t[n],
+				motif.victory_screen.p1_pos[1] + motif.victory_screen.p1_offset[1] + motif.victory_screen['p1_c' .. n + 1 .. '_offset'][1] + select.f_alignOffset(motif.victory_screen.p1_facing),
+				motif.victory_screen.p1_pos[2] + motif.victory_screen.p1_offset[2] + motif.victory_screen['p1_c' .. n + 1 .. '_offset'][2],
+				motif.victory_screen.p1_facing * motif.victory_screen.p1_scale[1] * motif.victory_screen['p1_c' .. n + 1 .. '_scale'][1],
+				motif.victory_screen.p1_scale[2] * motif.victory_screen['p1_c' .. n + 1 .. '_scale'][2]
 			)
 		end
-		--draw winner's name
-		textImgDraw(txt_winquoteName)
+		-- winner portrait
+		drawVictoryPortrait(
+			wsn,
+			motif.victory_screen.p1_pos[1] + motif.victory_screen.p1_offset[1] + motif.victory_screen.p1_c1_offset[1] + select.f_alignOffset(motif.victory_screen.p1_facing),
+			motif.victory_screen.p1_pos[2] + motif.victory_screen.p1_offset[2] + motif.victory_screen.p1_c1_offset[2],
+			motif.victory_screen.p1_facing * motif.victory_screen.p1_scale[1] * motif.victory_screen.p1_c1_scale[1],
+			motif.victory_screen.p1_scale[2] * motif.victory_screen.p1_c1_scale[2]
+		)
+		--draw winner name
+		textImgDraw(txt_p1_winquoteName)
+		--draw looser name
+		if motif.victory_screen.looser_name_enabled == 1 then
+			textImgDraw(txt_p2_winquoteName)
+		end
 		--draw winquote
 		i = i + 1
 		main.f_textRender(
@@ -2542,14 +3086,26 @@ function select.f_selectVictory()
 			motif.victory_screen.winquote_length
 		)
 		--draw layerno = 1 backgrounds
-		main.f_drawBG(motif.victorybgdef.bg_data, motif.victorybgdef.bg, 1, motif.victorybgdef.timer, {320,240})
-		--draw fadein
-		animDraw(motif.victory_screen.fadein_data)
-		animUpdate(motif.victory_screen.fadein_data)
-		--update timer
-		motif.victorybgdef.timer = motif.victorybgdef.timer + 1
-		--end loop
-		main.f_cmdInput()
+		bgDraw(motif.victorybgdef.bg, true)
+		--draw fadein / fadeout
+		main.fadeActive = fadeScreen(
+			fadeType,
+			main.fadeStart,
+			motif.victory_screen[fadeType .. '_time'],
+			motif.victory_screen[fadeType .. '_col'][1],
+			motif.victory_screen[fadeType .. '_col'][2],
+			motif.victory_screen[fadeType .. '_col'][3]
+		)
+		--frame transition
+		if main.fadeActive then
+			commandBufReset(main.p1Cmd)
+		elseif fadeType == 'fadeout' then
+			commandBufReset(main.p1Cmd)
+			clearColor(motif.victorybgdef.bgclearcolor[1], motif.victorybgdef.bgclearcolor[2], motif.victorybgdef.bgclearcolor[3]) --skip last frame rendering
+			break
+		else
+			main.f_cmdInput()
+		end
 		refresh()
 	end
 end
@@ -2567,102 +3123,126 @@ local txt_credits = main.f_createTextImg(
 	motif.continue_screen.credits_font_scale[1],
 	motif.continue_screen.credits_font_scale[2],
 	motif.continue_screen.credits_font[4],
-    motif.continue_screen.credits_font[5],
-    motif.continue_screen.credits_font[6]
+	motif.continue_screen.credits_font[5],
+	motif.continue_screen.credits_font[6],
+	motif.continue_screen.credits_font[7],
+	motif.continue_screen.credits_font[8]
 )
 
 function select.f_continue()
+	main.f_menuReset(motif.continuebgdef.bg, motif.music.continue_bgm, motif.music.continue_bgm_loop, motif.music.continue_bgm_volume, motif.music.continue_bgm_loopstart, motif.music.continue_bgm_loopend)
+	animReset(motif.continue_screen.continue_anim_data)
+	animUpdate(motif.continue_screen.continue_anim_data)
 	continue = false
-	playBGM(motif.music.continue_bgm, true, motif.music.continue_bgm_loop, motif.music.continue_bgm_volume, motif.music.continue_bgm_loopstart or "0", motif.music.continue_bgm_loopend or "0")
-	--textImgSetText(txt_credits, text[1])
+	local text = main.f_extractText(motif.continue_screen.credits_text, main.credits)
+	textImgSetText(txt_credits, text[1])
 	main.f_cmdInput()
+	main.fadeStart = getFrameCount()
+	local counter = 0-- - motif.victory_screen.fadein_time
+	fadeType = 'fadein'
 	while true do
 		--draw clearcolor (disabled to not cover area)
-		--animDraw(motif.continuebgdef.bgclearcolor_data)
+		--clearColor(motif.continuebgdef.bgclearcolor[1], motif.continuebgdef.bgclearcolor[2], motif.continuebgdef.bgclearcolor[3])
 		--draw layerno = 0 backgrounds
-		main.f_drawBG(motif.continuebgdef.bg_data, motif.continuebgdef.bg, 0, motif.continuebgdef.timer, {320,240})
+		bgDraw(motif.continuebgdef.bg, false)
 		--continue screen state
-		if esc() or motif.continuebgdef.timer > motif.continue_screen.endtime then
+		if esc() then
 			main.f_cmdInput()
 			break
-		elseif motif.continuebgdef.timer < motif.continue_screen.continue_end_skiptime then
+		elseif fadeType == 'fadein' and (counter > motif.continue_screen.endtime or continue) then
+			main.fadeStart = getFrameCount()
+			fadeType = 'fadeout'
+		elseif counter < motif.continue_screen.continue_end_skiptime then
 			if commandGetState(main.p1Cmd, 'holds') then
 				continue = true
 				main.credits = main.credits - 1
 				text = main.f_extractText(motif.continue_screen.credits_text, main.credits)
 				textImgSetText(txt_credits, text[1])
-				main.f_cmdInput()
-				main.f_resetBG(motif.select_info, motif.selectbgdef, motif.music.select_bgm, motif.music.select_bgm_loop, motif.music.select_bgm_volume, motif.music.select_bgm_loopstart, motif.music.select_bgm_loopend)
-				break
-			elseif main.f_btnPalNo(main.p1Cmd) > 0 and motif.continuebgdef.timer >= motif.continue_screen.continue_starttime + motif.continue_screen.continue_skipstart then
+			elseif main.f_btnPalNo(main.p1Cmd) > 0 and counter >= motif.continue_screen.continue_starttime + motif.continue_screen.continue_skipstart then
 				local cnt = 0
-				if motif.continuebgdef.timer < motif.continue_screen.continue_9_skiptime then
+				if counter < motif.continue_screen.continue_9_skiptime then
 					cnt = motif.continue_screen.continue_9_skiptime
-				elseif motif.continuebgdef.timer <= motif.continue_screen.continue_8_skiptime then
+				elseif counter <= motif.continue_screen.continue_8_skiptime then
 					cnt = motif.continue_screen.continue_8_skiptime
-				elseif motif.continuebgdef.timer < motif.continue_screen.continue_7_skiptime then
+				elseif counter < motif.continue_screen.continue_7_skiptime then
 					cnt = motif.continue_screen.continue_7_skiptime
-				elseif motif.continuebgdef.timer < motif.continue_screen.continue_6_skiptime then
+				elseif counter < motif.continue_screen.continue_6_skiptime then
 					cnt = motif.continue_screen.continue_6_skiptime
-				elseif motif.continuebgdef.timer < motif.continue_screen.continue_5_skiptime then
+				elseif counter < motif.continue_screen.continue_5_skiptime then
 					cnt = motif.continue_screen.continue_5_skiptime
-				elseif motif.continuebgdef.timer < motif.continue_screen.continue_4_skiptime then
+				elseif counter < motif.continue_screen.continue_4_skiptime then
 					cnt = motif.continue_screen.continue_4_skiptime
-				elseif motif.continuebgdef.timer < motif.continue_screen.continue_3_skiptime then
+				elseif counter < motif.continue_screen.continue_3_skiptime then
 					cnt = motif.continue_screen.continue_3_skiptime
-				elseif motif.continuebgdef.timer < motif.continue_screen.continue_2_skiptime then
+				elseif counter < motif.continue_screen.continue_2_skiptime then
 					cnt = motif.continue_screen.continue_2_skiptime
-				elseif motif.continuebgdef.timer < motif.continue_screen.continue_1_skiptime then
+				elseif counter < motif.continue_screen.continue_1_skiptime then
 					cnt = motif.continue_screen.continue_1_skiptime
-				elseif motif.continuebgdef.timer < motif.continue_screen.continue_0_skiptime then
+				elseif counter < motif.continue_screen.continue_0_skiptime then
 					cnt = motif.continue_screen.continue_0_skiptime
 				end
-				while motif.continuebgdef.timer < cnt do
-					motif.continuebgdef.timer = motif.continuebgdef.timer + 1
+				while counter < cnt do
+					counter = counter + 1
 					animUpdate(motif.continue_screen.continue_anim_data)
 				end
 			end
-			if motif.continuebgdef.timer == motif.continue_screen.continue_9_skiptime then
+			if counter == motif.continue_screen.continue_9_skiptime then
 				sndPlay(motif.files.continue_snd_data, motif.continue_screen.continue_9_snd[1], motif.continue_screen.continue_9_snd[2])
-			elseif motif.continuebgdef.timer == motif.continue_screen.continue_8_skiptime then
+			elseif counter == motif.continue_screen.continue_8_skiptime then
 				sndPlay(motif.files.continue_snd_data, motif.continue_screen.continue_8_snd[1], motif.continue_screen.continue_8_snd[2])
-			elseif motif.continuebgdef.timer == motif.continue_screen.continue_7_skiptime then
+			elseif counter == motif.continue_screen.continue_7_skiptime then
 				sndPlay(motif.files.continue_snd_data, motif.continue_screen.continue_7_snd[1], motif.continue_screen.continue_7_snd[2])
-			elseif motif.continuebgdef.timer == motif.continue_screen.continue_6_skiptime then
+			elseif counter == motif.continue_screen.continue_6_skiptime then
 				sndPlay(motif.files.continue_snd_data, motif.continue_screen.continue_6_snd[1], motif.continue_screen.continue_6_snd[2])
-			elseif motif.continuebgdef.timer == motif.continue_screen.continue_5_skiptime then
+			elseif counter == motif.continue_screen.continue_5_skiptime then
 				sndPlay(motif.files.continue_snd_data, motif.continue_screen.continue_5_snd[1], motif.continue_screen.continue_5_snd[2])
-			elseif motif.continuebgdef.timer == motif.continue_screen.continue_4_skiptime then
+			elseif counter == motif.continue_screen.continue_4_skiptime then
 				sndPlay(motif.files.continue_snd_data, motif.continue_screen.continue_4_snd[1], motif.continue_screen.continue_4_snd[2])
-			elseif motif.continuebgdef.timer == motif.continue_screen.continue_3_skiptime then
+			elseif counter == motif.continue_screen.continue_3_skiptime then
 				sndPlay(motif.files.continue_snd_data, motif.continue_screen.continue_3_snd[1], motif.continue_screen.continue_3_snd[2])
-			elseif motif.continuebgdef.timer == motif.continue_screen.continue_2_skiptime then
+			elseif counter == motif.continue_screen.continue_2_skiptime then
 				sndPlay(motif.files.continue_snd_data, motif.continue_screen.continue_2_snd[1], motif.continue_screen.continue_2_snd[2])
-			elseif motif.continuebgdef.timer == motif.continue_screen.continue_1_skiptime then
+			elseif counter == motif.continue_screen.continue_1_skiptime then
 				sndPlay(motif.files.continue_snd_data, motif.continue_screen.continue_1_snd[1], motif.continue_screen.continue_1_snd[2])
-			elseif motif.continuebgdef.timer == motif.continue_screen.continue_0_skiptime then
+			elseif counter == motif.continue_screen.continue_0_skiptime then
 				sndPlay(motif.files.continue_snd_data, motif.continue_screen.continue_0_snd[1], motif.continue_screen.continue_0_snd[2])
 			end
-		elseif motif.continuebgdef.timer == motif.continue_screen.continue_end_skiptime then
-			playBGM(motif.music.continue_end_bgm, true, motif.music.continue_end_bgm_loop, motif.music.continue_end_bgm_volume, motif.music.continue_end_bgm_loopstart or "0", motif.music.continue_end_bgm_loopend or "0")
+		elseif counter == motif.continue_screen.continue_end_skiptime then
+			playBGM(motif.music.continue_end_bgm, true, motif.music.continue_end_bgm_loop, motif.music.continue_end_bgm_volume, motif.music.continue_end_bgm_loopstart, motif.music.continue_end_bgm_loopend)
 			sndPlay(motif.files.continue_snd_data, motif.continue_screen.continue_end_snd[1], motif.continue_screen.continue_end_snd[2])
 		end
 		--draw credits text
-		if motif.continuebgdef.timer >= motif.continue_screen.continue_skipstart then --show when counter starts counting down
+		if counter >= motif.continue_screen.continue_skipstart then --show when counter starts counting down
 			textImgDraw(txt_credits)
 		end
+		counter = counter + 1
 		--draw counter
 		animUpdate(motif.continue_screen.continue_anim_data)
 		animDraw(motif.continue_screen.continue_anim_data)
 		--draw layerno = 1 backgrounds
-		main.f_drawBG(motif.continuebgdef.bg_data, motif.continuebgdef.bg, 1, motif.continuebgdef.timer, {320,240})
-		--draw fadein
-		animDraw(motif.continue_screen.fadein_data)
-		animUpdate(motif.continue_screen.fadein_data)
-		--update timer
-		motif.continuebgdef.timer = motif.continuebgdef.timer + 1
-		--end loop
-		main.f_cmdInput()
+		bgDraw(motif.continuebgdef.bg, true)
+		--draw fadein / fadeout
+		main.fadeActive = fadeScreen(
+			fadeType,
+			main.fadeStart,
+			motif.continue_screen[fadeType .. '_time'],
+			motif.continue_screen[fadeType .. '_col'][1],
+			motif.continue_screen[fadeType .. '_col'][2],
+			motif.continue_screen[fadeType .. '_col'][3]
+		)
+		--frame transition
+		if main.fadeActive then
+			commandBufReset(main.p1Cmd)
+		elseif fadeType == 'fadeout' then
+			commandBufReset(main.p1Cmd)
+			clearColor(motif.continuebgdef.bgclearcolor[1], motif.continuebgdef.bgclearcolor[2], motif.continuebgdef.bgclearcolor[3]) --skip last frame rendering
+			if continue then
+				main.f_menuReset(motif.selectbgdef.bg, motif.music.select_bgm, motif.music.select_bgm_loop, motif.music.select_bgm_volume, motif.music.select_bgm_loopstart, motif.music.select_bgm_loopend)
+			end
+			break
+		else
+			main.f_cmdInput()
+		end
 		refresh()
 	end
 end

--- a/script/storyboard.lua
+++ b/script/storyboard.lua
@@ -7,35 +7,10 @@ storyboard.t_storyboard = {} --stores all parsed storyboards (we parse each of t
 
 local function f_reset(t)
 	for k, v in pairs(t.scene) do
-		if t.scene[k].fadein_data ~= nil then
-			animReset(t.scene[k].fadein_data)
-			animUpdate(t.scene[k].fadein_data)
-		end
-		if t.scene[k].fadeout_data ~= nil then
-			animReset(t.scene[k].fadeout_data)
-			animUpdate(t.scene[k].fadeout_data)
-		end
 		if t.scene[k].bg_name ~= '' then
-			local t_bgdef = t[t.scene[k].bg_name .. 'def']
-			for i = 1, #t_bgdef do
-				t_bgdef[i].ctrl_flags.visible = 1
-				t_bgdef[i].ctrl_flags.enabled = 1
-				t_bgdef[i].ctrl_flags.velx = 0
-				t_bgdef[i].ctrl_flags.vely = 0
-				animReset(t.scene[k].bg_data[i])
-				animAddPos(t.scene[k].bg_data[i], 0 - t_bgdef[i].ctrl_flags.x, 0 - t_bgdef[i].ctrl_flags.y)
-				animUpdate(t.scene[k].bg_data[i])
-				t_bgdef[i].ctrl_flags.x = 0
-				t_bgdef[i].ctrl_flags.y = 0
-				for k2, v2 in pairs(t_bgdef[i].ctrl) do
-					for j = 1, #t_bgdef[i].ctrl[k2] do
-						t_bgdef[i].ctrl[k2][j].timer[1] = t_bgdef[i].ctrl[k2][j].time[1]
-						t_bgdef[i].ctrl[k2][j].timer[2] = t_bgdef[i].ctrl[k2][j].time[2]
-						t_bgdef[i].ctrl[k2][j].timer[3] = t_bgdef[i].ctrl[k2][j].time[3]
-					end
-				end
-			end
+			bgReset(t.scene[k].bg)
 		end
+		
 		for k2, v2 in pairs(t.scene[k].layer) do
 			if t.scene[k].layer[k2].anim_data ~= nil then
 				animReset(t.scene[k].layer[k2].anim_data)
@@ -47,21 +22,24 @@ local function f_reset(t)
 end
 
 local function f_play(t)
+	playBGM('')
 	main.f_printTable(t, 'debug/t_storyboard.txt')
 	--loop through scenes in order
 	for k, v in main.f_sortKeys(t.scene) do
 		--scene >= startscene
 		if k >= t.scenedef.startscene then
+			local fadeType = 'fadein'
+			local fadeStart = getFrameCount()
 			for i = 0, t.scene[k].end_time do
 				--end storyboard
-				if esc() or main.f_btnPalNo(main.p1Cmd) > 0 and t.scenedef.skipbutton > 0 then
+				if (esc() or main.f_btnPalNo(main.p1Cmd) > 0) and t.scenedef.skipbutton > 0 then
 					main.f_cmdInput()
 					refresh()
 					return
 				end
 				--play bgm
 				if i == 0 and t.scene[k].bgm ~= nil then
-					playBGM(t.scene[k].bgm, true, t.scene[k].bgm_loop, t.scene[k].bgm_volume, t.scene[k].bgm_loopstart or "0", t.scene[k].bgm_loopend or "0")
+					playBGM(t.scene[k].bgm, true, t.scene[k].bgm_loop, t.scene[k].bgm_volume, t.scene[k].bgm_loopstart, t.scene[k].bgm_loopend)
 				end
 				--play snd
 				if t.scenedef.snd_data ~= nil then
@@ -71,11 +49,11 @@ local function f_play(t)
 						end
 					end
 				end
-				--clearcolor
-				animDraw(t.scene[k].clearcolor_data)
+				--draw clearcolor
+				clearColor(t.scene[k].clearcolor[1], t.scene[k].clearcolor[2], t.scene[k].clearcolor[3])
 				--draw layerno = 0 backgrounds
 				if t.scene[k].bg_name ~= '' then
-					main.f_drawBG(t.scene[k].bg_data, t[t.scene[k].bg_name .. 'def'], 0, i, t.info.localcoord)
+					bgDraw(t.scene[k].bg, false)
 				end
 				--loop through layers in order
 				for k2, v2 in main.f_sortKeys(t.scene[k].layer) do
@@ -95,7 +73,7 @@ local function f_play(t)
 								t.scene[k].layerall_pos[1] + t.scene[k].layer[k2].offset[1],
 								t.scene[k].layerall_pos[2] + t.scene[k].layer[k2].offset[2],
 								t.scene[k].layer[k2].text_spacing[2],
-								t.scene[k].layer[k2].textdelay,
+								t.scene[k].layer[k2].text_delay,
 								t.scene[k].layer[k2].text_length
 							)
 							end
@@ -103,38 +81,38 @@ local function f_play(t)
 				end
 				--draw layerno = 1 backgrounds
 				if t.scene[k].bg_name ~= '' then
-					main.f_drawBG(t.scene[k].bg_data, t[t.scene[k].bg_name .. 'def'], 1, i, t.info.localcoord)
+					bgDraw(t.scene[k].bg, true)
 				end
-				--fadein
-				if i <= t.scene[k].fadein_time then
-					animDraw(t.scene[k].fadein_data)
-					animUpdate(t.scene[k].fadein_data)
-				end
-				--fadeout
-				if i >= t.scene[k].end_time - t.scene[k].fadeout_time then
-					animDraw(t.scene[k].fadeout_data)
-					animUpdate(t.scene[k].fadeout_data)
-				end
-				if main.f_btnPalNo(main.p1Cmd) > 0 and t.scenedef.skipbutton <= 0 then
-					main.f_cmdInput()
-					refresh()
-					do
-						break
-					end
+				--draw fadein / fadeout
+				if i == t.scene[k].end_time - t.scene[k].fadeout_time then
+					fadeType = 'fadeout'
+					fadeStart = getFrameCount()
 				end
+				main.fadeActive = fadeScreen(
+					fadeType,
+					fadeStart,
+					t.scene[k][fadeType .. '_time'],
+					t.scene[k][fadeType .. '_col'][1],
+					t.scene[k][fadeType .. '_col'][2],
+					t.scene[k][fadeType .. '_col'][3]
+				)
+				--if main.f_btnPalNo(main.p1Cmd) > 0 and t.scenedef.skipbutton <= 0 then
+				--	main.f_cmdInput()
+				--	refresh()
+				--	do
+				--		break
+				--	end
+				--end
 				main.f_cmdInput()
 				refresh()
 			end
 		end
 	end
-	playBGM('', true, 1, 100, "0", "0")
 end
 
 local function f_parse(path)
-	-- Intro haves his own localcoord function
-	-- So we disable it
+	--storyboards use their own localcoord function, so we disable it
 	main.SetDefaultScale()
-	
 	local file = io.open(path, 'r')
 	local fileDir, fileName = path:match('^(.-)([^/\\]+)$')
 	local t = {}
@@ -142,95 +120,32 @@ local function f_parse(path)
 	local pos_default = {}
 	local pos_val = {}
 	t.anim = {}
-	t.ctrldef = {}
 	t.scene = {}
+	t.def = fileDir .. fileName
 	t.fileDir = fileDir
 	t.fileName = fileName
-	local bgdef = 'dummyUntilSet'
-	local bgctrl = ''
-	local bgctrl_match = 'dummyUntilSet'
 	local tmp = ''
 	local t_default =
 	{
 		info = {localcoord = {320, 240}},
-		scenedef = {spr = '', snd = '', font = {[1] = 'font/f-6x9.fnt'}, font_height = {}, startscene = 0, skipbutton = 1, font_data = {}},
+		scenedef = {
+			spr = '',
+			snd = '',
+			font = {[1] = 'f-6x9.fnt'},
+			font_height = {},
+			startscene = 0,
+			skipbutton = 1, --Ikemen feature
+			font_data = {}
+		},
 		scene = {},
-		ctrldef = {}
 	}
 	for line in file:lines() do
 		line = line:gsub('%s*;.*$', '')
 		if line:match('^%s*%[.-%s*%]%s*$') then --matched [] group
 			line = line:match('^%s*%[(.-)%s*%]%s*$') --match text between []
 			line = line:gsub('[%. ]', '_') --change . and space to _
-			line = line:lower() --lowercase line
-			local row = tostring(line:lower()) --just in case it's a number (not really needed)
-			if row:match('.+ctrldef') then --matched ctrldef start
-				bgctrl = row
-				bgctrl_match = bgctrl:match('^(.-ctrl)def')
-				if t.ctrldef[bgdef .. 'def'][bgctrl] ~= nil then --Ctrldef名の重複を避ける
-					bgctrl = bgctrl..tostring(os.clock())
-				end
-				t.ctrldef[bgdef .. 'def'][bgctrl] = {}
-				t.ctrldef[bgdef .. 'def'][bgctrl].ctrl = {}
-				pos = t.ctrldef[bgdef .. 'def'][bgctrl]
-				t_default.ctrldef[bgdef .. 'def'][bgctrl] = {
-					looptime = -1,
-					ctrlid = {0},
-					ctrl = {}
-				}
-			elseif row:match('^' .. bgctrl_match) then --matched ctrldef content
-				tmp = t.ctrldef[bgdef .. 'def'][bgctrl].ctrl
-				tmp[#tmp + 1] = {}
-				pos = tmp[#tmp]
-				t_default.ctrldef[bgdef .. 'def'][bgctrl].ctrl[#tmp] = {
-					type = 'null',
-					time = {0, -1, -1},
-					ctrlid = {}
-				}
-			elseif row:match('.+def$') and not row:match('^scenedef$') --[[and not row:match('^' .. bgdef .. '.*$')]] then --matched bgdef start
-				t[row] = {}
-				pos = t[row]
-				bgdef = row:match('(.+)def$')
-				t_default[row] = {}
-				t.ctrldef[bgdef .. 'def'] = {}
-				t_default.ctrldef[bgdef .. 'def'] = {}
-			elseif row:match('^' .. bgdef) then --matched bgdef content
-				tmp = t[bgdef .. 'def']
-				tmp[#tmp + 1] = {}
-				pos = tmp[#tmp]
-				t_default[bgdef .. 'def'][#tmp] =
-				{
-					type = 'normal',
-					spriteno = {0, 0},
-					id = 0,
-					layerno = 0,
-					start = {0, 0},
-					delta = {1, 1},
-					trans = '',
-					mask = 0,
-					tile = {0, 0},
-					tilespacing = {0, nil},
-					--window = {0, 0, 0, 0},
-					--windowdelta = {0, 0}, --not supported yet
-					--width = {0, 0}, --not supported yet (parallax)
-					--xscale = {1.0, 1.0}, --not supported yet (parallax)
-					--yscalestart = 100, --not supported yet (parallax)
-					--yscaledelta = 1, --not supported yet (parallax)
-					positionlink = 0,
-					velocity = {0, 0},
-					--sin_x = {0, 0, 0}, --not supported yet
-					--sin_y = {0, 0, 0}, --not supported yet
-					ctrl = {},
-					ctrl_flags = {
-						visible = 1,
-						enabled = 1,
-						velx = 0,
-						vely = 0,
-						x = 0,
-						y = 0
-					}
-				}
-			elseif row:match('^scene_[0-9]+$') then --matched scene
+			local row = tostring(line:lower())
+			if row:match('^scene_[0-9]+$') then --matched scene
 				row = tonumber(row:match('^scene_([0-9]+)$'))
 				t.scene[row] = {}
 				pos = t.scene[row]
@@ -249,9 +164,9 @@ local function f_parse(path)
 					sound = {},
 					--bgm = '',
 					bgm_loop = 0,
-					bgm_volume = 100,
-					bgm_loopstart = nil,
-					bgm_loopend = nil,
+					bgm_volume = 100,  --Ikemen feature
+					bgm_loopstart = 0, --Ikemen feature
+					bgm_loopend = 0, --Ikemen feature
 					--window = {0, 0, 0, 0},
 					bg_name = ''
 				}
@@ -272,7 +187,7 @@ local function f_parse(path)
 				value = value:gsub('"', '') --remove brackets from value
 				value = value:gsub('^(%.[0-9])', '0%1') --add 0 before dot if missing at the beginning of matched string
 				value = value:gsub('([^0-9])(%.[0-9])', '%10%2') --add 0 before dot if missing anywhere else
-				if param:match('^font[0-9]+$') then --font param matched
+				if param:match('^font[0-9]+') then --font param matched
 					local num = tonumber(param:match('font([0-9]+)'))
 					if param:match('_height$') then
 						if pos.font_height == nil then
@@ -280,6 +195,7 @@ local function f_parse(path)
 						end
 						pos.font_height[num] = main.f_dataType(value)
 					else
+						value = value:gsub('\\', '/')
 						if pos.font == nil then
 							pos.font = {}
 						end
@@ -295,9 +211,9 @@ local function f_parse(path)
 							{
 								anim = -1,
 								text = '',
-								font = {1, 0, 0, nil, nil, nil},
+								font = {1, 0, 0, 255, 255, 255, 255, 0},
 								text_spacing = {0, 15}, --Ikemen feature
-								textdelay = 2,
+								text_delay = 2, --Ikemen feature
 								text_length = 50, --Ikemen feature
 								text_timer = 0, --Ikemen feature
 								offset = {0, 0},
@@ -330,9 +246,9 @@ local function f_parse(path)
 									pos_val[param] = {}
 								end
 								if c == '' then
-									pos_val[param][#pos_val[param] + 1] = 0
+									table.insert(pos_val[param], 0)
 								else
-									pos_val[param][#pos_val[param] + 1] = main.f_dataType(c)
+									table.insert(pos_val[param], main.f_dataType(c))
 								end
 							end
 						else --single value
@@ -342,11 +258,11 @@ local function f_parse(path)
 				end
 			else --only valid lines left are animations
 				line = line:lower()
-				local value = line:match('^%s*([0-9%-]+%s*,%s*[0-9%-]+%s*,%s*[0-9%-]+%s*,%s*[0-9%-]+%s*,%s*[0-9%-]+.-)[,%s]*$') or line:match('^%s*loopstart') or line:match('^%s*interpolate offset') or line:match('^%s*interpolate angle') or line:match('^%s*interpolate scale') or line:match('^%s*interpolate blend')
+				local value = line:match('^%s*([0-9%-]+%s*,%s*[0-9%-]+%s*,%s*[0-9%-]+%s*,%s*[0-9%-]+%s*,%s*[0-9%-]+.-)[,%s]*$') or line:match('^%s*loopstart') or line:match('^%s*interpolate [oasb][fncl][fgae][sln][ed]t?')
 				if value ~= nil then
 					value = value:gsub(',%s*,', ',0,') --add missing values
 					value = value:gsub(',%s*$', '')
-					pos[#pos + 1] = value
+					table.insert(pos, value)
 				end
 			end
 		end
@@ -357,30 +273,6 @@ local function f_parse(path)
 	--;===========================================================
 	--merge tables
 	t = main.f_tableMerge(t_default, t)
-	--ctrldef table adjustment
-	for k, v in pairs(t.ctrldef) do
-		for k2, v2 in pairs(t.ctrldef[k]) do
-			tmp = t.ctrldef[k][k2].ctrl
-			for i = 1, #tmp do
-				--if END_TIME is omitted it should default to the same value as START_TIME
-				if tmp[i].time[2] == -1 then
-					tmp[i].time[2] = tmp[i].time[1]
-				end
-				--if LOOPTIME is omitted or set to -1, the background controller will not reset its own timer. In such case use GLOBAL_LOOPTIME
-				if tmp[i].time[3] == -1 then
-					tmp[i].time[3] = t.ctrldef[k][k2].looptime
-				end
-				--lowercase type name
-				tmp[i].type = tmp[i].type:lower()
-				--this list, if specified, overrides the default list specified in the BGCtrlDef
-				if #tmp[i].ctrlid == 0 then
-					for j = 1, #t.ctrldef[k][k2].ctrlid do
-						tmp[i].ctrlid[#tmp[i].ctrlid + 1] = t.ctrldef[k][k2].ctrlid[j]
-					end
-				end
-			end
-		end
-	end
 	--scenedef spr
 	if not t.scenedef.spr:match('^data/') then
 		if main.f_fileExists(t.fileDir .. t.scenedef.spr) then
@@ -403,18 +295,11 @@ local function f_parse(path)
 	end
 	--scenedef fonts
 	for k, v in pairs(t.scenedef.font) do --loop through table keys
-		if t.scenedef.font[k] ~= '' then
-			if not t.scenedef.font[k]:match('^data/') then
-				if main.f_fileExists(t.fileDir .. t.scenedef.font[k]) then
-					t.scenedef.font[k] = t.fileDir .. t.scenedef.font[k]
-				elseif main.f_fileExists('font/' .. t.scenedef.font[k]) then
-					t.scenedef.font[k] = 'font/' .. t.scenedef.font[k]
-				end
-				t.scenedef.font_data[k] = fontNew(t.scenedef.font[k])
-				t.scenedef.font[k] = {}
-				t.scenedef.font[k][1] = k
-				t.scenedef.font[k][2] = 0
-				t.scenedef.font[k][3] = 0
+		if v ~= '' and t.scenedef.font_data[v] == nil then
+			if t.scenedef.font_height[k] ~= nil then
+				t.scenedef.font_data[v] = fontNew(v, t.scenedef.font_height[k])
+			else
+				t.scenedef.font_data[v] = fontNew(v)
 			end
 		end
 	end
@@ -422,8 +307,9 @@ local function f_parse(path)
 	local prev_k = ''
 	for k, v in main.f_sortKeys(t.scene) do
 		--bgm
-		if t.scene[k].bgm ~= nil and not t.scene[k].bgm:match('^data/') then
-			if main.f_fileExists(t.fileDir .. t.scene[k].bgm) then
+		if t.scene[k].bgm ~= nil then
+			if t.scene[k].bgm:match('^data/') then
+			elseif main.f_fileExists(t.fileDir .. t.scene[k].bgm) then
 				t.scene[k].bgm = t.fileDir .. t.scene[k].bgm
 			elseif main.f_fileExists('music/' .. t.scene[k].bgm) then
 				t.scene[k].bgm = 'music/' .. t.scene[k].bgm
@@ -445,83 +331,11 @@ local function f_parse(path)
 			end
 		end
 		prev_k = k
-		--backgrounds data
-		local anim = ''
+		--backgrounds
 		if t.scene[k].bg_name ~= '' then
-			t.scene[k].bg_data = {}
-			t.scene[k].bg_name = t.scene[k].bg_name:lower()
-			local t_bgdef = t[t.scene[k].bg_name .. 'def']
-			local prev_k2 = ''
-			for k2, v2 in pairs(t_bgdef) do --loop through table keys
-				if type(k2) == "number" and t_bgdef[k2].type ~= nil then
-					t_bgdef[k2].type = t_bgdef[k2].type:lower()
-					--mugen ignores delta = 0 (defaults to 1)
-					if t_bgdef[k2].delta[1] == 0 then t_bgdef[k2].delta[1] = 1 end
-					if t_bgdef[k2].delta[2] == 0 then t_bgdef[k2].delta[2] = 1 end
-					--add ctrl data
-					t[t.scene[k].bg_name .. 'def'][k2].ctrl = main.f_ctrlBG(t_bgdef[k2], t.ctrldef[t.scene[k].bg_name .. 'def'])
-					--positionlink adjustment
-					if t_bgdef[k2].positionlink == 1 and prev_k2 ~= '' then
-						t_bgdef[k2].start[1] = t_bgdef[prev_k2].start[1]
-						t_bgdef[k2].start[2] = t_bgdef[prev_k2].start[2]
-						t_bgdef[k2].delta[1] = t_bgdef[prev_k2].delta[1]
-						t_bgdef[k2].delta[2] = t_bgdef[prev_k2].delta[2]
-					end
-					prev_k2 = k2
-					--generate anim data
-					local sizeX, sizeY, offsetX, offsetY = 0, 0, 0, 0
-					if t_bgdef[k2].type == 'anim' then
-						anim = main.f_animFromTable(t.anim[t_bgdef[k2].actionno], t.scenedef.spr_data, t_bgdef[k2].start[1], t_bgdef[k2].start[2])
-					else --normal, parallax
-						anim = t_bgdef[k2].spriteno[1] .. ', ' .. t_bgdef[k2].spriteno[2] .. ', ' .. t_bgdef[k2].start[1] .. ', ' .. t_bgdef[k2].start[2] .. ', ' .. -1
-						anim = animNew(t.scenedef.spr_data, anim)
-						sizeX, sizeY, offsetX, offsetY = getSpriteInfo(t.scenedef.spr, t_bgdef[k2].spriteno[1], t_bgdef[k2].spriteno[2])
-					end
-					if t_bgdef[k2].trans == 'add1' then
-						animSetAlpha(anim, 255, 128)
-					elseif t_bgdef[k2].trans == 'add' then
-						animSetAlpha(anim, 255, 255)
-					elseif t_bgdef[k2].trans == 'sub' then
-						animSetAlpha(anim, 1, 255)
-					end
-					animAddPos(anim, 160, 0) --for some reason needed in ikemen
-					if t_bgdef[k2].window ~= nil then
-						animSetWindow(
-							anim,
-							t_bgdef[k2].window[1] * 320/t.info.localcoord[1],
-							t_bgdef[k2].window[2] * 240/t.info.localcoord[2],
-							(t_bgdef[k2].window[3] - t_bgdef[k2].window[1] + 1)* 320/t.info.localcoord[1],
-							(t_bgdef[k2].window[4] - t_bgdef[k2].window[2] + 1) * 240/t.info.localcoord[2]
-						)
-					else
-						animSetWindow(anim, 0, 0, t.info.localcoord[1], t.info.localcoord[2])
-					end
-					if t_bgdef[k2].tilespacing[2] == nil then t_bgdef[k2].tilespacing[2] = t_bgdef[k2].tilespacing[1] end
-					if t_bgdef[k2].type == 'parallax' then
-						animSetTile(anim, t_bgdef[k2].tile[1], 0, t_bgdef[k2].tilespacing[1] + sizeX, t_bgdef[k2].tilespacing[2] + sizeY)
-					else
-						animSetTile(anim, t_bgdef[k2].tile[1], t_bgdef[k2].tile[2], t_bgdef[k2].tilespacing[1] + sizeX, t_bgdef[k2].tilespacing[2] + sizeY)
-					end
-					animSetScale(anim, 320/t.info.localcoord[1], 240/t.info.localcoord[2])
-					if t_bgdef[k2].mask == 1 or t_bgdef[k2].type ~= 'normal' or (t_bgdef[k2].trans ~= '' and t_bgdef[k2].trans ~= 'none') then
-						animSetColorKey(anim, 0)
-					else
-						animSetColorKey(anim, -1)
-					end
-					--animUpdate(anim)
-					t.scene[k].bg_data[k2] = anim
-				end
-			end
+			t.scene[k].bg = bgNew(t.def, t.scene[k].bg_name:lower(), t.scenedef.spr)
+			bgReset(t.scene[k].bg)
 		end
-		--clearcolor data
-		t.scene[k].clearcolor_data = main.f_clearColor(t.scene[k].clearcolor[1], t.scene[k].clearcolor[2], t.scene[k].clearcolor[3])
-		animSetWindow(t.scene[k].clearcolor_data, 0, 0, t.info.localcoord[1], t.info.localcoord[2])
-		--fadein data
-		t.scene[k].fadein_data = main.f_fadeAnim(1, t.scene[k].fadein_time, t.scene[k].fadein_col[1], t.scene[k].fadein_col[2], t.scene[k].fadein_col[3])
-		animSetWindow(t.scene[k].fadein_data, 0, 0, t.info.localcoord[1], t.info.localcoord[2])
-		--fadeout data
-		t.scene[k].fadeout_data = main.f_fadeAnim(0, t.scene[k].fadeout_time, t.scene[k].fadeout_col[1], t.scene[k].fadeout_col[2], t.scene[k].fadeout_col[3])
-		animSetWindow(t.scene[k].fadeout_data, 0, 0, t.info.localcoord[1], t.info.localcoord[2])
 		--loop through scene layers
 		local t_layer = t.scene[k].layer
 		for k2, v2 in pairs(t_layer) do
@@ -533,12 +347,12 @@ local function f_parse(path)
 					t.scene[k].layerall_pos[1] + t_layer[k2].offset[1],
 					t.scene[k].layerall_pos[2] + t_layer[k2].offset[2]
 				)
-				animSetScale(t.scene[k].layer[k2].anim_data, 320/t.info.localcoord[1], 240/t.info.localcoord[2])
+				--animSetScale(t.scene[k].layer[k2].anim_data, 320/t.info.localcoord[1], 240/t.info.localcoord[2])
 			end
 			--text
 			if t_layer[k2].text ~= '' then
 				t.scene[k].layer[k2].text_data = main.f_createTextImg(
-					t.scenedef.font_data[t.scenedef.font[t_layer[k2].font[1]][1]],
+					t.scenedef.font_data[t_layer[k2].font[1]],
 					t_layer[k2].font[2],
 					t_layer[k2].font[3],
 					t_layer[k2].text,
@@ -548,7 +362,9 @@ local function f_parse(path)
 					240/t.info.localcoord[2],
 					t_layer[k2].font[4],
 					t_layer[k2].font[5],
-					t_layer[k2].font[6]
+					t_layer[k2].font[6],
+					t_layer[k2].font[7],
+					t_layer[k2].font[8]
 				)
 			end
 			--endtime
@@ -557,12 +373,8 @@ local function f_parse(path)
 			end
 		end
 	end
-	--t.ctrldef = nil
-	
-	-- Finished loading intro
-	-- Re-enabled custom scaling
+	--finished loading storyboard, re-enable custom scaling
 	main.SetScaleValues()
-	
 	return t
 end
 

--- /dev/null
+++ b/src/bgdef.go
@@ -0,0 +1,342 @@
+package main
+
+import (
+	"strings"
+)
+
+func (bgct *bgcTimeLine) stepBGDef(s *BGDef) {
+	if len(bgct.line) > 0 && bgct.line[0].waitTime <= 0 {
+		for _, b := range bgct.line[0].bgc {
+			for i, a := range bgct.al {
+				if b.idx < a.idx {
+					bgct.al = append(bgct.al, nil)
+					copy(bgct.al[i+1:], bgct.al[i:])
+					bgct.al[i] = b
+					b = nil
+					break
+				}
+			}
+			if b != nil {
+				bgct.al = append(bgct.al, b)
+			}
+		}
+		bgct.line = bgct.line[1:]
+	}
+	if len(bgct.line) > 0 {
+		bgct.line[0].waitTime--
+	}
+	var el []*bgCtrl
+	for i := 0; i < len(bgct.al); {
+		s.runBgCtrl(bgct.al[i])
+		if bgct.al[i].currenttime > bgct.al[i].endtime {
+			el = append(el, bgct.al[i])
+			bgct.al = append(bgct.al[:i], bgct.al[i+1:]...)
+			continue
+		}
+		i++
+	}
+	for _, b := range el {
+		bgct.add(b)
+	}
+}
+
+type BGDef struct {
+	def            string
+	localcoord     [2]float32
+	sffloc         string
+	sff            *Sff
+	at             AnimationTable
+	bg             []*backGround
+	bgc            []bgCtrl
+	bgct           bgcTimeLine
+	bga            bgAction
+	resetbg        bool
+	localscl       float32
+	scale          [2]float32
+}
+
+func newBGDef(def string) *BGDef {
+	s := &BGDef{def: def, localcoord: [...]float32{320, 240}, resetbg: true, localscl: 1, scale: [...]float32{1, 1}}
+	return s
+}
+
+func loadBGDef(def string, bgname string, sffloc string) (int, error) {
+	s := newBGDef(def)
+	str, err := LoadText(def)
+	if err != nil {
+		return -1, err
+	}
+	s.sff = &Sff{}
+	lines, i := SplitAndTrim(str, "\n"), 0
+	defmap := make(map[string][]IniSection)
+	for i < len(lines) {
+		is, name, _ := ReadIniSection(lines, &i)
+		if i := strings.IndexAny(name, " \t"); i >= 0 {
+			if name[:i] == bgname {
+				defmap[bgname] = append(defmap[bgname], is)
+			}
+		} else {
+			defmap[name] = append(defmap[name], is)
+		}
+	}
+	i = 0
+	if sec := defmap["info"]; len(sec) > 0 {
+		sec[0].readF32ForStage("localcoord", &s.localcoord[0], &s.localcoord[1])
+	}
+	var ok, skipat bool
+	var filename string
+	bgnum := -1
+	if sffloc != "" {
+		filename = sffloc
+	} else if sec := defmap["files"]; len(sec) > 0 {
+		if sec[0].LoadFile("spr", def, func(filename string) error {
+			filename = strings.Replace(filename, "\\", "/", -1)
+			return nil
+		}); err != nil {
+			return -1, err
+		}
+	}
+	for j := 0; j < len(sys.bgdef); j++ {
+		if !ok && sys.bgdef[j].sffloc == filename {
+			*s.sff = *sys.bgdef[j].sff
+			bgnum = j
+			ok = true
+		}
+		if sys.bgdef[j].def == def && ok {
+			skipat = true
+			break
+		}
+	}
+	if !ok { //skip loadSFF if already loaded
+		sff, err := loadSff(filename, false)
+		if err != nil {
+			return -1, err
+		}
+		*s.sff = *sff
+	}
+	s.sffloc = filename
+	if skipat { //skip ReadAnimationTable if already parsed
+		s.at = sys.bgdef[bgnum].at
+	} else {
+		s.at = ReadAnimationTable(s.sff, lines, &i)
+	}
+	var bglink *backGround
+	for _, bgsec := range defmap[bgname] {
+		if len(s.bg) > 0 && s.bg[len(s.bg)-1].positionlink {
+			bglink = s.bg[len(s.bg)-1]
+		}
+		s.bg = append(s.bg, readBackGround(bgsec, bglink,
+			s.sff, s.at, 0))
+	}
+	bgcdef := *newBgCtrl()
+	i = 0
+	for i < len(lines) {
+		is, name, _ := ReadIniSection(lines, &i)
+		if len(name) > 0 && name[len(name)-1] == ' ' {
+			name = name[:len(name)-1]
+		}
+		switch name {
+		case bgname + "ctrldef":
+			bgcdef.bg, bgcdef.looptime = nil, -1
+			if ids := is.readI32CsvForStage("ctrlid"); len(ids) > 0 &&
+				(len(ids) > 1 || ids[0] != -1) {
+				kishutu := make(map[int32]bool)
+				for _, id := range ids {
+					if kishutu[id] {
+						continue
+					}
+					bgcdef.bg = append(bgcdef.bg, s.getBg(id)...)
+					kishutu[id] = true
+				}
+			} else {
+				bgcdef.bg = append(bgcdef.bg, s.bg...)
+			}
+			is.ReadI32("looptime", &bgcdef.looptime)
+		case bgname + "ctrl":
+			bgc := newBgCtrl()
+			*bgc = bgcdef
+			if ids := is.readI32CsvForStage("ctrlid"); len(ids) > 0 {
+				bgc.bg = nil
+				if len(ids) > 1 || ids[0] != -1 {
+					kishutu := make(map[int32]bool)
+					for _, id := range ids {
+						if kishutu[id] {
+							continue
+						}
+						bgc.bg = append(bgc.bg, s.getBg(id)...)
+						kishutu[id] = true
+					}
+				} else {
+					bgc.bg = append(bgc.bg, s.bg...)
+				}
+			}
+			bgc.read(is, len(s.bgc))
+			s.bgc = append(s.bgc, *bgc)
+		}
+	}
+	//s.localscl = float32(sys.gameWidth) / float32(sys.cam.localcoord[0])
+	sys.bgdef = append(sys.bgdef, s)
+	return len(sys.bgdef)-1, nil
+}
+func (s *BGDef) getBg(id int32) (bg []*backGround) {
+	if id >= 0 {
+		for _, b := range s.bg {
+			if b.id == id {
+				bg = append(bg, b)
+			}
+		}
+	}
+	return
+}
+func (s *BGDef) runBgCtrl(bgc *bgCtrl) {
+	bgc.currenttime++
+	switch bgc._type {
+	case BT_Anim:
+		a := s.at.get(bgc.v[0])
+		if a != nil {
+			for i := range bgc.bg {
+				bgc.bg[i].actionno = bgc.v[0]
+				bgc.bg[i].anim = *a
+			}
+		}
+	case BT_Visible:
+		for i := range bgc.bg {
+			bgc.bg[i].visible = bgc.v[0] != 0
+		}
+	case BT_Enable:
+		for i := range bgc.bg {
+			bgc.bg[i].visible, bgc.bg[i].active = bgc.v[0] != 0, bgc.v[0] != 0
+		}
+	case BT_PosSet:
+		for i := range bgc.bg {
+			if bgc.xEnable() {
+				bgc.bg[i].bga.pos[0] = bgc.x
+			}
+			if bgc.yEnable() {
+				bgc.bg[i].bga.pos[1] = bgc.y
+			}
+		}
+		if bgc.positionlink {
+			if bgc.xEnable() {
+				s.bga.pos[0] = bgc.x
+			}
+			if bgc.yEnable() {
+				s.bga.pos[1] = bgc.y
+			}
+		}
+	case BT_PosAdd:
+		for i := range bgc.bg {
+			if bgc.xEnable() {
+				bgc.bg[i].bga.pos[0] += bgc.x
+			}
+			if bgc.yEnable() {
+				bgc.bg[i].bga.pos[1] += bgc.y
+			}
+		}
+		if bgc.positionlink {
+			if bgc.xEnable() {
+				s.bga.pos[0] += bgc.x
+			}
+			if bgc.yEnable() {
+				s.bga.pos[1] += bgc.y
+			}
+		}
+	case BT_SinX, BT_SinY:
+		ii := Btoi(bgc._type == BT_SinY)
+		if bgc.v[0] == 0 {
+			bgc.v[1] = 0
+		}
+		a := float32(bgc.v[2]) / 360
+		st := int32((a - float32(int32(a))) * float32(bgc.v[1]))
+		if st < 0 {
+			st += Abs(bgc.v[1])
+		}
+		for i := range bgc.bg {
+			bgc.bg[i].bga.radius[ii] = bgc.x
+			bgc.bg[i].bga.sinlooptime[ii] = bgc.v[1]
+			bgc.bg[i].bga.sintime[ii] = st
+		}
+		if bgc.positionlink {
+			s.bga.radius[ii] = bgc.x
+			s.bga.sinlooptime[ii] = bgc.v[1]
+			s.bga.sintime[ii] = st
+		}
+	case BT_VelSet:
+		for i := range bgc.bg {
+			if bgc.xEnable() {
+				bgc.bg[i].bga.vel[0] = bgc.x
+			}
+			if bgc.yEnable() {
+				bgc.bg[i].bga.vel[1] = bgc.y
+			}
+		}
+		if bgc.positionlink {
+			if bgc.xEnable() {
+				s.bga.vel[0] = bgc.x
+			}
+			if bgc.yEnable() {
+				s.bga.vel[1] = bgc.y
+			}
+		}
+	case BT_VelAdd:
+		for i := range bgc.bg {
+			if bgc.xEnable() {
+				bgc.bg[i].bga.vel[0] += bgc.x
+			}
+			if bgc.yEnable() {
+				bgc.bg[i].bga.vel[1] += bgc.y
+			}
+		}
+		if bgc.positionlink {
+			if bgc.xEnable() {
+				s.bga.vel[0] += bgc.x
+			}
+			if bgc.yEnable() {
+				s.bga.vel[1] += bgc.y
+			}
+		}
+	}
+}
+func (s *BGDef) action() {
+	s.bgct.stepBGDef(s)
+	s.bga.action()
+	link := 0
+	for i, b := range s.bg {
+		s.bg[i].bga.action()
+		if i > 0 && b.positionlink {
+			s.bg[i].bga.offset[0] += s.bg[link].bga.sinoffset[0]
+			s.bg[i].bga.offset[1] += s.bg[link].bga.sinoffset[1]
+		} else {
+			link = i
+		}
+		if b.active {
+			s.bg[i].anim.Action()
+		}
+	}
+}
+func (s *BGDef) draw(top bool, x, y, scl float32) {
+	if !top {
+		s.action()
+	}
+	x, y = x/s.localscl, y/s.localscl
+	bgscl := float32(1)
+	pos := [...]float32{x, y}
+	for _, b := range s.bg {
+		if b.visible && b.toplayer == top && b.anim.spr != nil {
+			b.draw(pos, scl, bgscl, s.localscl, s.scale, 0)
+		}
+	}
+}
+func (s *BGDef) reset() {
+	s.bga.clear()
+	for i := range s.bg {
+		s.bg[i].reset()
+	}
+	for i := range s.bgc {
+		s.bgc[i].currenttime = 0
+	}
+	s.bgct.clear()
+	for i := len(s.bgc) - 1; i >= 0; i-- {
+		s.bgct.add(&s.bgc[i])
+	}
+}

--- a/src/bytecode.go
+++ b/src/bytecode.go
@@ -319,6 +319,7 @@ const (
 	OC_const_stagevar_info_author
 	OC_const_stagevar_info_displayname
 	OC_const_stagevar_info_name
+	OC_const_gamemode
 )
 const (
 	OC_st_var OpCode = iota + OC_var*2
@@ -1455,6 +1456,11 @@ func (be BytecodeExp) run_const(c *Char, i *int, oc *Char) {
 			sys.stringPool[sys.workingState.playerNo].List[*(*int32)(
 				unsafe.Pointer(&be[*i]))])
 		*i += 4
+	case OC_const_gamemode:
+		sys.bcStack.PushB(sys.gameMode ==
+			sys.stringPool[sys.workingState.playerNo].List[*(*int32)(
+				unsafe.Pointer(&be[*i]))])
+		*i += 4
 	default:
 		sys.errLog.Printf("%v\n", be[*i-1])
 		c.panic()
@@ -5141,7 +5147,7 @@ func (sc attackMulSet) Run(c *Char, _ []int32) bool {
 	StateControllerBase(sc).run(c, func(id byte, exp []BytecodeExp) bool {
 		switch id {
 		case attackMulSet_value:
-			crun.attackMul = float32(crun.gi().data.attack) / 100 * exp[0].evalF(c)
+			crun.attackMul = float32(crun.gi().data.attack) * crun.ocd().attackRatio / 100 * exp[0].evalF(c)
 		case attackMulSet_redirectid:
 			if rid := sys.playerID(exp[0].evalI(c)); rid != nil {
 				crun = rid
@@ -5166,7 +5172,7 @@ func (sc defenceMulSet) Run(c *Char, _ []int32) bool {
 	StateControllerBase(sc).run(c, func(id byte, exp []BytecodeExp) bool {
 		switch id {
 		case defenceMulSet_value:
-			crun.defenceMul = float32(crun.gi().data.defence) / (exp[0].evalF(c) * 100)
+			crun.defenceMul = float32(crun.gi().data.defence) * crun.ocd().defenceRatio / (exp[0].evalF(c) * 100)
 		case defenceMulSet_redirectid:
 			if rid := sys.playerID(exp[0].evalI(c)); rid != nil {
 				crun = rid

--- a/src/char.go
+++ b/src/char.go
@@ -1366,6 +1366,7 @@ const (
 type CharGlobalInfo struct {
 	def              string
 	displayname      string
+	lifebarname      string
 	author           string
 	nameLow          string
 	authorLow        string
@@ -1633,8 +1634,8 @@ func (c *Char) clear2() {
 	c.CharSystemVar = CharSystemVar{bindToId: -1,
 		angleScalse: [...]float32{1, 1}, alpha: [...]int32{255, 0},
 		width:      [...]float32{c.defFW(), c.defBW()},
-		attackMul:  float32(c.gi().data.attack) / 100,
-		defenceMul: float32(c.gi().data.defence) / 100}
+		attackMul:  float32(c.gi().data.attack) * c.ocd().attackRatio / 100,
+		defenceMul: float32(c.gi().data.defence) * c.ocd().defenceRatio / 100}
 	c.oldPos, c.drawPos = c.pos, c.pos
 	if c.helperIndex == 0 {
 		if sys.roundsExisted[c.playerNo&1] > 0 {
@@ -1656,9 +1657,18 @@ func (c *Char) gi() *CharGlobalInfo {
 func (c *Char) stCgi() *CharGlobalInfo {
 	return &sys.cgi[c.ss.sb.playerNo]
 }
+func (c *Char) ocd() *OverwriteCharData {
+	if sys.tmode[c.playerNo&1] == TM_Turns {
+		if c.playerNo&1 == 0 {
+			return &sys.ocd[c.memberNo * 2]
+		}
+		return &sys.ocd[c.memberNo * 2 + 1]
+	}
+	return &sys.ocd[c.playerNo]
+}
 func (c *Char) load(def string) error {
 	gi := &sys.cgi[c.playerNo]
-	gi.def, gi.displayname, gi.author, gi.sff, gi.snd, gi.quotes = def, "", "", nil, nil, [MaxQuotes]string{}
+	gi.def, gi.displayname, gi.lifebarname, gi.author, gi.sff, gi.snd, gi.quotes = def, "", "", "", nil, nil, [MaxQuotes]string{}
 	gi.anim = NewAnimationTable()
 	for i := range gi.palkeymap {
 		gi.palkeymap[i] = int32(i)
@@ -1686,6 +1696,10 @@ func (c *Char) load(def string) error {
 				if !ok {
 					gi.displayname = c.name
 				}
+				gi.lifebarname, ok, _ = is.getText("lifebarname")
+				if !ok {
+					gi.lifebarname = gi.displayname
+				}
 				gi.author, _, _ = is.getText("author")
 				gi.authorLow = strings.ToLower(gi.author)
 				gi.nameLow = strings.ToLower(c.name)
@@ -1805,20 +1819,9 @@ func (c *Char) load(def string) error {
 		case "data":
 			if data {
 				data = false
-				var tmp int32
-				tmp = Atoi(sys.cmdFlags[fmt.Sprintf("-p%v.life", c.playerNo+1)])
-				if tmp != 0 {
-					gi.data.life = tmp
-				} else {
-					is.ReadI32("life", &gi.data.life)
-				}
+				is.ReadI32("life", &gi.data.life)
 				c.lifeMax = gi.data.life
-				tmp = Atoi(sys.cmdFlags[fmt.Sprintf("-p%v.power", c.playerNo+1)])
-				if tmp != 0 {
-					gi.data.power = tmp
-				} else {
-					is.ReadI32("power", &gi.data.power)
-				}
+				is.ReadI32("power", &gi.data.power)
 				c.powerMax = gi.data.power
 				is.ReadI32("attack", &gi.data.attack)
 				is.ReadI32("defence", &gi.data.defence)
@@ -4528,7 +4531,7 @@ func (c *Char) update(cvmin, cvmax,
 				if c.hittmp > 0 {
 					c.hittmp = 0
 				}
-				c.defenceMul = float32(c.gi().data.defence) / 100
+				c.defenceMul = float32(c.gi().data.defence) * c.ocd().defenceRatio / 100
 				c.ghv.hittime = -1
 				c.ghv.hitshaketime = 0
 				c.ghv.fallf = false

--- a/src/common.go
+++ b/src/common.go
@@ -265,7 +265,10 @@ func SearchFile(file string, deffile string) string {
 		if defdir != "data" {
 			fp = "data/" + file
 			if fp = FileExist(fp); len(fp) == 0 {
-				_else = true
+				fp = sys.motifDir + file
+				if fp = FileExist(fp); len(fp) == 0 {
+					_else = true
+				}
 			}
 		} else {
 			_else = true

--- a/src/compiler.go
+++ b/src/compiler.go
@@ -1421,6 +1421,10 @@ func (c *Compiler) expValue(out *BytecodeExp, in *string,
 		out.append(OC_frontedgedist)
 	case "gameheight":
 		out.append(OC_gameheight)
+	case "gamemode":
+		if err := nameSub(OC_const_gamemode); err != nil {
+			return bvNone(), err
+		}
 	case "gametime":
 		out.append(OC_gametime)
 	case "gamewidth":

--- a/src/font.go
+++ b/src/font.go
@@ -51,17 +51,13 @@ func loadFnt(filename string) (*Fnt, error) {
 
 func loadFntV1(filename string) (*Fnt, error) {
 	f := newFnt()
-	fp, err := os.Open("font/" + filename)
 
-	f.PalName = filename
+	filename = SearchFile(filename, "font/")
 
-	//Check file in "font/"" directory
-	if err != nil {
-		err = nil
-		fp, err = os.Open(filename)
-	}
+	fp, err := os.Open(filename)
+
+	f.PalName = filename
 
-	//Error opening file
 	if err != nil {
 		return nil, err
 	}
@@ -256,15 +252,11 @@ func loadFntV1(filename string) (*Fnt, error) {
 func loadFntV2(filename string) (*Fnt, error) {
 	f := newFnt()
 
-	content, err := LoadText("font/" + filename)
+	filename = SearchFile(filename, "font/")
 
-	f.PalName = filename
+	content, err := LoadText(filename)
 
-	//Check file in "font/"" directory
-	if err != nil {
-		err = nil
-		content, err = LoadText(filename)
-	}
+	f.PalName = filename
 
 	if err != nil {
 		return nil, err
@@ -361,7 +353,7 @@ func loadFntTtf(f *Fnt, fontfile string, filename string) {
 
 func loadFntSff(f *Fnt, fontfile string, filename string) {
 	fileDir := SearchFile(filename, fontfile)
-	sff, err := loadSff("font/"+fileDir, false)
+	sff, err := loadSff(fileDir, false)
 
 	if err != nil {
 		err = nil

--- a/src/image.go
+++ b/src/image.go
@@ -13,6 +13,7 @@ import (
 	"unsafe"
 
 	"github.com/go-gl/gl/v2.1/gl"
+	"github.com/kbinani/screenshot"
 )
 
 type TransType int32
@@ -1216,3 +1217,35 @@ func (s *Sff) getOwnPalSprite(g, n int16) *Sprite {
 	copy(osp.Pal, pal)
 	return &osp
 }
+func captureScreen() {
+	var err error
+	var img *image.RGBA
+	if sys.fullscreen {
+		img, err = screenshot.CaptureDisplay(0)
+	} else {
+		xpos, ypos := sys.window.GetPos()
+		width, height := sys.window.GetSize()
+		bounds := image.Rect(xpos, ypos, xpos + width, ypos + height)
+		img, err = screenshot.CaptureRect(bounds)
+	}
+	if err != nil {
+		panic(err)
+	}
+	var filename string
+	for i := sys.captureNum; i < 999; i++ {
+		if i < 10 {
+			filename = fmt.Sprintf("ikemen00%d.png", i)
+		} else if i < 100 {
+			filename = fmt.Sprintf("ikemen0%d.png", i)
+		} else {
+			filename = fmt.Sprintf("ikemen%d.png", i)
+		}
+		if _, err := os.Stat(filename); os.IsNotExist(err) {
+			file, _ := os.Create(filename)
+			defer file.Close()
+			png.Encode(file, img)
+			sys.captureNum = i
+			break
+		}
+	}
+}

--- a/src/input.go
+++ b/src/input.go
@@ -599,6 +599,9 @@ func keyCallback(_ *glfw.Window, key glfw.Key, _ int,
 		for k, v := range sys.shortcutScripts {
 			v.Activate = v.Activate || k.Test(key, mk)
 		}
+		if key == glfw.KeyF12 {
+			captureScreen()
+		}
 	}
 }
 func charCallback(_ *glfw.Window, char rune, mk glfw.ModifierKey) {
@@ -628,12 +631,12 @@ func JoystickState(joy, button int) bool {
 		}
 
 		//Xbox360コントローラーのLRトリガー判定
-		if (button == 9 || button == 11) && (joystick[joy].GetGamepadName() == "Xbox 360 Controller" || strings.Contains(joystick[joy].GetGamepadName(), "XInput")) {
+		if (button == 9 || button == 11) && strings.Contains(joystick[joy].GetGamepadName(), "XInput") {
 			return axes[button/2] > sys.xinputTriggerSensitivity
 		}
 
 		// Ignore trigger axis on PS4 (We already have buttons)
-		if (button >= 6 && button <= 9) && joystick[joy].GetGamepadName() == "Wireless Controller" {
+		if (button >= 6 && button <= 9) && joystick[joy].GetGamepadName() == "PS4 Controller" {
 			return false
 		}
 

--- a/src/lifebar.go
+++ b/src/lifebar.go
@@ -39,6 +39,14 @@ const (
 	WT_PTeammate
 )
 
+type RoundType int32
+
+const (
+	RT_Normal RoundType = iota
+	RT_Deciding
+	RT_Final
+)
+
 func (wt *WinType) SetPerfect() {
 	if *wt >= WT_N && *wt <= WT_Teammate {
 		*wt += WT_PN - WT_N
@@ -183,8 +191,11 @@ func readPowerBar(pre string, is IniSection,
 		&pb.counter_font[2])
 	pb.counter_lay = *ReadLayout(pre+"counter.", is, 0)
 	for i := range pb.level_snd {
-		is.ReadI32(fmt.Sprintf("%vlevel%v.snd", pre, i+1), &pb.level_snd[i][0],
-			&pb.level_snd[i][1])
+		if !is.ReadI32(fmt.Sprintf("%vlevel%v.snd", pre, i+1), &pb.level_snd[i][0],
+			&pb.level_snd[i][1]) {
+			is.ReadI32(fmt.Sprintf("level%v.snd", i+1), &pb.level_snd[i][0],
+				&pb.level_snd[i][1])
+		}
 	}
 	return pb
 }
@@ -721,6 +732,9 @@ type LifeBarRound struct {
 	ko_time            int32
 	ko_sndtime         int32
 	ko, dko, to        AnimTextSnd
+	n, s, h, throw, c  AnimTextSnd
+	t, suicide         AnimTextSnd
+	teammate, perfect  AnimTextSnd
 	slow_time          int32
 	over_waittime      int32
 	over_hittime       int32
@@ -746,12 +760,7 @@ func readLifeBarRound(is IniSection,
 	r := newLifeBarRound(snd, fnt)
 	var tmp int32
 	is.ReadI32("pos", &r.pos[0], &r.pos[1])
-	tmp = Atoi(sys.cmdFlags["-rounds"])
-	if tmp > 0 {
-		r.match_wins = tmp
-	} else {
-		is.ReadI32("match.wins", &r.match_wins)
-	}
+	is.ReadI32("match.wins", &r.match_wins)
 	is.ReadI32("match.maxdrawgames", &r.match_maxdrawgames)
 	if is.ReadI32("start.waittime", &tmp) {
 		r.start_waittime = Max(1, tmp)
@@ -774,6 +783,15 @@ func readLifeBarRound(is IniSection,
 	r.ko = *ReadAnimTextSnd("ko.", is, sff, at, 1)
 	r.dko = *ReadAnimTextSnd("dko.", is, sff, at, 1)
 	r.to = *ReadAnimTextSnd("to.", is, sff, at, 1)
+	r.n = *ReadAnimTextSnd("n.", is, sff, at, 1)
+	r.s = *ReadAnimTextSnd("s.", is, sff, at, 1)
+	r.h = *ReadAnimTextSnd("h.", is, sff, at, 1)
+	r.throw = *ReadAnimTextSnd("throw.", is, sff, at, 1)
+	r.c = *ReadAnimTextSnd("c.", is, sff, at, 1)
+	r.t = *ReadAnimTextSnd("t.", is, sff, at, 1)
+	r.suicide = *ReadAnimTextSnd("suicide.", is, sff, at, 1)
+	r.teammate = *ReadAnimTextSnd("teammate.", is, sff, at, 1)
+	r.perfect = *ReadAnimTextSnd("perfect.", is, sff, at, 1)
 	is.ReadI32("slow.time", &r.slow_time)
 	if is.ReadI32("over.hittime", &tmp) {
 		r.over_hittime = Max(0, tmp)
@@ -884,6 +902,29 @@ func (r *LifeBarRound) act() bool {
 		default:
 			f(&r.to, 0)
 		}
+		if sys.winTeam >= 0 {
+			switch sys.winType[sys.winTeam] {
+			case WT_N, WT_PN:
+				f(&r.n, 0)
+			case WT_S, WT_PS:
+				f(&r.s, 0)
+			case WT_H, WT_PH:
+				f(&r.h, 0)
+			case WT_C, WT_PC:
+				f(&r.c, 0)
+			case WT_T, WT_PT:
+				f(&r.t, 0)
+			case WT_Throw, WT_PThrow:
+				f(&r.throw, 0)
+			case WT_Suicide, WT_PSuicide:
+				f(&r.suicide, 0)
+			case WT_Teammate, WT_PTeammate:
+				f(&r.teammate, 0)
+			}
+			if sys.winType[sys.winTeam] >= WT_Perfect {
+				f(&r.perfect, 0)
+			}
+		}
 		if sys.intro < -(r.over_hittime + r.over_waittime + r.over_wintime) {
 			if sys.finish == FT_DKO || sys.finish == FT_TODraw {
 				f(&r.drawn, 1)
@@ -905,6 +946,15 @@ func (r *LifeBarRound) reset() {
 	r.ko.Reset()
 	r.dko.Reset()
 	r.to.Reset()
+	r.n.Reset()
+	r.s.Reset()
+	r.h.Reset()
+	r.throw.Reset()
+	r.c.Reset()
+	r.t.Reset()
+	r.suicide.Reset()
+	r.teammate.Reset()
+	r.perfect.Reset()
 	r.win.Reset()
 	r.win2.Reset()
 	r.drawn.Reset()
@@ -965,23 +1015,111 @@ func (r *LifeBarRound) draw(layerno int16) {
 				r.win.text = tmp
 			}
 		}
+		
+		
+		if (sys.finish != FT_NotYet || sys.time == 0) && sys.winTeam >= 0 {
+			switch sys.winType[sys.winTeam] {
+			case WT_N, WT_PN:
+				r.n.DrawScaled(float32(r.pos[0])+sys.lifebarOffsetX, float32(r.pos[1]), layerno, r.fnt, sys.lifebarScale)
+			case WT_S, WT_PS:
+				r.s.DrawScaled(float32(r.pos[0])+sys.lifebarOffsetX, float32(r.pos[1]), layerno, r.fnt, sys.lifebarScale)
+			case WT_H, WT_PH:
+				r.h.DrawScaled(float32(r.pos[0])+sys.lifebarOffsetX, float32(r.pos[1]), layerno, r.fnt, sys.lifebarScale)
+			case WT_C, WT_PC:
+				r.c.DrawScaled(float32(r.pos[0])+sys.lifebarOffsetX, float32(r.pos[1]), layerno, r.fnt, sys.lifebarScale)
+			case WT_T, WT_PT:
+				r.t.DrawScaled(float32(r.pos[0])+sys.lifebarOffsetX, float32(r.pos[1]), layerno, r.fnt, sys.lifebarScale)
+			case WT_Throw, WT_PThrow:
+				r.throw.DrawScaled(float32(r.pos[0])+sys.lifebarOffsetX, float32(r.pos[1]), layerno, r.fnt, sys.lifebarScale)
+			case WT_Suicide, WT_PSuicide:
+				r.suicide.DrawScaled(float32(r.pos[0])+sys.lifebarOffsetX, float32(r.pos[1]), layerno, r.fnt, sys.lifebarScale)
+			case WT_Teammate, WT_PTeammate:
+				r.teammate.DrawScaled(float32(r.pos[0])+sys.lifebarOffsetX, float32(r.pos[1]), layerno, r.fnt, sys.lifebarScale)
+			}
+			if sys.winType[sys.winTeam] >= WT_Perfect {
+				r.perfect.DrawScaled(float32(r.pos[0])+sys.lifebarOffsetX, float32(r.pos[1]), layerno, r.fnt, sys.lifebarScale)
+			}
+		}
+		
+		
 	}
 	sys.brightness = ob
 }
 
+type LifeBarChallenger struct {
+	cnt           int32
+	snd           *Snd
+	pos           [2]int32
+	challenger    AnimTextSnd
+	sndtime       int32
+	over_pause    int32
+	over_time     int32
+	bg            AnimLayout
+	fnt           []*Fnt
+}
+
+func newLifeBarChallenger(snd *Snd, fnt []*Fnt) *LifeBarChallenger {
+	return &LifeBarChallenger{snd: snd, fnt: fnt}
+}
+func readLifeBarChallenger(is IniSection,
+	sff *Sff, at AnimationTable, snd *Snd, fnt []*Fnt) *LifeBarChallenger {
+	ch := newLifeBarChallenger(snd, fnt)
+	is.ReadI32("pos", &ch.pos[0], &ch.pos[1])
+	ch.challenger = *ReadAnimTextSnd("", is, sff, at, 1)
+	is.ReadI32("sndtime", &ch.sndtime)
+	var tmp int32
+	if is.ReadI32("over.pause", &tmp) {
+		ch.over_pause = Max(1, tmp)
+	}
+	if is.ReadI32("over.time", &tmp) {
+		ch.over_time = Max(ch.over_pause+1, tmp)
+	}
+	ch.bg = *ReadAnimLayout("bg.", is, sff, at, 0)
+	return ch
+}
+func (ch *LifeBarChallenger) step()  {
+	if sys.challenger > 0 {
+		if ch.cnt == ch.sndtime {
+			ch.snd.play(ch.challenger.snd)
+		}
+		if ch.cnt == ch.over_pause {
+			sys.paused = true
+		}
+		if ch.challenger.displaytime > ch.cnt {
+			ch.challenger.Action()
+			ch.bg.Action()
+		}
+		ch.cnt += 1
+	}
+}
+func (ch *LifeBarChallenger) reset() {
+	ch.cnt = 0
+	ch.challenger.Reset()
+	ch.bg.Reset()
+}
+func (ch *LifeBarChallenger) bgDraw(layerno int16) {
+	ch.bg.Draw(float32(ch.pos[0]), float32(ch.pos[1]), layerno)
+}
+func (ch *LifeBarChallenger) draw(layerno int16, f []*Fnt) {
+	ch.challenger.Draw(float32(ch.pos[0]), float32(ch.pos[1]), layerno, ch.fnt)
+}
+
 type Lifebar struct {
 	fat       AnimationTable
 	fsff      *Sff
 	snd, fsnd *Snd
 	fnt       [10]*Fnt
-	hb        [4][]*HealthBar
-	pb        [2]*PowerBar
+	ref       [4][2]int
+	num       [4][2]int
+	hb        [8][]*HealthBar
+	pb        [6][]*PowerBar
 	fa        [4][]*LifeBarFace
 	nm        [4][]*LifeBarName
 	wi        [2]*LifeBarWinIcon
 	ti        *LifeBarTime
 	co        *LifeBarCombo
 	ro        *LifeBarRound
+	ch        *LifeBarChallenger
 }
 
 func loadLifebar(deffile string) (*Lifebar, error) {
@@ -991,11 +1129,29 @@ func loadLifebar(deffile string) (*Lifebar, error) {
 	}
 	l := &Lifebar{fsff: &Sff{}, snd: &Snd{},
 		hb: [...][]*HealthBar{make([]*HealthBar, 2), make([]*HealthBar, 4),
-			make([]*HealthBar, 2), make([]*HealthBar, 4)},
-		fa: [...][]*LifeBarFace{make([]*LifeBarFace, 2), make([]*LifeBarFace, 4),
-			make([]*LifeBarFace, 2), make([]*LifeBarFace, 4)},
-		nm: [...][]*LifeBarName{make([]*LifeBarName, 2), make([]*LifeBarName, 4),
-			make([]*LifeBarName, 2), make([]*LifeBarName, 4)}}
+			make([]*HealthBar, 2), make([]*HealthBar, 4), make([]*HealthBar, 6),
+			make([]*HealthBar, 8), make([]*HealthBar, 6), make([]*HealthBar, 8)},
+		pb: [...][]*PowerBar{make([]*PowerBar, 2), make([]*PowerBar, 4),
+			make([]*PowerBar, 2), make([]*PowerBar, 2), make([]*PowerBar, 6),
+			make([]*PowerBar, 8)},
+		fa: [...][]*LifeBarFace{make([]*LifeBarFace, 2), make([]*LifeBarFace, 8),
+			make([]*LifeBarFace, 2), make([]*LifeBarFace, 8)},
+		nm: [...][]*LifeBarName{make([]*LifeBarName, 2), make([]*LifeBarName, 8),
+			make([]*LifeBarName, 2), make([]*LifeBarName, 8)}}
+	missing := map[string]int{"[simul_3p lifebar]": 3, "[simul_4p lifebar]": 4,
+		"[tag lifebar]": 5, "[tag_3p lifebar]": 6, "[tag_4p lifebar]": 7,
+		"[simul powerbar]": 1, "[turns powerbar]": 2, "[simul_3p powerbar]": 3,
+		"[simul_4p powerbar]": 4, "[tag powerbar]": 5, "[tag face]": -1,
+		"[tag name]": -1, "[challenger]": -1}
+	strc := strings.ToLower(strings.TrimSpace(str))
+	for k, _ := range missing {
+		strc = strings.Replace(strc, ";" + k, "", -1)
+		if strings.Contains(strc, k) {
+			delete(missing, k)
+		} else {
+			str += "\n" + k
+		}
+	}
 	sff, lines, i := &Sff{}, SplitAndTrim(str, "\n"), 0
 	at := ReadAnimationTable(sff, lines, &i)
 	i = 0
@@ -1056,6 +1212,11 @@ func loadLifebar(deffile string) (*Lifebar, error) {
 				for i := range l.fnt {
 					if is.LoadFile(fmt.Sprintf("font%v", i), deffile,
 						func(filename string) error {
+							//h := int32(0)
+							//if len(is[fmt.Sprintf("font%v.height", i)]) > 0 {
+							//	h = Atoi(is[fmt.Sprintf("font%v.height", i)])
+							//}
+							//l.fnt[i], err = loadFnt(filename, h)
 							l.fnt[i], err = loadFnt(filename)
 							return err
 						}); err != nil {
@@ -1073,11 +1234,11 @@ func loadLifebar(deffile string) (*Lifebar, error) {
 				l.hb[0][1] = readHealthBar("p2.", is, sff, at)
 			}
 		case "powerbar":
-			if l.pb[0] == nil {
-				l.pb[0] = readPowerBar("p1.", is, sff, at, l.snd)
+			if l.pb[0][0] == nil {
+				l.pb[0][0] = readPowerBar("p1.", is, sff, at, l.snd)
 			}
-			if l.pb[1] == nil {
-				l.pb[1] = readPowerBar("p2.", is, sff, at, l.snd)
+			if l.pb[0][1] == nil {
+				l.pb[0][1] = readPowerBar("p2.", is, sff, at, l.snd)
 			}
 		case "face":
 			if l.fa[0][0] == nil {
@@ -1093,49 +1254,6 @@ func loadLifebar(deffile string) (*Lifebar, error) {
 			if l.nm[0][1] == nil {
 				l.nm[0][1] = readLifeBarName("p2.", is, sff, at)
 			}
-		case "tag ":
-			subname = strings.ToLower(subname)
-			switch {
-			case len(subname) >= 7 && subname[:7] == "lifebar":
-				if l.hb[3][0] == nil {
-					l.hb[3][0] = readHealthBar("p1.", is, sff, at)
-				}
-				if l.hb[3][1] == nil {
-					l.hb[3][1] = readHealthBar("p2.", is, sff, at)
-				}
-				if l.hb[3][2] == nil {
-					l.hb[3][2] = readHealthBar("p3.", is, sff, at)
-				}
-				if l.hb[3][3] == nil {
-					l.hb[3][3] = readHealthBar("p4.", is, sff, at)
-				}
-			case len(subname) >= 4 && subname[:4] == "face":
-				if l.fa[3][0] == nil {
-					l.fa[3][0] = readLifeBarFace("p1.", is, sff, at)
-				}
-				if l.fa[3][1] == nil {
-					l.fa[3][1] = readLifeBarFace("p2.", is, sff, at)
-				}
-				if l.fa[3][2] == nil {
-					l.fa[3][2] = readLifeBarFace("p3.", is, sff, at)
-				}
-				if l.fa[3][3] == nil {
-					l.fa[3][3] = readLifeBarFace("p4.", is, sff, at)
-				}
-			case len(subname) >= 4 && subname[:4] == "name":
-				if l.nm[3][0] == nil {
-					l.nm[3][0] = readLifeBarName("p1.", is, sff, at)
-				}
-				if l.nm[3][1] == nil {
-					l.nm[3][1] = readLifeBarName("p2.", is, sff, at)
-				}
-				if l.nm[3][2] == nil {
-					l.nm[3][2] = readLifeBarName("p3.", is, sff, at)
-				}
-				if l.nm[3][3] == nil {
-					l.nm[3][3] = readLifeBarName("p4.", is, sff, at)
-				}
-			}
 		case "simul ":
 			subname = strings.ToLower(subname)
 			switch {
@@ -1152,6 +1270,19 @@ func loadLifebar(deffile string) (*Lifebar, error) {
 				if l.hb[1][3] == nil {
 					l.hb[1][3] = readHealthBar("p4.", is, sff, at)
 				}
+			case len(subname) >= 8 && subname[:8] == "powerbar":
+				if l.pb[1][0] == nil {
+					l.pb[1][0] = readPowerBar("p1.", is, sff, at, l.snd)
+				}
+				if l.pb[1][1] == nil {
+					l.pb[1][1] = readPowerBar("p2.", is, sff, at, l.snd)
+				}
+				if l.pb[1][2] == nil {
+					l.pb[1][2] = readPowerBar("p3.", is, sff, at, l.snd)
+				}
+				if l.pb[1][3] == nil {
+					l.pb[1][3] = readPowerBar("p4.", is, sff, at, l.snd)
+				}
 			case len(subname) >= 4 && subname[:4] == "face":
 				if l.fa[1][0] == nil {
 					l.fa[1][0] = readLifeBarFace("p1.", is, sff, at)
@@ -1165,6 +1296,18 @@ func loadLifebar(deffile string) (*Lifebar, error) {
 				if l.fa[1][3] == nil {
 					l.fa[1][3] = readLifeBarFace("p4.", is, sff, at)
 				}
+				if l.fa[1][4] == nil {
+					l.fa[1][4] = readLifeBarFace("p5.", is, sff, at)
+				}
+				if l.fa[1][5] == nil {
+					l.fa[1][5] = readLifeBarFace("p6.", is, sff, at)
+				}
+				if l.fa[1][6] == nil {
+					l.fa[1][6] = readLifeBarFace("p7.", is, sff, at)
+				}
+				if l.fa[1][7] == nil {
+					l.fa[1][7] = readLifeBarFace("p8.", is, sff, at)
+				}
 			case len(subname) >= 4 && subname[:4] == "name":
 				if l.nm[1][0] == nil {
 					l.nm[1][0] = readLifeBarName("p1.", is, sff, at)
@@ -1178,6 +1321,18 @@ func loadLifebar(deffile string) (*Lifebar, error) {
 				if l.nm[1][3] == nil {
 					l.nm[1][3] = readLifeBarName("p4.", is, sff, at)
 				}
+				if l.nm[1][4] == nil {
+					l.nm[1][4] = readLifeBarName("p5.", is, sff, at)
+				}
+				if l.nm[1][5] == nil {
+					l.nm[1][5] = readLifeBarName("p6.", is, sff, at)
+				}
+				if l.nm[1][6] == nil {
+					l.nm[1][6] = readLifeBarName("p7.", is, sff, at)
+				}
+				if l.nm[1][7] == nil {
+					l.nm[1][7] = readLifeBarName("p8.", is, sff, at)
+				}
 			}
 		case "turns ":
 			subname = strings.ToLower(subname)
@@ -1189,6 +1344,13 @@ func loadLifebar(deffile string) (*Lifebar, error) {
 				if l.hb[2][1] == nil {
 					l.hb[2][1] = readHealthBar("p2.", is, sff, at)
 				}
+			case len(subname) >= 8 && subname[:8] == "powerbar":
+				if l.pb[2][0] == nil {
+					l.pb[2][0] = readPowerBar("p1.", is, sff, at, l.snd)
+				}
+				if l.pb[2][1] == nil {
+					l.pb[2][1] = readPowerBar("p2.", is, sff, at, l.snd)
+				}
 			case len(subname) >= 4 && subname[:4] == "face":
 				if l.fa[2][0] == nil {
 					l.fa[2][0] = readLifeBarFace("p1.", is, sff, at)
@@ -1204,33 +1366,7 @@ func loadLifebar(deffile string) (*Lifebar, error) {
 					l.nm[2][1] = readLifeBarName("p2.", is, sff, at)
 				}
 			}
-		case "winicon":
-			if l.wi[0] == nil {
-				l.wi[0] = readLifeBarWinIcon("p1.", is, sff, at)
-			}
-			if l.wi[1] == nil {
-				l.wi[1] = readLifeBarWinIcon("p2.", is, sff, at)
-			}
-		case "time":
-			if l.ti == nil {
-				l.ti = readLifeBarTime(is, sff, at)
-			}
-		case "combo":
-			if l.co == nil {
-				l.co = readLifeBarCombo(is)
-			}
-		case "round":
-			if l.ro == nil {
-				l.ro = readLifeBarRound(is, sff, at, l.snd, l.fnt[:])
-			}
-		}
-	}
-	i = 0
-	//Load again to fill empty spaces of TAG (For retrocompatibility)
-	for i < len(lines) {
-		is, name, subname := ReadIniSection(lines, &i)
-		switch name {
-		case "simul ":
+		case "tag ":
 			subname = strings.ToLower(subname)
 			switch {
 			case len(subname) >= 7 && subname[:7] == "lifebar":
@@ -1246,6 +1382,13 @@ func loadLifebar(deffile string) (*Lifebar, error) {
 				if l.hb[3][3] == nil {
 					l.hb[3][3] = readHealthBar("p4.", is, sff, at)
 				}
+			case len(subname) >= 8 && subname[:8] == "powerbar":
+				if l.pb[3][0] == nil {
+					l.pb[3][0] = readPowerBar("p1.", is, sff, at, l.snd)
+				}
+				if l.pb[3][1] == nil {
+					l.pb[3][1] = readPowerBar("p2.", is, sff, at, l.snd)
+				}
 			case len(subname) >= 4 && subname[:4] == "face":
 				if l.fa[3][0] == nil {
 					l.fa[3][0] = readLifeBarFace("p1.", is, sff, at)
@@ -1259,6 +1402,18 @@ func loadLifebar(deffile string) (*Lifebar, error) {
 				if l.fa[3][3] == nil {
 					l.fa[3][3] = readLifeBarFace("p4.", is, sff, at)
 				}
+				if l.fa[3][4] == nil {
+					l.fa[3][4] = readLifeBarFace("p5.", is, sff, at)
+				}
+				if l.fa[3][5] == nil {
+					l.fa[3][5] = readLifeBarFace("p6.", is, sff, at)
+				}
+				if l.fa[3][6] == nil {
+					l.fa[3][6] = readLifeBarFace("p7.", is, sff, at)
+				}
+				if l.fa[3][7] == nil {
+					l.fa[3][7] = readLifeBarFace("p8.", is, sff, at)
+				}
 			case len(subname) >= 4 && subname[:4] == "name":
 				if l.nm[3][0] == nil {
 					l.nm[3][0] = readLifeBarName("p1.", is, sff, at)
@@ -1272,36 +1427,163 @@ func loadLifebar(deffile string) (*Lifebar, error) {
 				if l.nm[3][3] == nil {
 					l.nm[3][3] = readLifeBarName("p4.", is, sff, at)
 				}
+				if l.nm[3][4] == nil {
+					l.nm[3][4] = readLifeBarName("p5.", is, sff, at)
+				}
+				if l.nm[3][5] == nil {
+					l.nm[3][5] = readLifeBarName("p6.", is, sff, at)
+				}
+				if l.nm[3][6] == nil {
+					l.nm[3][6] = readLifeBarName("p7.", is, sff, at)
+				}
+				if l.nm[3][7] == nil {
+					l.nm[3][7] = readLifeBarName("p8.", is, sff, at)
+				}
+			}
+		case "simul_3p ", "simul_4p ", "tag_3p ", "tag_4p ":
+			i := 4
+			switch name {
+			case "simul_4p ":
+				i = 5
+			case "tag_3p ":
+				i = 6
+			case "tag_4p ":
+				i = 7
+			}
+			subname = strings.ToLower(subname)
+			switch {
+			case len(subname) >= 7 && subname[:7] == "lifebar":
+				if l.hb[i][0] == nil {
+					l.hb[i][0] = readHealthBar("p1.", is, sff, at)
+				}
+				if l.hb[i][1] == nil {
+					l.hb[i][1] = readHealthBar("p2.", is, sff, at)
+				}
+				if l.hb[i][2] == nil {
+					l.hb[i][2] = readHealthBar("p3.", is, sff, at)
+				}
+				if l.hb[i][3] == nil {
+					l.hb[i][3] = readHealthBar("p4.", is, sff, at)
+				}
+				if l.hb[i][4] == nil {
+					l.hb[i][4] = readHealthBar("p5.", is, sff, at)
+				}
+				if l.hb[i][5] == nil {
+					l.hb[i][5] = readHealthBar("p6.", is, sff, at)
+				}
+				if i == 5 || i == 7 {
+					if l.hb[i][6] == nil {
+						l.hb[i][6] = readHealthBar("p7.", is, sff, at)
+					}
+					if l.hb[i][7] == nil {
+						l.hb[i][7] = readHealthBar("p8.", is, sff, at)
+					}
+				}
+			case len(subname) >= 8 && subname[:8] == "powerbar":
+				if l.pb[i][0] == nil {
+					l.pb[i][0] = readPowerBar("p1.", is, sff, at, l.snd)
+				}
+				if l.pb[i][1] == nil {
+					l.pb[i][1] = readPowerBar("p2.", is, sff, at, l.snd)
+				}
+				if l.pb[i][2] == nil {
+					l.pb[i][2] = readPowerBar("p3.", is, sff, at, l.snd)
+				}
+				if l.pb[i][3] == nil {
+					l.pb[i][3] = readPowerBar("p4.", is, sff, at, l.snd)
+				}
+				if l.pb[i][4] == nil {
+					l.pb[i][4] = readPowerBar("p5.", is, sff, at, l.snd)
+				}
+				if l.pb[i][5] == nil {
+					l.pb[i][5] = readPowerBar("p6.", is, sff, at, l.snd)
+				}
+				if i == 5 || i == 7 {
+					if l.pb[i][6] == nil {
+						l.pb[i][6] = readPowerBar("p7.", is, sff, at, l.snd)
+					}
+					if l.pb[i][7] == nil {
+						l.pb[i][7] = readPowerBar("p8.", is, sff, at, l.snd)
+					}
+				}
+			}
+		case "winicon":
+			if l.wi[0] == nil {
+				l.wi[0] = readLifeBarWinIcon("p1.", is, sff, at)
+			}
+			if l.wi[1] == nil {
+				l.wi[1] = readLifeBarWinIcon("p2.", is, sff, at)
+			}
+		case "time":
+			if l.ti == nil {
+				l.ti = readLifeBarTime(is, sff, at)
+			}
+		case "combo":
+			if l.co == nil {
+				l.co = readLifeBarCombo(is)
+			}
+		case "round":
+			if l.ro == nil {
+				l.ro = readLifeBarRound(is, sff, at, l.snd, l.fnt[:])
+			}
+		case "challenger":
+			if l.ch == nil {
+				l.ch = readLifeBarChallenger(is, sff, at, l.snd, l.fnt[:])
+			}
+		}
+	}
+	for k, v := range missing {
+		if strings.Contains(k, "lifebar") {
+			for i := 3; i < len(l.hb); i++ {
+				if i == v {
+					for j, d := range l.hb[1] {
+						l.hb[i][j] = d
+					}
+				}
+			}
+		} else if strings.Contains(k, "powerbar") {
+			for i := 1; i < len(l.pb); i++ {
+				if i == v {
+					for j, d := range l.pb[0] {
+						l.pb[i][j] = d
+					}
+				}
+			}
+		} else if strings.Contains(k, "tag face") {
+			for j, d := range l.fa[1] {
+				l.fa[3][j] = d
+			}
+		} else if strings.Contains(k, "tag name") {
+			for j, d := range l.nm[1] {
+				l.nm[3][j] = d
 			}
 		}
 	}
 	return l, nil
 }
 func (l *Lifebar) step() {
-	for ti, tm := range sys.tmode {
-		for i := ti; i < len(l.hb[tm]); i += 2 {
-			l.hb[tm][i].step(float32(sys.chars[i][0].life)/
+	for ti, _ := range sys.tmode {
+		for i := ti; i < l.num[0][ti]; i += 2 {
+			l.hb[l.ref[0][ti]][i].step(float32(sys.chars[i][0].life)/
 				float32(sys.chars[i][0].lifeMax), (sys.chars[i][0].getcombo != 0 ||
 				sys.chars[i][0].ss.moveType == MT_H) &&
 				!sys.chars[i][0].scf(SCF_over))
 		}
 	}
-	for i := range l.pb {
-		lvi := i
-		if sys.tmode[i] == TM_Simul || sys.tmode[i] == TM_Tag {
-			lvi += 2
+	for ti, _ := range sys.tmode {
+		for i := ti; i < l.num[1][ti]; i += 2 {
+			l.pb[l.ref[1][ti]][i].step(float32(sys.chars[i][0].power)/
+				float32(sys.chars[i][0].powerMax), sys.chars[i][0].power/1000)
 		}
-		l.pb[i].step(float32(sys.chars[i][0].power)/
-			float32(sys.chars[i][0].powerMax), sys.chars[lvi][0].power/1000)
 	}
-	for ti, tm := range sys.tmode {
-		for i := ti; i < len(l.fa[tm]); i += 2 {
-			l.fa[tm][i].step()
+	for ti, _ := range sys.tmode {
+		for i := ti; i < l.num[2][ti]; i += 2 {
+			l.fa[l.ref[2][ti]][i].step()
 		}
 	}
-	for ti, tm := range sys.tmode {
-		for i := ti; i < len(l.nm[tm]); i += 2 {
-			l.nm[tm][i].step()
+	for ti, _ := range sys.tmode {
+		for i := ti; i < l.num[3][ti]; i += 2 {
+			l.nm[l.ref[3][ti]][i].step()
 		}
 	}
 	for i := range l.wi {
@@ -1315,15 +1597,54 @@ func (l *Lifebar) step() {
 		}
 	}
 	l.co.step(cb)
+	l.ch.step()
 }
 func (l *Lifebar) reset() {
+	for ti, tm := range sys.tmode {
+		l.ref[0][ti] = int(tm)
+		l.ref[1][ti] = int(tm)
+		l.ref[2][ti] = int(tm)
+		l.ref[3][ti] = int(tm)
+		if tm == TM_Tag {
+			if sys.numSimul[ti] == 2 { //Tag 2P
+				l.ref[0][ti] = 3
+				l.ref[1][ti] = 3
+				l.ref[2][ti] = 3
+				l.ref[3][ti] = 3
+			} else { //Tag 3P/4P
+				l.ref[0][ti] = int(sys.numSimul[ti]) + 3
+				l.ref[1][ti] = 3
+				l.ref[2][ti] = 3
+				l.ref[3][ti] = 3
+			}
+		} else if tm == TM_Simul && sys.numSimul[ti] > 2 { //Simul 3P/4P
+			l.ref[0][ti] = int(sys.numSimul[ti]) + 1
+			l.ref[1][ti] = int(sys.numSimul[ti]) + 1
+		}
+		l.num[0][ti] = len(l.hb[l.ref[0][ti]])
+		l.num[1][ti] = len(l.pb[l.ref[1][ti]])
+		l.num[2][ti] = len(l.fa[l.ref[2][ti]])
+		l.num[3][ti] = len(l.nm[l.ref[3][ti]])
+		if tm == TM_Simul || tm == TM_Tag {
+			l.num[0][ti] = int(sys.numSimul[ti]) * 2
+			if sys.powerShare[ti] {
+				l.num[1][ti] = 2
+			} else if tm == TM_Simul {
+				l.num[1][ti] = int(sys.numSimul[ti]) * 2
+			}
+			l.num[2][ti] = int(sys.numSimul[ti]) * 2
+			l.num[3][ti] = int(sys.numSimul[ti]) * 2
+		}
+	}
 	for _, hb := range l.hb {
 		for i := range hb {
 			hb[i].reset()
 		}
 	}
-	for i := range l.pb {
-		l.pb[i].reset()
+	for _, pb := range l.pb {
+		for i := range pb {
+			pb[i].reset()
+		}
 	}
 	for _, fa := range l.fa {
 		for i := range fa {
@@ -1341,56 +1662,61 @@ func (l *Lifebar) reset() {
 	l.ti.reset()
 	l.co.reset()
 	l.ro.reset()
+	l.ch.reset()
 }
 func (l *Lifebar) draw(layerno int16) {
 	if !sys.statusDraw {
 		return
 	}
-	if !sys.sf(GSF_nobardisplay) {
-		for ti, tm := range sys.tmode {
-			for i := ti; i < len(l.hb[tm]); i += 2 {
-				l.hb[tm][i].bgDraw(layerno)
+	if !sys.sf(GSF_nobardisplay) && sys.barsDisplay {
+		for ti, _ := range sys.tmode {
+			for i := ti; i < l.num[0][ti]; i += 2 {
+				l.hb[l.ref[0][ti]][i].bgDraw(layerno)
 			}
 		}
-		for ti, tm := range sys.tmode {
-			for i := ti; i < len(l.hb[tm]); i += 2 {
-				l.hb[tm][i].draw(layerno, float32(sys.chars[i][0].life)/
+		for ti, _ := range sys.tmode {
+			for i := ti; i < l.num[0][ti]; i += 2 {
+				l.hb[l.ref[0][ti]][i].draw(layerno, float32(sys.chars[i][0].life)/
 					float32(sys.chars[i][0].lifeMax))
 			}
 		}
-		for i := range l.pb {
-			l.pb[i].bgDraw(layerno)
+		for ti, _ := range sys.tmode {
+			for i := ti; i < l.num[1][ti]; i += 2 {
+				l.pb[l.ref[1][ti]][i].bgDraw(layerno)
+			}
 		}
-		for i := range l.pb {
-			l.pb[i].draw(layerno, float32(sys.chars[i][0].power)/
-				float32(sys.chars[i][0].powerMax), sys.chars[i][0].power/1000,
-				l.fnt[:])
+		for ti, _ := range sys.tmode {
+			for i := ti; i < l.num[1][ti]; i += 2 {
+				l.pb[l.ref[1][ti]][i].draw(layerno, float32(sys.chars[i][0].power)/
+					float32(sys.chars[i][0].powerMax), sys.chars[i][0].power/1000,
+					l.fnt[:])
+			}
 		}
-		for ti, tm := range sys.tmode {
-			for i := ti; i < len(l.fa[tm]); i += 2 {
-				l.fa[tm][i].bgDraw(layerno)
+		for ti, _ := range sys.tmode {
+			for i := ti; i < l.num[2][ti]; i += 2 {
+				l.fa[l.ref[2][ti]][i].bgDraw(layerno)
 			}
 		}
-		for ti, tm := range sys.tmode {
-			for i := ti; i < len(l.fa[tm]); i += 2 {
-				if fspr := l.fa[tm][i].face; fspr != nil {
+		for ti, _ := range sys.tmode {
+			for i := ti; i < l.num[2][ti]; i += 2 {
+				if fspr := l.fa[l.ref[2][ti]][i].face; fspr != nil {
 					pfx := sys.chars[i][0].getPalfx()
 					sys.cgi[i].sff.palList.SwapPalMap(&pfx.remap)
 					fspr.Pal = nil
 					fspr.Pal = fspr.GetPal(&sys.cgi[i].sff.palList)
 					sys.cgi[i].sff.palList.SwapPalMap(&pfx.remap)
-					l.fa[tm][i].draw(layerno, pfx, i == sys.superplayer)
+					l.fa[l.ref[2][ti]][i].draw(layerno, pfx, i == sys.superplayer)
 				}
 			}
 		}
-		for ti, tm := range sys.tmode {
-			for i := ti; i < len(l.nm[tm]); i += 2 {
-				l.nm[tm][i].bgDraw(layerno)
+		for ti, _ := range sys.tmode {
+			for i := ti; i < l.num[3][ti]; i += 2 {
+				l.nm[l.ref[3][ti]][i].bgDraw(layerno)
 			}
 		}
-		for ti, tm := range sys.tmode {
-			for i := ti; i < len(l.nm[tm]); i += 2 {
-				l.nm[tm][i].draw(layerno, l.fnt[:], sys.cgi[i].displayname)
+		for ti, _ := range sys.tmode {
+			for i := ti; i < l.num[3][ti]; i += 2 {
+				l.nm[l.ref[3][ti]][i].draw(layerno, l.fnt[:], sys.cgi[i].lifebarname)
 			}
 		}
 		l.ti.bgDraw(layerno)
@@ -1400,4 +1726,8 @@ func (l *Lifebar) draw(layerno int16) {
 		}
 	}
 	l.co.draw(layerno, l.fnt[:])
+	if sys.challenger > 0 && l.ch.challenger.displaytime > l.ch.cnt {
+		l.ch.bgDraw(layerno)
+		l.ch.draw(layerno, l.fnt[:])
+	}
 }

--- a/src/main.go
+++ b/src/main.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/go-gl/glfw/v3.3/glfw"
 	lua "github.com/yuin/gopher-lua"
+	"github.com/sqweek/dialog"
 )
 
 func init() {
@@ -47,17 +48,21 @@ func main() {
 				help, _ := regexp.MatchString("^-[h%?]", a)
 				if help {
 					fmt.Println("I.K.E.M.E.N\nOptions (case sensitive):")
-					fmt.Println(" -h -?               Help")
-					fmt.Println(" -log <logfile>      Records match data to <logfile>")
-					fmt.Println(" -r <sysfile>        Loads motif <sysfile>. eg. -r motifdir or -r motifdir/system.def")
+					fmt.Println(" -h -?                      Help")
+					fmt.Println(" -log <logfile>             Records match data to <logfile>")
+					fmt.Println(" -r <sysfile>               Loads motif <sysfile>. eg. -r motifdir or -r motifdir/system.def")
 					fmt.Println("\nQuick VS Options:")
-					fmt.Println(" -p<n> <playername>  Loads player n, eg. -p3 kfm")
-					fmt.Println(" -p<n>.ai <level>    Set player n's AI to <level>, eg. -p1.ai 8")
-					fmt.Println(" -p<n>.color <col>   Set player n's color to <col>")
-					fmt.Println(" -p<n>.life <life>   Sets player n's life to <life>")
-					fmt.Println(" -p<n>.power <power> Sets player n's power to <power>")
-					fmt.Println(" -rounds <num>       Plays for <num> rounds, and then quits")
-					fmt.Println(" -s <stagename>      Loads stage <stagename>")
+					fmt.Println(" -p<n> <playername>         Loads player n, eg. -p3 kfm")
+					fmt.Println(" -p<n>.ai <level>           Set player n's AI to <level>, eg. -p1.ai 8")
+					fmt.Println(" -p<n>.color <col>          Set player n's color to <col>")
+					fmt.Println(" -p<n>.power <power>        Sets player n's power to <power>")
+					fmt.Println(" -p<n>.life <life>          Sets player n's life to <life>")
+					fmt.Println(" -p<n>.lifeMax <life>       Sets player n's max life to <life>")
+					fmt.Println(" -p<n>.lifeRatio <ratio>    Sets player n's life ratio to <ratio>")
+					fmt.Println(" -p<n>.attackRatio <ratio>  Sets player n's attack ratio to <ratio>")
+					fmt.Println(" -p<n>.defenceRatio <ratio> Sets player n's defence ratio to <ratio>")
+					fmt.Println(" -rounds <num>              Plays for <num> rounds, and then quits")
+					fmt.Println(" -s <stagename>             Loads stage <stagename>")
 					fmt.Println("\nPress ENTER to exit.")
 					var s string
 					fmt.Scanln(&s)
@@ -120,13 +125,17 @@ func main() {
 	"CommonCmd": "data/common.cmd",
 	"SimulMode": true,
 	"LifeMul": 100,
-	"Team1VS2Life": 120,
-	"TurnsRecoveryRate": 300,
+	"Team1VS2Life": 100,
+	"TurnsRecoveryBase": 12.5,
+	"TurnsRecoveryBonus": 27.5,
 	"ZoomActive": false,
 	"ZoomMin": 0.75,
 	"ZoomMax": 1.1,
 	"ZoomSpeed": 1,
 	"RoundTime": 99,
+	"RoundsNumSingle": -1,
+	"RoundsNumTeam": -1,
+	"MaxDrawGames": -2,
 	"SingleTeamMode": true,
 	"NumTurns": 4,
 	"NumSimul": 4,
@@ -175,10 +184,11 @@ func main() {
 			Joystick int
 			Buttons  []interface{}
 		}
-		JoystickConfig []struct {
+		JoystickConfig         []struct {
 			Joystick int
 			Buttons  []interface{}
 		}
+		NumSimul                   int
 		NumTag                     int
 		TeamLifeShare              bool
 		AIRandomColor              bool
@@ -239,7 +249,13 @@ func main() {
 		i, _ = strconv.Atoi(key)
 		return i
 	}
-	for a := 0; a < tmp.NumTag; a++ {
+	Max := func(x, y int) int {
+		if x < y {
+			return y
+		}
+		return x
+	}
+	for a := 0; a < Max(tmp.NumSimul, tmp.NumTag); a++ {
 		for _, kc := range tmp.KeyConfig {
 			b := kc.Buttons
 			if kc.Joystick < 0 {
@@ -269,7 +285,6 @@ func main() {
 	sys.PostProcessingShader = tmp.PostProcessingShader
 	sys.MultisampleAntialiasing = tmp.MSAA
 	sys.LocalcoordScalingType = tmp.LocalcoordScalingType
-	sys.aiRandomColor = tmp.AIRandomColor
 	sys.allowDebugKeys = tmp.AllowDebugKeys
 	air, err := ioutil.ReadFile(tmp.CommonAir)
 	if err != nil {
@@ -282,7 +297,7 @@ func main() {
 	}
 	sys.commonCmd = string("\n") + string(cmd)
 	//os.Mkdir("debug", os.ModeSticky|0755)
-	log := createLog("Ikemen.txt")
+	log := createLog("Ikemen.log")
 	defer closeLog(log)
 	l := sys.init(tmp.Width, tmp.Height)
 	if err := l.DoFile(tmp.System); err != nil {
@@ -291,9 +306,11 @@ func main() {
 		case *lua.ApiError:
 			errstr := strings.Split(err.Error(), "\n")[0]
 			if len(errstr) < 10 || errstr[len(errstr)-10:] != "<game end>" {
+				dialog.Message("%s\n\nError saved to Ikemen.log logfile.", err).Title("I.K.E.M.E.N Error").Error()
 				panic(err)
 			}
 		default:
+			dialog.Message("%s\n\nError saved to Ikemen.log logfile.", err).Title("I.K.E.M.E.N Error").Error()
 			panic(err)
 		}
 	}

--- a/src/render.go
+++ b/src/render.go
@@ -697,25 +697,31 @@ func FillRect(rect [4]int32, color uint32, trans int32) {
 	gl.Translated(0, float64(sys.scrrect[3]), 0)
 	if trans == -1 {
 		gl.BlendFunc(gl.SRC_ALPHA, gl.ONE)
+		gl.BlendEquation(gl.FUNC_ADD)
 		fill(1)
 	} else if trans == -2 {
 		gl.BlendFunc(gl.ZERO, gl.ONE_MINUS_SRC_COLOR)
+		gl.BlendEquation(gl.FUNC_REVERSE_SUBTRACT)
 		fill(1)
 	} else if trans <= 0 {
 	} else if trans < 255 {
 		gl.BlendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA)
+		gl.BlendEquation(gl.FUNC_ADD)
 		fill(float32(trans) / 256)
 	} else if trans < 512 {
 		gl.BlendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA)
+		gl.BlendEquation(gl.FUNC_ADD)
 		fill(1)
 	} else {
 		src, dst := trans&0xff, trans>>10&0xff
 		if dst < 255 {
 			gl.BlendFunc(gl.ZERO, gl.ONE_MINUS_SRC_ALPHA)
+			gl.BlendEquation(gl.FUNC_ADD)
 			fill(float32(dst) / 255)
 		}
 		if src > 0 {
 			gl.BlendFunc(gl.SRC_ALPHA, gl.ONE)
+			gl.BlendEquation(gl.FUNC_ADD)
 			fill(float32(src) / 255)
 		}
 	}

--- a/src/script.go
+++ b/src/script.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"math"
 	"math/rand"
 	"runtime"
 	"runtime/debug"
@@ -31,6 +32,9 @@ func numArg(l *lua.LState, argi int) float64 {
 func boolArg(l *lua.LState, argi int) bool {
 	return l.ToBool(argi)
 }
+func tableArg(l *lua.LState, argi int) *lua.LTable {
+	return l.ToTable(argi)
+}
 func newUserData(l *lua.LState, value interface{}) *lua.LUserData {
 	ud := l.NewUserData()
 	ud.Value = value
@@ -98,6 +102,61 @@ func scriptCommonInit(l *lua.LState) {
 		return 1
 	})
 	//----------------------------------------------------------------
+	luaRegister(l, "getFrameCount", func(l *lua.LState) int {
+		l.Push(lua.LNumber(sys.frameCounter))
+		return 1
+	})
+	
+	luaRegister(l, "clearColor", func(l *lua.LState) int {
+		a := int32(255)
+		if l.GetTop() >= 4 {
+			a = int32(numArg(l, 4))
+		}
+		col := uint32(int32(numArg(l, 3))&0xff | int32(numArg(l, 2))&0xff<<8 |
+		int32(numArg(l, 1))&0xff<<16)
+		FillRect(sys.scrrect, col, a)
+		return 0
+	})
+	luaRegister(l, "fillRect", func(l *lua.LState) int {
+		rect := [4]int32{
+			int32(float32(numArg(l, 1)) * sys.widthScale),
+			int32(float32(numArg(l, 2)) * sys.heightScale),
+			int32(float32(numArg(l, 3)) * sys.widthScale),
+			int32(float32(numArg(l, 4)) * sys.heightScale),
+		}
+		col := uint32(int32(numArg(l, 7))&0xff | int32(numArg(l, 6))&0xff<<8 | int32(numArg(l, 5))&0xff<<16)
+		a := int32(int32(numArg(l, 8))&0xff | int32(numArg(l, 9))&0xff<<10)
+		FillRect(rect, col, a)
+		return 0
+	})
+	luaRegister(l, "fadeScreen", func(l *lua.LState) int {
+		frame := float64(sys.frameCounter - int32(numArg(l, 2)))
+		length := float64(numArg(l, 3))
+		if frame > length || length <= 0 {
+			l.Push(lua.LBool(false))
+			return 1
+		}
+		r, g, b, a := int32(0), int32(0), int32(0), float64(0)
+		if strArg(l, 1) == "fadeout" {
+			a = math.Floor(float64(255) / length * frame)
+		} else if strArg(l, 1) == "fadein" {
+			a = math.Floor(255 - 255 * (frame - 1) / length)
+		}
+		if a < 0 {
+			a = 0
+		} else if a > 255 {
+			a = 255
+		}
+		if l.GetTop() >= 6 {
+			r = int32(numArg(l, 4))
+			g = int32(numArg(l, 5))
+			b = int32(numArg(l, 6))
+		}
+		col := uint32(int32(b)&0xff | int32(g)&0xff<<8 | int32(r)&0xff<<16)
+		FillRect(sys.scrrect, col, int32(a))
+		l.Push(lua.LBool(true))
+		return 1
+	})
 	luaRegister(l, "sffNew", func(l *lua.LState) int {
 		sff, err := loadSff(strArg(l, 1), false)
 		if err != nil {
@@ -201,7 +260,24 @@ func scriptCommonInit(l *lua.LState) {
 		return 0
 	})
 	luaRegister(l, "playBGM", func(l *lua.LState) int {
-		sys.bgm.Open(strArg(l, 1), boolArg(l, 2), int(numArg(l, 3)), int(numArg(l, 4)), int(Atoi(strArg(l, 5))), int(Atoi(strArg(l, 6))))
+		isdefault := true
+		var loop, volume, loopstart, loopend int = 1, 100, 0, 0
+		if l.GetTop() >= 2 {
+			isdefault = boolArg(l, 2)
+		}
+		if l.GetTop() >= 3 {
+			loop = int(numArg(l, 3))
+		}
+		if l.GetTop() >= 4 {
+			volume = int(numArg(l, 4))
+		}
+		if l.GetTop() >= 5 {
+			loopstart = int(numArg(l, 5))
+		}
+		if l.GetTop() >= 6 {
+			loopend = int(numArg(l, 6))
+		}
+		sys.bgm.Open(strArg(l, 1), isdefault, loop, volume, loopstart, loopend)
 		return 0
 	})
 	luaRegister(l, "esc", func(l *lua.LState) int {
@@ -252,6 +328,67 @@ func scriptCommonInit(l *lua.LState) {
 		sys.teamLifeShare = boolArg(l, 1)
 		return 0
 	})
+	luaRegister(l, "setMatchWins", func(l *lua.LState) int {
+		sys.lifebar.ro.match_wins = int32(numArg(l, 1))
+		return 0
+	})
+	luaRegister(l, "getMatchWins", func(l *lua.LState) int {
+		l.Push(lua.LNumber(sys.lifebar.ro.match_wins))
+		return 1
+	})
+	luaRegister(l, "setMatchMaxDrawGames", func(l *lua.LState) int {
+		sys.lifebar.ro.match_maxdrawgames = int32(numArg(l, 1))
+		return 0
+	})
+	luaRegister(l, "getMatchMaxDrawGames", func(l *lua.LState) int {
+		l.Push(lua.LNumber(sys.lifebar.ro.match_maxdrawgames))
+		return 1
+	})
+	luaRegister(l, "getFramesPerCount", func(l *lua.LState) int {
+		l.Push(lua.LNumber(sys.lifebar.ti.framespercount))
+		return 1
+	})
+	luaRegister(l, "setMasterVolume", func(l *lua.LState) int {
+		sys.masterVolume = int(numArg(l, 1))
+		return 0
+	})
+	luaRegister(l, "setBgmVolume", func(l *lua.LState) int {
+		sys.bgmVolume = int(numArg(l, 1))
+		return 0
+	})
+	luaRegister(l, "setWavVolume", func(l *lua.LState) int {
+		sys.wavVolume = int(numArg(l, 1))
+		return 0
+	})
+	luaRegister(l, "setAudioDucking", func(l *lua.LState) int {
+		sys.AudioDucking = boolArg(l, 1)
+		return 0
+	})
+	luaRegister(l, "setAttackLifeToPowerMul", func(l *lua.LState) int {
+		sys.attack_LifeToPowerMul = float32(numArg(l, 1))
+		return 0
+	})
+	luaRegister(l, "setGetHitLifeToPowerMul", func(l *lua.LState) int {
+		sys.getHit_LifeToPowerMul = float32(numArg(l, 1))
+		return 0
+	})
+	luaRegister(l, "setSuperTargetDefenceMul", func(l *lua.LState) int {
+		sys.super_TargetDefenceMul = float32(numArg(l, 1))
+		return 0
+	})
+	luaRegister(l, "setAllowDebugKeys", func(l *lua.LState) int {
+		d := boolArg(l, 1)
+		if !d {
+			if sys.clsnDraw {
+				sys.clsnDraw = false
+			}
+			if sys.debugDraw {
+				sys.debugDraw = false
+			}
+		}
+		sys.allowDebugKeys = d
+		return 0
+	})
 
 	// All the lua sprites will be caled by this value
 	luaRegister(l, "setLuaSpriteScale", func(l *lua.LState) int {
@@ -297,6 +434,40 @@ func scriptCommonInit(l *lua.LState) {
 
 func systemScriptInit(l *lua.LState) {
 	scriptCommonInit(l)
+	luaRegister(l, "bgNew", func(*lua.LState) int {
+		sff := ""
+		if l.GetTop() >= 3 {
+			sff = strArg(l, 3)
+		}
+		num, err := loadBGDef(strArg(l, 1), strArg(l, 2), sff)
+		if err != nil {
+			l.RaiseError(err.Error())
+		}
+		l.Push(lua.LNumber(num))
+		return 1
+	})
+	luaRegister(l, "bgDraw", func(*lua.LState) int {
+		top := false
+		var x, y, scl float32 = 0, 0, 1
+		if l.GetTop() >= 2 {
+			top = boolArg(l, 2)
+		}
+		if l.GetTop() >= 3 {
+			x = float32(numArg(l, 3))
+		}
+		if l.GetTop() >= 4 {
+			y = float32(numArg(l, 4))
+		}
+		if l.GetTop() >= 5 {
+			scl = float32(numArg(l, 5))
+		}
+		sys.bgdef[int(numArg(l, 1))].draw(top, x, y, scl)
+		return 0
+	})
+	luaRegister(l, "bgReset", func(*lua.LState) int {
+		sys.bgdef[int(numArg(l, 1))].reset()
+		return 0
+	})
 	luaRegister(l, "textImgNew", func(*lua.LState) int {
 		l.Push(newUserData(l, NewTextSprite()))
 		return 1
@@ -772,7 +943,8 @@ func systemScriptInit(l *lua.LState) {
 		return 0
 	})
 	luaRegister(l, "setTurnsRecoveryRate", func(l *lua.LState) int {
-		sys.turnsRecoveryRate = float32(numArg(l, 1))
+		sys.turnsRecoveryBase = float32(numArg(l, 1))
+		sys.turnsRecoveryBonus = float32(numArg(l, 2))
 		return 0
 	})
 	luaRegister(l, "setZoom", func(l *lua.LState) int {
@@ -813,6 +985,37 @@ func systemScriptInit(l *lua.LState) {
 		sys.loadStart()
 		return 0
 	})
+	luaRegister(l, "overwriteCharData", func(l *lua.LState) int {
+		pn := int(numArg(l, 1))
+		if pn < 1 || pn > MaxSimul*2+MaxAttachedChar {
+			l.RaiseError("The player number (%v) is invalid.", pn)
+		}
+		tbl := tableArg(l, 2)
+		tbl.ForEach(func(key, value lua.LValue) {
+			switch k := key.(type) {
+			case lua.LString:
+				switch string(k) {
+				case "power":
+					sys.ocd[pn-1].power = int32(lua.LVAsNumber(value))
+				case "life":
+					sys.ocd[pn-1].life = int32(lua.LVAsNumber(value))
+				case "lifeMax":
+					sys.ocd[pn-1].lifeMax = int32(lua.LVAsNumber(value))
+				case "lifeRatio":
+					sys.ocd[pn-1].lifeRatio = float32(lua.LVAsNumber(value))
+				case "attackRatio":
+					sys.ocd[pn-1].attackRatio = float32(lua.LVAsNumber(value))
+				case "defenceRatio":
+					sys.ocd[pn-1].defenceRatio = float32(lua.LVAsNumber(value))
+				default:
+					l.RaiseError("The table key (%v) is invalid.", key)
+				}
+			default:
+				l.RaiseError("The table key type (%v) is invalid.", fmt.Sprintf("%T\n", key))
+			}
+		})
+		return 0
+	})
 	luaRegister(l, "game", func(l *lua.LState) int {
 		tbl := l.NewTable()
 		tbl_chars := l.NewTable()
@@ -827,14 +1030,17 @@ func systemScriptInit(l *lua.LState) {
 				sys.await(FPS)
 			}
 			for i := range sys.cgi {
-				if i < len(sys.lifebar.fa[sys.tmode[i&1]]) {
+				num := len(sys.lifebar.fa[sys.tmode[i&1]])
+				if (sys.tmode[i&1] == TM_Simul || sys.tmode[i&1] == TM_Tag) {
+					num = int(sys.numSimul[i&1]) * 2
+				}
+				if i < num {
 					fa := sys.lifebar.fa[sys.tmode[i&1]][i]
 					fa.face = sys.cgi[i].sff.getOwnPalSprite(
 						int16(fa.face_spr[0]), int16(fa.face_spr[1]))
 
 					fa.scale = sys.cgi[i].portraitscale
 				}
-
 			}
 			runtime.GC()
 			return nil
@@ -923,6 +1129,7 @@ func systemScriptInit(l *lua.LState) {
 						if len(p) > 0 {
 							tmp := l.NewTable()
 							tmp.RawSetString("name", lua.LString(p[0].name))
+							tmp.RawSetString("id", lua.LNumber(p[0].id))
 							tmp.RawSetString("memberNo", lua.LNumber(p[0].memberNo))
 							tmp.RawSetString("selectNo", lua.LNumber(p[0].selectNo))
 							tmp.RawSetString("life", lua.LNumber(p[0].life))
@@ -984,60 +1191,58 @@ func systemScriptInit(l *lua.LState) {
 				tbl.RawSetString("P2wins", lua.LNumber(sys.wins[1]))
 				tbl.RawSetString("P1tmode", lua.LNumber(sys.tmode[0]))
 				tbl.RawSetString("P2tmode", lua.LNumber(sys.tmode[1]))
+				tbl.RawSetString("challenger", lua.LNumber(sys.challenger))
 				sys.timerCount = []int32{}
 				sys.sel.cdefOverwrite = [len(sys.sel.cdefOverwrite)]string{}
 				sys.sel.sdefOverwrite = ""
 				l.Push(lua.LNumber(winp))
 				l.Push(tbl)
+				sys.resetOverwriteCharData()
 				return 2
 			}
 		}
 	})
 	luaRegister(l, "getCharVar", func(*lua.LState) int {
-		for _, p := range sys.chars {
-			if len(p) > 0 && p[0].playerNo+1 == int(numArg(l, 1)) {
-				if strArg(l, 2) == "varGet" {
-					l.Push(lua.LNumber(p[0].varGet(int32(numArg(l, 3))).ToI()))
-				} else if strArg(l, 2) == "fvarGet" {
-					l.Push(lua.LNumber(p[0].fvarGet(int32(numArg(l, 3))).ToI()))
-				} else if strArg(l, 2) == "sysVarGet" {
-					l.Push(lua.LNumber(p[0].sysVarGet(int32(numArg(l, 3))).ToI()))
-				} else if strArg(l, 2) == "sysFvarGet" {
-					l.Push(lua.LNumber(p[0].sysFvarGet(int32(numArg(l, 3))).ToI()))
-				}
-				break
+		pn := int(numArg(l, 1))
+		if pn >= 1 && pn <= len(sys.chars) && len(sys.chars[pn-1]) > 0 {
+			if strArg(l, 2) == "varGet" {
+				l.Push(lua.LNumber(sys.chars[pn-