diff --git a/Zenitha b/Zenitha
index c15d606f..cbc1f7d7 160000
--- a/Zenitha
+++ b/Zenitha
@@ -1 +1 @@
-Subproject commit c15d606f25577898bce650dfc21a3e7a878611a1
+Subproject commit cbc1f7d7c88e046eaa98161d6cfb9542ae2b44fb
diff --git a/assets/game/mechanicLib/mino/dig.lua b/assets/game/mechanicLib/mino/dig.lua
index 3acd6ead..75061693 100644
--- a/assets/game/mechanicLib/mino/dig.lua
+++ b/assets/game/mechanicLib/mino/dig.lua
@@ -77,9 +77,9 @@ dig.checker_event_afterClear=dig.practice_event_afterClear
 
 local function pushShaleGarbage(P)
     P:riseGarbage(P:calculateHolePos(
-        P:random(2,3),-- count
-        -.2,-- splitRate
-        -.1,-- copyRate
+        P:random(2,3), -- count
+        -.2, -- splitRate
+        -.1, -- copyRate
         -1 -- sandwichRate
     ))
 end
@@ -123,10 +123,10 @@ end)
 
 local function pushVolcanicsGarbage(P)
     P:riseGarbage(P:calculateHolePos(
-        P:random(3,4),-- count
-        .2,-- splitRate
+        P:random(3,4), -- count
+        .2,  -- splitRate
         -.1, -- copyRate
-        .1 -- sandwichRate
+        .1   -- sandwichRate
     ))
 end
 dig.volcanics_event_playerInit=TABLE.newPool(function(self,lineStay)
diff --git a/assets/game/mechanicLib/mino/stack.lua b/assets/game/mechanicLib/mino/stack.lua
index 397c525e..a1cd0177 100644
--- a/assets/game/mechanicLib/mino/stack.lua
+++ b/assets/game/mechanicLib/mino/stack.lua
@@ -9,14 +9,14 @@ local scale={
     'E7','G7','A7','C8',
 }
 local lineFont={
-    30,35,40,45,-- 1~4
-    50,50,55,55,55,-- 5~9
-    60,60,60,60,60,-- 10~14
-    75,75,75,80,80,-- 15~19
-    85,85,-- 20,21
-    90,90,-- 22,23
-    95,95,-- 24,25
-    100,-- 26+
+    30,35,40,45, -- 1~4
+    50,50,55,55,55, -- 5~9
+    60,60,60,60,60, -- 10~14
+    75,75,75,80,80, -- 15~19
+    85,85, -- 20,21
+    90,90, -- 22,23
+    95,95, -- 24,25
+    100, -- 26+
 }
 local function outStackState(P)
     return not P.modeData.stack_enabled
diff --git a/assets/game/mechanicLib/mino/survivor.lua b/assets/game/mechanicLib/mino/survivor.lua
index 651c7558..a43cc1c8 100644
--- a/assets/game/mechanicLib/mino/survivor.lua
+++ b/assets/game/mechanicLib/mino/survivor.lua
@@ -118,7 +118,7 @@ function survivor.spike_event_always(P)
                 time=
                     max(6000-50*wave,4000)+ -- Basic delay (from 6s to 4s on wave 40)
                     (i-1)*max(3000-wave*30,1500), -- Split time (from 3s to 1.5s on wave 50)
-                fatal=floor(min(30+wave/4,50)),-- Fatal (from 30 to 50 on wave 80)
+                fatal=floor(min(30+wave/4,50)), -- Fatal (from 30 to 50 on wave 80)
                 -- speed=?,
             })
         end
diff --git a/assets/game/minoPlayer.lua b/assets/game/minoPlayer.lua
index a1857aa8..c3185b46 100644
--- a/assets/game/minoPlayer.lua
+++ b/assets/game/minoPlayer.lua
@@ -1733,9 +1733,9 @@ function MP:render()
                 self:triggerEvent('drawBelowMarks') -- From field's bottom-left, 40px a cell
 
             -- Height lines
