diff --git a/chinaset-mtraddon.nml b/chinaset-mtraddon.nml
index 6bfc5cb..d1b43de 100644
--- a/chinaset-mtraddon.nml
+++ b/chinaset-mtraddon.nml
@@ -175,79 +175,69 @@ template template_purchase (a, b) {
     []
 }
 
-/* template template_standard (a, b) {
-    [  0,   0,  36, 160, -12, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [ 44,   0, 120, 116, -72, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [172,   0, 192,  80, -96, -60, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [372,   0, 120, 116, -40, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [500,   0,  36, 160, -12, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [544,   0, 120, 116, -72, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [672,   0, 192,  80, -96, -60, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [872,   0, 120, 116, -40, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-}
-
-template template_reversed (a, b) {
-    [500,   0,  36, 160, -12, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [544,   0, 120, 116, -72, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [672,   0, 192,  80, -96, -60, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [872,   0, 120, 116, -40, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [  0,   0,  36, 160, -12, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [ 44,   0, 120, 116, -72, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [172,   0, 192,  80, -96, -60, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [372,   0, 120, 116, -40, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-}
- */
 template template_standard (a, b) {
-    [  0,   0,  36, 160, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [  0,   0,  36, 166, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
     [ 44,   0, 120, 116, -75, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
     [172,   0, 192,  80, -96, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
     [372,   0, 120, 116, -41, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [500,   0,  36, 160, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [500,   0,  36, 166, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
     [544,   0, 120, 116, -75, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
     [672,   0, 192,  80, -96, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
     [872,   0, 120, 116, -41, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
 }
 
 template template_reversed (a, b) {
-    [500,   0,  36, 160, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [500,   0,  36, 166, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
     [544,   0, 120, 116, -75, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
     [672,   0, 192,  80, -96, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
     [872,   0, 120, 116, -41, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [  0,   0,  36, 160, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [  0,   0,  36, 166, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
     [ 44,   0, 120, 116, -75, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
     [172,   0, 192,  80, -96, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
     [372,   0, 120, 116, -41, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
 }
 
 template template_reversed_11 (a, b) {
-    [500,   0,  36, 160, -14, -87, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [500,   0,  36, 166, -14, -88, "gfx/"+a+"/"+b+"_32bpp.png"]
     [544,   0, 120, 116, -67, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
     [672,   0, 192,  80, -80, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
     [872,   0, 120, 116, -33, -68, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [  0,   0,  36, 160, -14, -73, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [  0,   0,  36, 166, -14, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
     [ 44,   0, 120, 116, -83, -68, "gfx/"+a+"/"+b+"_32bpp.png"]
     [172,   0, 192,  80, -112, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
     [372,   0, 120, 116, -49, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
 }
 
+template template_reversed_10 (a, b) {
+    [500,   0,  36, 166, -14, -96, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [544,   0, 120, 116, -59, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [672,   0, 192,  80, -64, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [872,   0, 120, 116, -25, -64, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [  0,   0,  36, 166, -14, -64, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [ 44,   0, 120, 116, -91, -64, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [172,   0, 192,  80, -128, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [372,   0, 120, 116, -57, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
+}
+
+
 // Below shamelessly stolen from JP+ Shinkansen
 spriteset (spriteset_too_many_12, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "gfx/misc/less12_32bpp.png") {
-    [  0,   0,  36, 160, -14, -80]
+    [  0,   0,  36, 166, -14, -80]
     [ 44,   0, 120, 116, -75, -72]
     [172,   0, 192,  80, -96, -60]
     [372,   0, 120, 116, -41, -72]
-    [500,   0,  36, 160, -14, -80]
+    [500,   0,  36, 166, -14, -80]
     [544,   0, 120, 116, -75, -72]
     [672,   0, 192,  80, -96, -60]
     [872,   0, 120, 116, -41, -72]
 }
 
 spriteset (spriteset_erroremu, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "gfx/misc/erroremu_32bpp.png") {
-    [  0,   0,  36, 160, -14, -80]
+    [  0,   0,  36, 166, -14, -80]
     [ 44,   0, 120, 116, -75, -71]
     [172,   0, 192,  80, -96, -62]
     [372,   0, 120, 116, -41, -71]
-    [500,   0,  36, 160, -14, -80]
+    [500,   0,  36, 166, -14, -80]
     [544,   0, 120, 116, -75, -71]
     [672,   0, 192,  80, -96, -62]
     [872,   0, 120, 116, -41, -71]
diff --git a/manifest.json b/manifest.json
index 45d6a46..f4b36eb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -23,7 +23,7 @@
     {
       "angle": 0,
       "width": 36,
-      "height": 160,
+      "height": 166,
       "flip": true,
       "render_elevation": 33
     },
@@ -48,7 +48,7 @@
     {
       "angle": 180,
       "width": 36,
-      "height": 160,
+      "height": 166,
       "flip": true,
       "render_elevation": 33
     },
@@ -71,4 +71,4 @@
       "flip": true
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/template.pnml b/src/template.pnml
index 04865e3..993beac 100644
--- a/src/template.pnml
+++ b/src/template.pnml
@@ -40,79 +40,69 @@ template template_purchase (a, b) {
     []
 }
 
-/* template template_standard (a, b) {
-    [  0,   0,  36, 160, -12, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [ 44,   0, 120, 116, -72, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [172,   0, 192,  80, -96, -60, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [372,   0, 120, 116, -40, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [500,   0,  36, 160, -12, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [544,   0, 120, 116, -72, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [672,   0, 192,  80, -96, -60, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [872,   0, 120, 116, -40, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-}
-
-template template_reversed (a, b) {
-    [500,   0,  36, 160, -12, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [544,   0, 120, 116, -72, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [672,   0, 192,  80, -96, -60, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [872,   0, 120, 116, -40, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [  0,   0,  36, 160, -12, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [ 44,   0, 120, 116, -72, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [172,   0, 192,  80, -96, -60, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [372,   0, 120, 116, -40, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
-}
- */
 template template_standard (a, b) {
-    [  0,   0,  36, 160, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [  0,   0,  36, 166, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
     [ 44,   0, 120, 116, -75, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
     [172,   0, 192,  80, -96, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
     [372,   0, 120, 116, -41, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [500,   0,  36, 160, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [500,   0,  36, 166, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
     [544,   0, 120, 116, -75, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
     [672,   0, 192,  80, -96, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
     [872,   0, 120, 116, -41, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
 }
 
 template template_reversed (a, b) {
-    [500,   0,  36, 160, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [500,   0,  36, 166, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
     [544,   0, 120, 116, -75, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
     [672,   0, 192,  80, -96, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
     [872,   0, 120, 116, -41, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [  0,   0,  36, 160, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [  0,   0,  36, 166, -14, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
     [ 44,   0, 120, 116, -75, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
     [172,   0, 192,  80, -96, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
     [372,   0, 120, 116, -41, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
 }
 
 template template_reversed_11 (a, b) {
-    [500,   0,  36, 160, -14, -87, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [500,   0,  36, 166, -14, -88, "gfx/"+a+"/"+b+"_32bpp.png"]
     [544,   0, 120, 116, -67, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
     [672,   0, 192,  80, -80, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
     [872,   0, 120, 116, -33, -68, "gfx/"+a+"/"+b+"_32bpp.png"]
-    [  0,   0,  36, 160, -14, -73, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [  0,   0,  36, 166, -14, -72, "gfx/"+a+"/"+b+"_32bpp.png"]
     [ 44,   0, 120, 116, -83, -68, "gfx/"+a+"/"+b+"_32bpp.png"]
     [172,   0, 192,  80, -112, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
     [372,   0, 120, 116, -49, -76, "gfx/"+a+"/"+b+"_32bpp.png"]
 }
 
+template template_reversed_10 (a, b) {
+    [500,   0,  36, 166, -14, -96, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [544,   0, 120, 116, -59, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [672,   0, 192,  80, -64, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [872,   0, 120, 116, -25, -64, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [  0,   0,  36, 166, -14, -64, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [ 44,   0, 120, 116, -91, -64, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [172,   0, 192,  80, -128, -62, "gfx/"+a+"/"+b+"_32bpp.png"]
+    [372,   0, 120, 116, -57, -80, "gfx/"+a+"/"+b+"_32bpp.png"]
+}
+
+
 // Below shamelessly stolen from JP+ Shinkansen
 spriteset (spriteset_too_many_12, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "gfx/misc/less12_32bpp.png") {
-    [  0,   0,  36, 160, -14, -80]
+    [  0,   0,  36, 166, -14, -80]
     [ 44,   0, 120, 116, -75, -72]
     [172,   0, 192,  80, -96, -60]
     [372,   0, 120, 116, -41, -72]
-    [500,   0,  36, 160, -14, -80]
+    [500,   0,  36, 166, -14, -80]
     [544,   0, 120, 116, -75, -72]
     [672,   0, 192,  80, -96, -60]
     [872,   0, 120, 116, -41, -72]
 }
 
 spriteset (spriteset_erroremu, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "gfx/misc/erroremu_32bpp.png") {
-    [  0,   0,  36, 160, -14, -80]
+    [  0,   0,  36, 166, -14, -80]
     [ 44,   0, 120, 116, -75, -71]
     [172,   0, 192,  80, -96, -62]
     [372,   0, 120, 116, -41, -71]
-    [500,   0,  36, 160, -14, -80]
+    [500,   0,  36, 166, -14, -80]
     [544,   0, 120, 116, -75, -71]
     [672,   0, 192,  80, -96, -62]
     [872,   0, 120, 116, -41, -71]