diff --git a/main.lua b/main.lua
index 0f671989..131fed83 100644
--- a/main.lua
+++ b/main.lua
@@ -197,6 +197,12 @@ do
 		R.tech_finesse2=R["tech_finesse+"]
 		R["tech_normal+"],R["tech_hard+"],R["tech_lunatic+"],R["tech_finesse+"]=nil
 	end
+	if R.infinite and R.infinite~=6 then
+		R.infinite=6
+		R.infinite_dig=6
+		fs.remove("infinite.dat")
+		fs.remove("infinite_dig.dat")
+	end
 	if not text.modes[STAT.lastPlay]then
 		STAT.lastPlay="sprint_10"
 	end
diff --git a/modes/infinite.lua b/modes/infinite.lua
index aaf855a3..46128619 100644
--- a/modes/infinite.lua
+++ b/modes/infinite.lua
@@ -16,17 +16,4 @@ return{
 		mText(drawableText.atk,69,313)
 		mText(drawableText.eff,69,433)
 	end,
-	score=function(P)return{P.stat.score}end,
-	scoreDisp=function(D)return tostring(D[1])end,
-	comp=function(a,b)return a[1]>b[1]end,
-	getRank=function(P)
-		local L=P.stat.row
-		return
-		L>=1200 and 5 or
-		L>=900 and 4 or
-		L>=600 and 3 or
-		L>=300 and 2 or
-		L>=100 and 1 or
-		L>=20 and 0
-	end,
 }
\ No newline at end of file
diff --git a/modes/infinite_dig.lua b/modes/infinite_dig.lua
index 81d8fdad..89ae2485 100644
--- a/modes/infinite_dig.lua
+++ b/modes/infinite_dig.lua
@@ -51,17 +51,4 @@ return{
 		mText(drawableText.atk,69,433)
 		mText(drawableText.eff,69,545)
 	end,
-	score=function(P)return{P.stat.dig}end,
-	scoreDisp=function(D)return D[1].." Lines"end,
-	comp=function(a,b)return a[1]>b[1]end,
-	getRank=function(P)
-		local L=P.stat.dig
-		return
-		L>=400 and 5 or
-		L>=300 and 4 or
-		L>=200 and 3 or
-		L>=100 and 2 or
-		L>=40 and 1 or
-		L>=5 and 0
-	end,
 }
\ No newline at end of file
diff --git a/parts/modes.lua b/parts/modes.lua
index 4d4d6f88..8764dec1 100644
--- a/parts/modes.lua
+++ b/parts/modes.lua
@@ -102,6 +102,6 @@ return{
 	{name="infinite",				x=-800,		y=-400,		size=35,shape=1,icon="infinite"},
 	{name="infinite_dig",			x=-1000,	y=-600,		size=35,shape=1,icon="infinite"},
 
-	{name="custom_puzzle",			x=0,		y=2600,		size=45,shape=1,icon="none"},
-	{name="custom_clear",			x=0,		y=2600,		size=45,shape=1,icon="none"},
+	{name="custom_puzzle"},
+	{name="custom_clear"},
 }
\ No newline at end of file
diff --git a/parts/player/player.lua b/parts/player/player.lua
index eb2cbef9..ce7994a1 100644
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -1264,7 +1264,7 @@ local function gameOver()--Save record
 						local m=M.unlock[i]
 						local n=MODES[m].name
 						if not RANKS[n]then
-							RANKS[n]=MODES[m].score and 0 or 6
+							RANKS[n]=MODES[m].getRank and 0 or 6
 							needSave=true
 						end
 					end
diff --git a/parts/scenes/mode.lua b/parts/scenes/mode.lua
index d35456e6..b21bfdaa 100644
--- a/parts/scenes/mode.lua
+++ b/parts/scenes/mode.lua
@@ -38,7 +38,7 @@ local function onMode(x,y)
 	x=(cam.x1-640+x)/cam.k1
 	y=(cam.y1-360+y)/cam.k1
 	for name,M in next,MODES do
-		if RANKS[name]then
+		if RANKS[name]and M.x then
 			local s=M.size
 			if M.shape==1 then
 				if x>M.x-s and x<M.x+s and y>M.y-s and y<M.y+s then return name end
@@ -163,7 +163,7 @@ function Tmr.mode()
 		end
 		local x1,y1=(cam.x1-180)/cam.k1,cam.y1/cam.k1
 		for name,M in next,MODES do
-			if RANKS[name]then
+			if RANKS[name]and M.x then
 				local SEL
 				local s=M.size
 				if M.shape==1 then
@@ -225,7 +225,7 @@ function Pnt.mode()
 	gc.setLineWidth(8)
 	gc.setColor(1,1,1,.2)
 	for name,M in next,MODES do
-		if R[name]and M.unlock then
+		if R[name]and M.unlock and M.x then
 			for _=1,#M.unlock do
 				local m=MODES[M.unlock[_]]
 				gc.line(M.x,M.y,m.x,m.y)