-            skin.drawHeightLines(-- All unit are pixel
+            skin.drawHeightLines(     -- All unit are pixel
                 settings.fieldW*40,   -- Field Width
-                (settings.spawnH+settings.extraSpawnH)*40,-- Max Spawning height
+                (settings.spawnH+settings.extraSpawnH)*40, -- Max Spawning height
                 settings.spawnH*40,   -- Spawning height
                 settings.lockoutH*40, -- Lock-out height
                 settings.deathH*40,   -- Death height
@@ -1870,7 +1870,7 @@ end
 --- @class Techmino.Mode.Setting.Mino
 local baseEnv={
     -- Size
-    fieldW=10,-- [WARNING] This is not the real field width, just for generate field object. Change real field size with 'self:changeFieldWidth'
+    fieldW=10, -- [WARNING] This is not the real field width, just for generate field object. Change real field size with 'self:changeFieldWidth'
     spawnH=20,
     extraSpawnH=1,
     lockoutH=1e99,
@@ -1986,7 +1986,7 @@ function MP.new()
         changeSpawnPos={},
 
         -- Special
-        extraSolidCheck={},-- Manually called
+        extraSolidCheck={}, -- Manually called
     }
     self.soundEvent=setmetatable({},soundEventMeta)
 
diff --git a/assets/game/mode/mino/exterior/sprint_40.lua b/assets/game/mode/mino/exterior/sprint_40.lua
index 0189d629..e8a5e898 100644
--- a/assets/game/mode/mino/exterior/sprint_40.lua
+++ b/assets/game/mode/mino/exterior/sprint_40.lua
@@ -106,14 +106,14 @@ return {
             GC.polygon('fill',
                 800*t*lastX,0,
                 800*t*lastX,lastY*maxH,
-                800*t*clearData[i].x,lastY*maxH,-- FLIP --
-                -- 800*t*clearData[i].x,clearData[i].y*maxH,-- FLIP --
+                800*t*clearData[i].x,lastY*maxH, -- FLIP --
+                -- 800*t*clearData[i].x,clearData[i].y*maxH, -- FLIP --
                 800*t*clearData[i].x,0
             )
             GC.setColor(.2,.3,1)
             GC.line(
                 800*t*lastX,lastY*maxH,
-                800*t*clearData[i].x,lastY*maxH,-- FLIP --
+                800*t*clearData[i].x,lastY*maxH, -- FLIP --
                 800*t*clearData[i].x,clearData[i].y*maxH
             )
             lastX,lastY=clearData[i].x,clearData[i].y
@@ -132,7 +132,7 @@ return {
             GC.setLineWidth(2)
             GC.line(
                 800*t*lastX,lastY*maxH,
-                800*t*dropData[i].x,lastY*maxH,-- FLIP --
+                800*t*dropData[i].x,lastY*maxH, -- FLIP --
                 800*t*dropData[i].x,dropData[i].y*maxH
             )
             lastX,lastY=dropData[i].x,dropData[i].y
diff --git a/assets/game/mode/mino/interior/train.lua b/assets/game/mode/mino/interior/train.lua
index cd73c6f9..d3d561ce 100644
--- a/assets/game/mode/mino/interior/train.lua
+++ b/assets/game/mode/mino/interior/train.lua
@@ -16,7 +16,7 @@ return {
         infHold=true,
         -- spawnDelay=26,
         soundEvent={countDown=mechLib.mino.misc.interior_soundEvent_countDown},
-        event={-- Display ghost at not-bad places to help new players learn stacking
+        event={ -- Display ghost at not-bad places to help new players learn stacking
             playerInit=function(P)
                 P.modeData.waitTime=0
                 P.modeData.hint=true
diff --git a/assets/game/mode/mino/interior/tutorial/4.stackBasic.lua b/assets/game/mode/mino/interior/tutorial/4.stackBasic.lua
index cca08196..709635fa 100644
--- a/assets/game/mode/mino/interior/tutorial/4.stackBasic.lua
+++ b/assets/game/mode/mino/interior/tutorial/4.stackBasic.lua
@@ -1,5 +1,5 @@
 local correctPositions={
-    {-- Quest 1
+    { -- Quest 1
         {x=1,y=1,dir={0},       msg="tutorial_stackBasic_m1"},
         {x=4,y=1,dir={0,2}},
         {x=7,y=1,dir={0,2}},
@@ -13,7 +13,7 @@ local correctPositions={
         {x=8,y=4,dir={1,3}},
         {x=10,y=1,dir={1,3},    msg="tutorial_stackBasic_m5"},
     },
-    {-- Quest 2
+    { -- Quest 2
         {x=3,y=1,dir={0}},
         {x=6,y=2,dir={0,1,2,3}},
         {x=3,y=2,dir={0,1,2,3}},
diff --git a/assets/game/puyoPlayer.lua b/assets/game/puyoPlayer.lua
index 8610db97..65af5892 100644
--- a/assets/game/puyoPlayer.lua
+++ b/assets/game/puyoPlayer.lua
@@ -62,26 +62,26 @@ local defaultSoundFunc={
         )
     end,
     chain=setmetatable({
-        function() inst('bass',.70,'A2') end,-- 1 chain
-        function() inst('bass',.75,'C3') end,-- 2 chain
-        function() inst('bass',.80,'D3') end,-- 3 chain
-        function() inst('bass',.85,'E3') end,-- 4 chain
-        function() inst('bass',.90,'G3') end,-- 5 chain
-        function() inst('bass',.90,'A3') inst('lead',.20,'A2') end,-- 6 chain
-        function() inst('bass',.75,'C4') inst('lead',.40,'C3') end,-- 7 chain
-        function() inst('bass',.60,'D4') inst('lead',.60,'D3') end,-- 8 chain
-        function() inst('bass',.40,'E4') inst('lead',.75,'E3') end,-- 9 chain
-        function() inst('bass',.20,'G4') inst('lead',.90,'G3') end,-- 10 chain
-        function() inst('bass',.20,'A4') inst('lead',.85,'A3') end,-- 11 chain
-        function() inst('bass',.40,'A4') inst('lead',.80,'C4') end,-- 12 chain
-        function() inst('bass',.60,'A4') inst('lead',.75,'D4') end,-- 13 chain
-        function() inst('bass',.75,'A4') inst('lead',.70,'E4') end,-- 14 chain
-        function() inst('bass',.90,'A4') inst('lead',.65,'G4') end,-- 15 chain
-        function() inst('bass',.90,'A4') inst('bass',.70,'E5') inst('lead','A4') end,-- 16 chain
-        function() inst('bass',.85,'A4') inst('bass',.75,'E5') inst('lead','C5') end,-- 17 chain
-        function() inst('bass',.80,'A4') inst('bass',.80,'E5') inst('lead','D5') end,-- 18 chain
-        function() inst('bass',.75,'A4') inst('bass',.85,'E5') inst('lead','E5') end,-- 19 chain
-        function() inst('bass',.70,'A4') inst('bass',.90,'E5') inst('lead','G5') end,-- 20 chain
+        function() inst('bass',.70,'A2') end, -- 1 chain
+        function() inst('bass',.75,'C3') end, -- 2 chain
+        function() inst('bass',.80,'D3') end, -- 3 chain
+        function() inst('bass',.85,'E3') end, -- 4 chain
+        function() inst('bass',.90,'G3') end, -- 5 chain
+        function() inst('bass',.90,'A3') inst('lead',.20,'A2') end, -- 6 chain
+        function() inst('bass',.75,'C4') inst('lead',.40,'C3') end, -- 7 chain
+        function() inst('bass',.60,'D4') inst('lead',.60,'D3') end, -- 8 chain
+        function() inst('bass',.40,'E4') inst('lead',.75,'E3') end, -- 9 chain
+        function() inst('bass',.20,'G4') inst('lead',.90,'G3') end, -- 10 chain
+        function() inst('bass',.20,'A4') inst('lead',.85,'A3') end, -- 11 chain
+        function() inst('bass',.40,'A4') inst('lead',.80,'C4') end, -- 12 chain
+        function() inst('bass',.60,'A4') inst('lead',.75,'D4') end, -- 13 chain
+        function() inst('bass',.75,'A4') inst('lead',.70,'E4') end, -- 14 chain
+        function() inst('bass',.90,'A4') inst('lead',.65,'G4') end, -- 15 chain
+        function() inst('bass',.90,'A4') inst('bass',.70,'E5') inst('lead','A4') end, -- 16 chain
+        function() inst('bass',.85,'A4') inst('bass',.75,'E5') inst('lead','C5') end, -- 17 chain
+        function() inst('bass',.80,'A4') inst('bass',.80,'E5') inst('lead','D5') end, -- 18 chain
+        function() inst('bass',.75,'A4') inst('bass',.85,'E5') inst('lead','E5') end, -- 19 chain
+        function() inst('bass',.70,'A4') inst('bass',.90,'E5') inst('lead','G5') end, -- 20 chain
     },{__call=function(self,chain)
         if self[chain] then
             self[chain]()
@@ -1116,12 +1116,12 @@ function PP:render()
             self:triggerEvent('drawBelowMarks') -- From frame's bottom-left, 40px a cell
 
             -- Height lines
-            skin.drawHeightLines(-- All unit are pixel
-                settings.fieldW*40,  -- Field Width
-                settings.spawnH*40,  -- Spawning height
-                settings.lockoutH*40,-- Lock-out height
-                settings.deathH*40,  -- Death height
-                settings.voidH*40    -- Void height
+            skin.drawHeightLines(     -- All unit are pixel
+                settings.fieldW*40,   -- Field Width
+                settings.spawnH*40,   -- Spawning height
+                settings.lockoutH*40, -- Lock-out height
+                settings.deathH*40,   -- Death height
+                settings.voidH*40     -- Void height
             )
 
             self:triggerEvent('drawInField') -- From frame's bottom-left, 40px a cell
@@ -1205,12 +1205,12 @@ end
 --- @class Techmino.Mode.Setting.Puyo
 local baseEnv={
     -- Size
-    fieldW=6,-- [WARNING] This is not the real field width, just for generate field object. Change real field size with 'self:changeFieldWidth'
+    fieldW=6, -- [WARNING] This is not the real field width, just for generate field object. Change real field size with 'self:changeFieldWidth'
     spawnH=11,
     lockoutH=1e99,
     deathH=1e99,
     voidH=620,
-    connH=12,-- Default to 12
+    connH=12, -- Default to 12
 
     -- Sequence
     seqType='double4color',
diff --git a/assets/game/rotsys_mino/birs.lua b/assets/game/rotsys_mino/birs.lua
index 8bf60c1a..459a7a1f 100644
--- a/assets/game/rotsys_mino/birs.lua
+++ b/assets/game/rotsys_mino/birs.lua
@@ -17,37 +17,37 @@ for i=1,#R do R[i]=minoRotSys._strToVec(R[i]) end
 for i=1,#L do L[i]=minoRotSys._strToVec(L[i]) end
 for i=1,#F do F[i]=minoRotSys._strToVec(F[i]) end
 local list={
-    {[02]=L,[20]=R,[13]=R,[31]=L},-- Z
-    {[02]=R,[20]=L,[13]=L,[31]=R},-- S
-    {[02]=L,[20]=R,[13]=L,[31]=R},-- J
-    {[02]=R,[20]=L,[13]=L,[31]=R},-- L
-    {[02]=F,[20]=F,[13]=L,[31]=R},-- T
-    {[02]=F,[20]=F,[13]=F,[31]=F},-- O
-    {[02]=F,[20]=F,[13]=R,[31]=L},-- I
+    {[02]=L,[20]=R,[13]=R,[31]=L}, -- Z
+    {[02]=R,[20]=L,[13]=L,[31]=R}, -- S
+    {[02]=L,[20]=R,[13]=L,[31]=R}, -- J
+    {[02]=R,[20]=L,[13]=L,[31]=R}, -- L
+    {[02]=F,[20]=F,[13]=L,[31]=R}, -- T
+    {[02]=F,[20]=F,[13]=F,[31]=F}, -- O
+    {[02]=F,[20]=F,[13]=R,[31]=L}, -- I
 
-    {[02]=L,[20]=L,[13]=R,[31]=R},-- Z5
-    {[02]=R,[20]=R,[13]=L,[31]=L},-- S5
-    {[02]=L,[20]=R,[13]=L,[31]=R},-- P
-    {[02]=R,[20]=L,[13]=R,[31]=L},-- Q
-    {[02]=R,[20]=L,[13]=L,[31]=R},-- F
-    {[02]=L,[20]=R,[13]=R,[31]=L},-- E
-    {[02]=F,[20]=F,[13]=L,[31]=R},-- T5
-    {[02]=F,[20]=F,[13]=L,[31]=R},-- U
-    {[02]=R,[20]=L,[13]=L,[31]=R},-- V
-    {[02]=R,[20]=L,[13]=L,[31]=R},-- W
-    {[02]=F,[20]=F,[13]=F,[31]=F},-- X
-    {[02]=L,[20]=R,[13]=R,[31]=L},-- J5
-    {[02]=R,[20]=L,[13]=L,[31]=R},-- L5
-    {[02]=L,[20]=R,[13]=R,[31]=L},-- R
-    {[02]=R,[20]=L,[13]=L,[31]=R},-- Y
-    {[02]=L,[20]=R,[13]=R,[31]=L},-- N
-    {[02]=R,[20]=L,[13]=L,[31]=R},-- H
-    {[02]=F,[20]=F,[13]=F,[31]=F},-- I5
+    {[02]=L,[20]=L,[13]=R,[31]=R}, -- Z5
+    {[02]=R,[20]=R,[13]=L,[31]=L}, -- S5
+    {[02]=L,[20]=R,[13]=L,[31]=R}, -- P
+    {[02]=R,[20]=L,[13]=R,[31]=L}, -- Q
+    {[02]=R,[20]=L,[13]=L,[31]=R}, -- F
+    {[02]=L,[20]=R,[13]=R,[31]=L}, -- E
+    {[02]=F,[20]=F,[13]=L,[31]=R}, -- T5
+    {[02]=F,[20]=F,[13]=L,[31]=R}, -- U
+    {[02]=R,[20]=L,[13]=L,[31]=R}, -- V
+    {[02]=R,[20]=L,[13]=L,[31]=R}, -- W
+    {[02]=F,[20]=F,[13]=F,[31]=F}, -- X
+    {[02]=L,[20]=R,[13]=R,[31]=L}, -- J5
+    {[02]=R,[20]=L,[13]=L,[31]=R}, -- L5
+    {[02]=L,[20]=R,[13]=R,[31]=L}, -- R
+    {[02]=R,[20]=L,[13]=L,[31]=R}, -- Y
+    {[02]=L,[20]=R,[13]=R,[31]=L}, -- N
+    {[02]=R,[20]=L,[13]=L,[31]=R}, -- H
+    {[02]=F,[20]=F,[13]=F,[31]=F}, -- I5
 
-    {[02]=F,[20]=F,[13]=F,[31]=F},-- I3
-    {[02]=R,[20]=L,[13]=L,[31]=R},-- C
-    {[02]=F,[20]=F,[13]=R,[31]=L},-- I2
-    {[02]=F,[20]=F,[13]=F,[31]=F},-- O1
+    {[02]=F,[20]=F,[13]=F,[31]=F}, -- I3
+    {[02]=R,[20]=L,[13]=L,[31]=R}, -- C
+    {[02]=F,[20]=F,[13]=R,[31]=L}, -- I2
+    {[02]=F,[20]=F,[13]=F,[31]=F}, -- O1
 }
 for i=1,29 do
     local a,b=R,L
diff --git a/assets/game/rotsys_mino/init.lua b/assets/game/rotsys_mino/init.lua
index 580c1648..b749adac 100644
--- a/assets/game/rotsys_mino/init.lua
+++ b/assets/game/rotsys_mino/init.lua
@@ -2,46 +2,46 @@ minoRotSys={}
 
 minoRotSys._defaultCenterTex=GC.load{1,1} -- No texture
 minoRotSys._defaultCenterPos={
-    common={-- For SRS-like RSs
+    common={ -- For SRS-like RSs
         -- Tetromino
-        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} },-- Z
-        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} },-- S
-        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} },-- J
-        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} },-- L
-        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} },-- T
-        {[0]={1,1},     [1]={1,1},     [2]={1,1},     [3]={1,1}     },-- O
-        {[0]={2,0},     [1]={0,2},     [2]={2,1},     [3]={1,2}     },-- I
+        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} }, -- Z
+        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} }, -- S
+        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} }, -- J
+        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} }, -- L
+        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} }, -- T
+        {[0]={1,1},     [1]={1,1},     [2]={1,1},     [3]={1,1}     }, -- O
+        {[0]={2,0},     [1]={0,2},     [2]={2,1},     [3]={1,2}     }, -- I
 
         -- Pentomino
-        {[0]={1.5,1.5}, [1]={1.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} },-- Z5
-        {[0]={1.5,1.5}, [1]={1.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} },-- S5
-        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} },-- P
-        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} },-- Q
-        {[0]={1.5,1.5}, [1]={1.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} },-- F
-        {[0]={1.5,1.5}, [1]={1.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} },-- E
-        {[0]={1.5,1.5}, [1]={1.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} },-- T5
-        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} },-- U
-        {[0]={2,1},     [1]={1,1},     [2]={1,2},     [3]={2,2}     },-- V
-        {[0]={1.5,1.5}, [1]={1.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} },-- W
-        {[0]={1.5,1.5}, [1]={1.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} },-- X
-
-        {[0]={2,1},     [1]={1,2},     [2]={2,1},     [3]={1,2}     },-- J5
-        {[0]={2,1},     [1]={1,2},     [2]={2,1},     [3]={1,2}     },-- L5
-        {[0]={2,1},     [1]={1,2},     [2]={2,1},     [3]={1,2}     },-- R
-        {[0]={2,1},     [1]={1,2},     [2]={2,1},     [3]={1,2}     },-- Y
-        {[0]={2,1},     [1]={1,2},     [2]={2,1},     [3]={1,2}     },-- N
-        {[0]={2,1},     [1]={1,2},     [2]={2,1},     [3]={1,2}     },-- H
-        {[0]={2.5,0.5}, [1]={0.5,2.5}, [2]={2.5,0.5}, [3]={0.5,2.5} },-- I5
+        {[0]={1.5,1.5}, [1]={1.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} }, -- Z5
+        {[0]={1.5,1.5}, [1]={1.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} }, -- S5
+        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} }, -- P
+        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} }, -- Q
+        {[0]={1.5,1.5}, [1]={1.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} }, -- F
+        {[0]={1.5,1.5}, [1]={1.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} }, -- E
+        {[0]={1.5,1.5}, [1]={1.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} }, -- T5
+        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} }, -- U
+        {[0]={2,1},     [1]={1,1},     [2]={1,2},     [3]={2,2}     }, -- V
+        {[0]={1.5,1.5}, [1]={1.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} }, -- W
+        {[0]={1.5,1.5}, [1]={1.5,1.5}, [2]={1.5,1.5}, [3]={1.5,1.5} }, -- X
+
+        {[0]={2,1},     [1]={1,2},     [2]={2,1},     [3]={1,2}     }, -- J5
+        {[0]={2,1},     [1]={1,2},     [2]={2,1},     [3]={1,2}     }, -- L5
+        {[0]={2,1},     [1]={1,2},     [2]={2,1},     [3]={1,2}     }, -- R
+        {[0]={2,1},     [1]={1,2},     [2]={2,1},     [3]={1,2}     }, -- Y
+        {[0]={2,1},     [1]={1,2},     [2]={2,1},     [3]={1,2}     }, -- N
+        {[0]={2,1},     [1]={1,2},     [2]={2,1},     [3]={1,2}     }, -- H
+        {[0]={2.5,0.5}, [1]={0.5,2.5}, [2]={2.5,0.5}, [3]={0.5,2.5} }, -- I5
 
         -- Trimino
-        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,0.5}, [3]={0.5,1.5} },-- I3
-        {[0]={1,1},     [1]={1,1},     [2]={1,1},     [3]={1,1}     },-- C
+        {[0]={1.5,0.5}, [1]={0.5,1.5}, [2]={1.5,0.5}, [3]={0.5,1.5} }, -- I3
+        {[0]={1,1},     [1]={1,1},     [2]={1,1},     [3]={1,1}     }, -- C
 
         -- Domino
-        {[0]={1,0},     [1]={0,1},     [2]={1,1},     [3]={1,1}     },-- I2
+        {[0]={1,0},     [1]={0,1},     [2]={1,1},     [3]={1,1}     }, -- I2
 
         -- Dot
-        {[0]={0.5,0.5}, [1]={0.5,0.5}, [2]={0.5,0.5}, [3]={0.5,0.5} },-- O1
+        {[0]={0.5,0.5}, [1]={0.5,0.5}, [2]={0.5,0.5}, [3]={0.5,0.5} }, -- O1
     },
 }
 
diff --git a/assets/game/rotsys_mino/physical.lua b/assets/game/rotsys_mino/physical.lua
index c90f4924..27e6dfcb 100644
--- a/assets/game/rotsys_mino/physical.lua
+++ b/assets/game/rotsys_mino/physical.lua
@@ -3,7 +3,7 @@ Physical.centerTex=GC.load{10,10,
     {'setLW',2},
     {'dRect',0,0,10,10},
 }
-Physical[1]={-- Z
+Physical[1]={ -- Z
     [0]={
         R={target=1,base='+1+0',test={'+0+0','+0-1','-1+0','+0+1','-1+1'}},
         L={target=1,base='+0+0',test={'+0+0','+0-1','+0+1','+1+0','+1+1'}},
@@ -15,7 +15,7 @@ Physical[1]={-- Z
         F={target=1,base='-1+0',test={'+0+0','+0-1','+1+1','+1+0'}},
     },
 }
-Physical[2]={-- S
+Physical[2]={ -- S
     [0]={
         R={target=1,base='+1+0',test=minoRotSys._flipList(Physical[1][0].L.test)},
         L={target=1,base='+0+0',test=minoRotSys._flipList(Physical[1][0].R.test)},
@@ -27,7 +27,7 @@ Physical[2]={-- S
         F={target=1,base='+1+0',test=minoRotSys._flipList(Physical[1][1].F.test)},
     },
 }
-Physical[3]={-- J
+Physical[3]={ -- J
     [0]={
         R={base='+1-1',test={'+0+0','-1+0','+0+1','-1+1','+1+0','+1+1'}},
         L={base='+0-1',test={'+0+0','+1+0','+0+1','+1+1','-1+0','+0-1','+1-1'}},
@@ -49,7 +49,7 @@ Physical[3]={-- J
         F={base='+1+0',test={'+0+0','+1+0','+0-1','+1-1','+0+1','+0+2'}},
     },
 }
-Physical[4]={-- L
+Physical[4]={ -- L
     [0]={
         R={base=Physical[3][0].R.base,test=minoRotSys._flipList(Physical[3][0].L.test)},
         L={base=Physical[3][0].L.base,test=minoRotSys._flipList(Physical[3][0].R.test)},
@@ -71,7 +71,7 @@ Physical[4]={-- L
         F={base=Physical[3][3].F.base,test=minoRotSys._flipList(Physical[3][1].F.test)},
     },
 }
-Physical[5]={-- T
+Physical[5]={ -- T
     [0]={
         R={base=Physical[3][0].R.base,test={'+0+0','-1+0','+0+1','-1+1','+1+0'}},
         L={base=Physical[3][0].L.base,test={'+0+0','+1+0','+0+1','+1+1','-1+0'}},
@@ -93,14 +93,14 @@ Physical[5]={-- T
         F={base=Physical[3][3].F.base,test={'+0+0','-1+0','+0-1','-1-1','+0+1','-1+1','+0+2','-1+2'}},
     },
 }
-Physical[6]={-- O
+Physical[6]={ -- O
     [0]={
         R={target=0,base='+1+0',test={'+0+0','+0-1','+1-1','+0-2'}},
         L={target=0,base='-1+0',test={'+0+0','+0-1','-1-1','+0-2'}},
         F={target=0,base='+0-1',test={'+0+0','-1+0','+1+0'}},
     },
 }
-Physical[7]={-- I
+Physical[7]={ -- I
     [0]={
         R={target=1,base='+2-1',test={'+0+0','+1+0','-1-1','-2-1','+0-1','+1-1','-1+0','-2+0','+0-2','+1-2','-1+1','-2+1'}},
         L={target=1,base='+1-1',test={'+0+0','-1+0','+1-1','+2-1','+0-1','-1-1','+1+0','+2+0','+0-2','-1-2','+1+1','+2+1'}},
diff --git a/assets/game/rotsys_mino/srs.lua b/assets/game/rotsys_mino/srs.lua
index 36a3b6ce..3c62f9f4 100644
--- a/assets/game/rotsys_mino/srs.lua
+++ b/assets/game/rotsys_mino/srs.lua
@@ -8,8 +8,8 @@ SRS.centerTex=GC.load{10,10,
     {'setCL',1,1,1},
     {'fCirc',5,5,2},
 }
-SRS[1]={-- This is a MINODATA for S piece
-    [0]={-- This is a STATE
+SRS[1]={ -- This is a MINODATA for S piece
+    [0]={ -- This is a STATE
         -- If field 'center' exist(center={x,y}, (x=right Y=up) ), will draw spin center and be used for calculate base X/Y bias
         -- You can see ".centerPreset='common'" up there, so no need to set center here
 
@@ -38,15 +38,15 @@ SRS[1]={-- This is a MINODATA for S piece
     },
 }
 for i=2,5 do
-    SRS[i]=SRS[1]-- Don't worry about duplicating object, I will deep copy all of them later
+    SRS[i]=SRS[1] -- Don't worry about duplicating object, I will deep copy all of them later
 end
-SRS[6]={-- O
+SRS[6]={ -- O
     [0]={R={},L={},F={}},
     [1]={R={},L={},F={}},
     [2]={R={},L={},F={}},
     [3]={R={},L={},F={}},
 }
-SRS[7]={-- I
+SRS[7]={ -- I
     [0]={
         R={test={'+0+0','-2+0','+1+0','-2-1','+1+2'}},
         L={test={'+0+0','-1+0','+2+0','-1+2','+2-1'}},
diff --git a/assets/language/lang_en.lua b/assets/language/lang_en.lua
index baef12f8..2207f77e 100644
--- a/assets/language/lang_en.lua
+++ b/assets/language/lang_en.lua
@@ -67,7 +67,7 @@ return {
     button_back="Back",
 
     simulation_title="Simulations",
-    graph_mino_title="M-Graph",-- Traslation warning: from "Knowledge Graph" (AI domain)
+    graph_mino_title="M-Graph", -- Traslation warning: from "Knowledge Graph" (AI domain)
     settings_title="Settings",
 
     setting_das="DAS",
diff --git a/assets/language/lang_zh.lua b/assets/language/lang_zh.lua
index 90aa3168..0274d351 100644
--- a/assets/language/lang_zh.lua
+++ b/assets/language/lang_zh.lua
@@ -67,7 +67,7 @@ return {
     button_back="返回",
 
     simulation_title="模拟",
-    graph_mino_title="M-图谱",-- 翻译注意：取自“知识图谱”(人工智能领域)
+    graph_mino_title="M-图谱", -- 翻译注意：取自“知识图谱”(人工智能领域)
     settings_title="设置",
 
     setting_das="DAS",
diff --git a/assets/scene/dictionary.lua b/assets/scene/dictionary.lua
index 65d39105..22c558c4 100644
--- a/assets/scene/dictionary.lua
+++ b/assets/scene/dictionary.lua
@@ -8,11 +8,11 @@ local kbIsDown=love.keyboard.isDown
 local scene={}
 
 local categoryColor={
-    intro= {index=COLOR.F, content=COLOR.lF},-- Instruction for current scene
-    guide= {index=COLOR.Y, content=COLOR.lY},-- Practice methods
-    term=  {index=COLOR.lB,content=COLOR.LB},-- Concept in game
-    tech=  {index=COLOR.G, content=COLOR.lG},-- General technics
-    other= {index=COLOR.M, content=COLOR.lM},-- Other
+    intro= {index=COLOR.F, content=COLOR.lF}, -- Instruction for current scene
+    guide= {index=COLOR.Y, content=COLOR.lY}, -- Practice methods
+    term=  {index=COLOR.lB,content=COLOR.LB}, -- Concept in game
+    tech=  {index=COLOR.G, content=COLOR.lG}, -- General technics
+    other= {index=COLOR.M, content=COLOR.lM}, -- Other
 }
 local mainW,mainH=900,700
 local mainX=100-mainW/2
diff --git a/assets/scene/simulation.lua b/assets/scene/simulation.lua
index 67b95749..31b8bd1f 100644
--- a/assets/scene/simulation.lua
+++ b/assets/scene/simulation.lua
@@ -12,7 +12,7 @@
 
 --- @type Techmino.simulation[]
 local sims={
-    {-- Mino
+    { -- Mino
         trigger=function()
             DEBUG.yieldUntilNextScene()
             if SCN.cur=='simulation' then
@@ -35,7 +35,7 @@ local sims={
             )
         end,
     },
-    {-- Puyo
+    { -- Puyo
         trigger=function()
             DEBUG.yieldUntilNextScene()
             if SCN.cur=='simulation' then
@@ -49,7 +49,7 @@ local sims={
             GC.circle('line',35,60,70)
         end,
     },
-    {-- Gem
+    { -- Gem
         trigger=function()
             DEBUG.yieldUntilNextScene()
             if SCN.cur=='simulation' then
diff --git a/assets/scene/tutorial_rotate.lua b/assets/scene/tutorial_rotate.lua
index 280fb267..c13e149f 100644
--- a/assets/scene/tutorial_rotate.lua
+++ b/assets/scene/tutorial_rotate.lua
@@ -18,33 +18,33 @@ local shapes do
     local O,_=true,false
     shapes={
         -- Tetromino
-        {matrix={{O,O,_},{_,O,O},{_,_,_}},no180=true},-- Z
-        {matrix={{_,O,O},{O,O,_},{_,_,_}},no180=true},-- S
-        {matrix={{O,_,_},{O,O,O},{_,_,_}}},-- J
-        {matrix={{_,_,O},{O,O,O},{_,_,_}}},-- L
-        {matrix={{_,O,_},{O,O,O},{_,_,_}}},-- T
-        {unuse=true,matrix={{O,O},{O,O}}},-- O
-        {matrix={{_,_,_,_},{O,O,O,O},{_,_,_,_},{_,_,_,_}},no180=true},-- I
+        {matrix={{O,O,_},{_,O,O},{_,_,_}},no180=true}, -- Z
+        {matrix={{_,O,O},{O,O,_},{_,_,_}},no180=true}, -- S
+        {matrix={{O,_,_},{O,O,O},{_,_,_}}}, -- J
+        {matrix={{_,_,O},{O,O,O},{_,_,_}}}, -- L
+        {matrix={{_,O,_},{O,O,O},{_,_,_}}}, -- T
+        {unuse=true,matrix={{O,O},{O,O}}}, -- O
+        {matrix={{_,_,_,_},{O,O,O,O},{_,_,_,_},{_,_,_,_}},no180=true}, -- I
 
         -- Pentomino
-        {unuse=true,matrix={{O,O,_},{_,O,_},{_,O,O}}},-- Z5
-        {unuse=true,matrix={{_,O,O},{_,O,_},{O,O,_}}},-- S5
-        {matrix={{O,O,_},{O,O,O},{_,_,_}}},-- P
-        {matrix={{_,O,O},{O,O,O},{_,_,_}}},-- Q
-        {matrix={{O,_,_},{O,O,O},{_,O,_}}},-- F
-        {matrix={{_,_,O},{O,O,O},{_,O,_}}},-- E
-        {matrix={{_,O,_},{_,O,_},{O,O,O}}},-- T5
-        {matrix={{O,_,O},{O,O,O},{_,_,_}}},-- U
-        {matrix={{_,_,O,_},{_,_,O,O},{O,O,O,_},{_,_,_,_}}},-- V
-        {matrix={{O,_,_},{O,O,_},{_,O,O}}},-- W
-        {unuse=true,matrix={{_,O,_},{O,O,O},{_,O,_}}},-- X
-        {matrix={{_,_,_,_},{O,_,_,_},{O,O,O,O},{_,_,_,_}}},-- J5
-        {matrix={{_,_,_,_},{_,_,_,O},{O,O,O,O},{_,_,_,_}}},-- L5
-        {matrix={{_,_,_,_},{_,O,_,_},{O,O,O,O},{_,_,_,_}}},-- R
-        {matrix={{_,_,_,_},{_,_,O,_},{O,O,O,O},{_,_,_,_}}},-- Y
-        {matrix={{_,_,_,_},{O,O,_,_},{_,O,O,O},{_,_,_,_}}},-- N
-        {matrix={{_,_,_,_},{_,_,O,O},{O,O,O,_},{_,_,_,_}}},-- H
-        {unuse=true,matrix={{_,_,_,_,_},{_,_,_,_,_},{O,O,O,O,O},{_,_,_,_,_},{_,_,_,_,_}}},-- I5
+        {unuse=true,matrix={{O,O,_},{_,O,_},{_,O,O}}}, -- Z5
+        {unuse=true,matrix={{_,O,O},{_,O,_},{O,O,_}}}, -- S5
+        {matrix={{O,O,_},{O,O,O},{_,_,_}}}, -- P
+        {matrix={{_,O,O},{O,O,O},{_,_,_}}}, -- Q
+        {matrix={{O,_,_},{O,O,O},{_,O,_}}}, -- F
+        {matrix={{_,_,O},{O,O,O},{_,O,_}}}, -- E
+        {matrix={{_,O,_},{_,O,_},{O,O,O}}}, -- T5
+        {matrix={{O,_,O},{O,O,O},{_,_,_}}}, -- U
+        {matrix={{_,_,O,_},{_,_,O,O},{O,O,O,_},{_,_,_,_}}}, -- V
+        {matrix={{O,_,_},{O,O,_},{_,O,O}}}, -- W
+        {unuse=true,matrix={{_,O,_},{O,O,O},{_,O,_}}}, -- X
+        {matrix={{_,_,_,_},{O,_,_,_},{O,O,O,O},{_,_,_,_}}}, -- J5
+        {matrix={{_,_,_,_},{_,_,_,O},{O,O,O,O},{_,_,_,_}}}, -- L5
+        {matrix={{_,_,_,_},{_,O,_,_},{O,O,O,O},{_,_,_,_}}}, -- R
+        {matrix={{_,_,_,_},{_,_,O,_},{O,O,O,O},{_,_,_,_}}}, -- Y
+        {matrix={{_,_,_,_},{O,O,_,_},{_,O,O,O},{_,_,_,_}}}, -- N
+        {matrix={{_,_,_,_},{_,_,O,O},{O,O,O,_},{_,_,_,_}}}, -- H
+        {unuse=true,matrix={{_,_,_,_,_},{_,_,_,_,_},{O,O,O,O,O},{_,_,_,_,_},{_,_,_,_,_}}}, -- I5
     }
 end
 
diff --git a/assets/skin/gem_template.lua b/assets/skin/gem_template.lua
index c09b8c95..db27fdd6 100644
--- a/assets/skin/gem_template.lua
+++ b/assets/skin/gem_template.lua
@@ -52,7 +52,7 @@ function S.drawFieldBorder()
 end
 
 local gemShapes={
-    {-- Red Square
+    { -- Red Square
         color={COLOR.hsv(.97,.9,1,.5)},
         coords={
             -16,-10,
@@ -65,7 +65,7 @@ local gemShapes={
             -16,10,
         },
     },
-    {-- Orange Hexagon
+    { -- Orange Hexagon
         color={COLOR.hsv(.1,.9,1,.5)},
         coords=(function()
             local l={}
@@ -76,7 +76,7 @@ local gemShapes={
             return l
         end)()
     },
-    {-- Yellow Rhombus
+    { -- Yellow Rhombus
         color={COLOR.hsv(.18,.9,1,.5)},
         coords=(function()
             local l={}
@@ -87,7 +87,7 @@ local gemShapes={
             return l
         end)()
     },
-    {-- Green Octagon
+    { -- Green Octagon
         color={COLOR.hsv(.33,.85,.9,.5)},
         coords=(function()
             local l={}
@@ -98,7 +98,7 @@ local gemShapes={
             return l
         end)()
     },
-    {-- Blue Diamond
+    { -- Blue Diamond
         color={COLOR.hsv(.58,1,1,.5)},
         coords={
             0,18,
@@ -108,7 +108,7 @@ local gemShapes={
             -17,-5,
         },
     },
-    {-- Magenta Triangle
+    { -- Magenta Triangle
         color={COLOR.hsv(.86,.9,1,.5)},
         coords={
             0,-15,
@@ -116,7 +116,7 @@ local gemShapes={
             -16,15,
         },
     },
-    {-- White Circle
+    { -- White Circle
         color={COLOR.hsv(0,0,1,.5)},
         coords=(function()
             local l={}