diff --git a/Project/DexTool/DexTool.yyp b/Project/DexTool/DexTool.yyp
index 36d06fc..40f7cea 100644
--- a/Project/DexTool/DexTool.yyp
+++ b/Project/DexTool/DexTool.yyp
@@ -7486,6 +7486,14 @@
                 "resourceType": "GMIncludedFile"
             }
         },
+        {
+            "Key": "4a34078c-7fa4-d9ca-eb35-df0a0ce93667",
+            "Value": {
+                "id": "a4aed7b8-3569-686e-86ea-ff5c94787515",
+                "resourcePath": "scripts/box_gen_jump/box_gen_jump.yy",
+                "resourceType": "GMScript"
+            }
+        },
         {
             "Key": "4a6bfcf8-72aa-4d5f-9d71-1a45a9b62a72",
             "Value": {
@@ -9262,6 +9270,14 @@
                 "resourceType": "GMIncludedFile"
             }
         },
+        {
+            "Key": "5d6dc131-402b-45b8-c0ee-331d3e8a9908",
+            "Value": {
+                "id": "6b834d22-e7b0-b9cc-bf6c-4c7ad7c08780",
+                "resourcePath": "scripts\\check_genfirst\\check_genfirst.yy",
+                "resourceType": "GMScript"
+            }
+        },
         {
             "Key": "5d789329-881f-4613-8e4b-feb1c6d32d78",
             "Value": {
@@ -19958,6 +19974,14 @@
                 "resourceType": "GMIncludedFile"
             }
         },
+        {
+            "Key": "c6341f0c-570d-0e72-8439-2672f5cbb32e",
+            "Value": {
+                "id": "4e0a5676-e02b-66c7-98fd-2e912a51d9e7",
+                "resourcePath": "scripts\\shortcut_check\\shortcut_check.yy",
+                "resourceType": "GMScript"
+            }
+        },
         {
             "Key": "c6432995-3395-42dd-8154-ae5227abce5d",
             "Value": {
@@ -25661,7 +25685,10 @@
         "5e879a22-94f8-a47e-fee7-5e134971dd7f",
         "2370f9cd-bc43-8204-019c-9bc13fa8d58f",
         "18704ffc-a564-c635-1f87-c3fbc7a7c1c0",
-        "e10f4338-d865-41ce-6c7c-ffe8b9302bc2"
+        "e10f4338-d865-41ce-6c7c-ffe8b9302bc2",
+        "5d6dc131-402b-45b8-c0ee-331d3e8a9908",
+        "c6341f0c-570d-0e72-8439-2672f5cbb32e",
+        "4a34078c-7fa4-d9ca-eb35-df0a0ce93667"
     ],
     "tutorial": ""
 }
\ No newline at end of file
diff --git a/Project/DexTool/objects/obj_global/Draw_0.gml b/Project/DexTool/objects/obj_global/Draw_0.gml
index c76913b..1b27fab 100644
--- a/Project/DexTool/objects/obj_global/Draw_0.gml
+++ b/Project/DexTool/objects/obj_global/Draw_0.gml
@@ -28,3 +28,4 @@ draw_guidelines(true);
 draw_set_halign(fa_left);
 draw_set_valign(fa_top);
 draw_set_color(c_white);
+
diff --git a/Project/DexTool/objects/obj_global/KeyPress_71.gml b/Project/DexTool/objects/obj_global/KeyPress_71.gml
deleted file mode 100644
index c80d878..0000000
--- a/Project/DexTool/objects/obj_global/KeyPress_71.gml
+++ /dev/null
@@ -1 +0,0 @@
-show_galar_toggle();
diff --git a/Project/DexTool/objects/obj_global/KeyPress_73.gml b/Project/DexTool/objects/obj_global/KeyPress_73.gml
deleted file mode 100644
index c82d7b0..0000000
--- a/Project/DexTool/objects/obj_global/KeyPress_73.gml
+++ /dev/null
@@ -1 +0,0 @@
-make_screenshot();
diff --git a/Project/DexTool/objects/obj_global/KeyPress_83.gml b/Project/DexTool/objects/obj_global/KeyPress_83.gml
deleted file mode 100644
index 5291ffa..0000000
--- a/Project/DexTool/objects/obj_global/KeyPress_83.gml
+++ /dev/null
@@ -1 +0,0 @@
-show_shiny_toggle();
diff --git a/Project/DexTool/objects/obj_global/Step_0.gml b/Project/DexTool/objects/obj_global/Step_0.gml
index 437f9f7..fe614c2 100644
--- a/Project/DexTool/objects/obj_global/Step_0.gml
+++ b/Project/DexTool/objects/obj_global/Step_0.gml
@@ -6,4 +6,5 @@ if ((window_get_width()!=global.window_width || window_get_height()!=global.wind
 global.box_scale = sprite_get_width(spr_slot)*global.icon_scale;
 
 scroll_check();
+shortcut_check();
     
\ No newline at end of file
diff --git a/Project/DexTool/objects/obj_global/obj_global.yy b/Project/DexTool/objects/obj_global/obj_global.yy
index d0be230..78e6f21 100644
--- a/Project/DexTool/objects/obj_global/obj_global.yy
+++ b/Project/DexTool/objects/obj_global/obj_global.yy
@@ -53,36 +53,6 @@
             "enumb": 0,
             "eventtype": 8,
             "m_owner": "b5a21a9b-6e2e-40d3-9039-73cd19a7b959"
-        },
-        {
-            "id": "4207fe9e-44b3-4d50-9129-e785efdd45f5",
-            "modelName": "GMEvent",
-            "mvc": "1.0",
-            "IsDnD": false,
-            "collisionObjectId": "00000000-0000-0000-0000-000000000000",
-            "enumb": 71,
-            "eventtype": 9,
-            "m_owner": "b5a21a9b-6e2e-40d3-9039-73cd19a7b959"
-        },
-        {
-            "id": "db58ef6f-3cf5-6035-8582-75865e3af3c8",
-            "modelName": "GMEvent",
-            "mvc": "1.0",
-            "IsDnD": false,
-            "eventtype": 9,
-            "enumb": 73,
-            "collisionObjectId": "00000000-0000-0000-0000-000000000000",
-            "m_owner": "b5a21a9b-6e2e-40d3-9039-73cd19a7b959"
-        },
-        {
-            "id": "51a7ddf9-eba2-44e7-a452-be93317ca256",
-            "modelName": "GMEvent",
-            "mvc": "1.0",
-            "IsDnD": false,
-            "collisionObjectId": "00000000-0000-0000-0000-000000000000",
-            "enumb": 83,
-            "eventtype": 9,
-            "m_owner": "b5a21a9b-6e2e-40d3-9039-73cd19a7b959"
         }
     ],
     "maskSpriteId": "00000000-0000-0000-0000-000000000000",
diff --git a/Project/DexTool/scripts/box_gen_jump/box_gen_jump.gml b/Project/DexTool/scripts/box_gen_jump/box_gen_jump.gml
new file mode 100644
index 0000000..d4730d7
--- /dev/null
+++ b/Project/DexTool/scripts/box_gen_jump/box_gen_jump.gml
@@ -0,0 +1,10 @@
+///box_gen_jump(gen)
+
+var gen = argument0;
+
+if (gen==0 || gen==9)
+    gen = array_length_1d(global.gen_header);
+    
+global.current_box = global.gen_header[gen - 1];
+
+scroll_do();
\ No newline at end of file
diff --git a/Project/DexTool/scripts/box_gen_jump/box_gen_jump.yy b/Project/DexTool/scripts/box_gen_jump/box_gen_jump.yy
new file mode 100644
index 0000000..d953e08
--- /dev/null
+++ b/Project/DexTool/scripts/box_gen_jump/box_gen_jump.yy
@@ -0,0 +1,8 @@
+{
+    "id": "4a34078c-7fa4-d9ca-eb35-df0a0ce93667",
+    "modelName": "GMScript",
+    "mvc": "1.0",
+    "name": "box_gen_jump",
+    "IsCompatibility": false,
+    "IsDnD": false
+}
\ No newline at end of file
diff --git a/Project/DexTool/scripts/boxes_spawn/boxes_spawn.gml b/Project/DexTool/scripts/boxes_spawn/boxes_spawn.gml
index 5904956..cb3467c 100644
--- a/Project/DexTool/scripts/boxes_spawn/boxes_spawn.gml
+++ b/Project/DexTool/scripts/boxes_spawn/boxes_spawn.gml
@@ -10,19 +10,26 @@ var pos_y = 0;
 
 global.current = 1;
 
+var jump = true;
+var gen_current = 0;
+
 for (global.box_count=1; global.current<global.dex_len; global.box_count++)
 {
-    global.box_header[global.box_count] = instance_create(0, 0, obj_header);
-    
-    with (global.box_header[global.box_count])
+    // Headers
+    with (instance_create(0, 0, obj_header))
     {
+        global.box_header[global.box_count] = self;
         number = global.box_count;
         image_index = get_gen(global.dexdata[global.current, dex.dexno])-1;
         show_debug_message("Spawned Box "+string(global.box_count)+" with PKMN #"+string(global.dexdata[global.current, dex.dexno])+" from Gen "+string(get_gen(global.dexdata[global.current, dex.dexno])))
         image_speed = 0;
+        
+        if (check_genfirst(global.dexdata[global.current, dex.pokemon], false))
+            global.gen_header[gen_current++] = global.box_count;
+            
+        jump = false;
     }
     
-    var jump = false;
     
     for (var i=0; i<5; i++) // Box Y
         for (var j=0; j<6; j++) // Box X
@@ -43,4 +50,6 @@ for (global.box_count=1; global.current<global.dex_len; global.box_count++)
                     jump = true;
             }
         }
-}
\ No newline at end of file
+}
+
+global.gen_header[gen_current] = global.box_count-1; // Last header.
\ No newline at end of file
diff --git a/Project/DexTool/scripts/check_genfirst/check_genfirst.gml b/Project/DexTool/scripts/check_genfirst/check_genfirst.gml
new file mode 100644
index 0000000..073ab02
--- /dev/null
+++ b/Project/DexTool/scripts/check_genfirst/check_genfirst.gml
@@ -0,0 +1,26 @@
+///gen_checkfirst(pkmn, ignoreBULBASAUR?)
+
+var pkmn = argument0;
+var ignore = argument1;
+
+// Sanity Check
+if (ignore && pkmn=="BULBASAUR")
+    return false;
+
+switch(pkmn)
+{
+    case "BULBASAUR":
+    case "CHIKORITA":
+    case "TREECKO":
+    case "TURTWIG":
+    case "VICTINI":
+    case "CHESPIN":
+    case "ROWLET":
+    case "GROOKEY":
+        return true;
+    break;
+    
+    default:
+        return false;
+    break;
+}
\ No newline at end of file
diff --git a/Project/DexTool/scripts/check_genfirst/check_genfirst.yy b/Project/DexTool/scripts/check_genfirst/check_genfirst.yy
new file mode 100644
index 0000000..cf1f734
--- /dev/null
+++ b/Project/DexTool/scripts/check_genfirst/check_genfirst.yy
@@ -0,0 +1,8 @@
+{
+    "id": "5d6dc131-402b-45b8-c0ee-331d3e8a9908",
+    "modelName": "GMScript",
+    "mvc": "1.0",
+    "name": "check_genfirst",
+    "IsCompatibility": false,
+    "IsDnD": false
+}
\ No newline at end of file
diff --git a/Project/DexTool/scripts/check_jump/check_jump.gml b/Project/DexTool/scripts/check_jump/check_jump.gml
index 095bcfd..ed9f2e0 100644
--- a/Project/DexTool/scripts/check_jump/check_jump.gml
+++ b/Project/DexTool/scripts/check_jump/check_jump.gml
@@ -4,48 +4,6 @@ var pkmn = global.dexdata[argument2, dex.pokemon];
 var form = global.dexdata[argument2, dex.form];
 
 if (px || py)
-{
-    switch(pkmn)
-    {
-        // Starters
-        case "CHIKORITA":
-        case "TREECKO":
-        case "TURTWIG":
-        case "VICTINI":
-        case "CHESPIN":
-        case "ROWLET":
-        case "GROOKEY":
-            return true;
-        break;
-        
-        /*
-        // Formies
-        case "UNOWN":
-            if (form == "A")
-                return true;
-        break;
-        
-        case "FLABÉBÉ":
-            if (form == "RED FLOWER")
-                return true;
-        break;
-        
-        case "PUMPKABOO":
-            if (form == "SMALL SIZE")
-                return true;
-        break;
-        
-        case "MINIOR":
-            if (form == "BLUE CORE")
-                return true;
-        break;
-                
-        case "SCATTERBUG":   
-        case "MILCERY":
-            return true;
-        break;
-        */
-    }
-}
+    return check_genfirst(pkmn, true);
 
 return false;
diff --git a/Project/DexTool/scripts/shortcut_check/shortcut_check.gml b/Project/DexTool/scripts/shortcut_check/shortcut_check.gml
new file mode 100644
index 0000000..4ea839c
--- /dev/null
+++ b/Project/DexTool/scripts/shortcut_check/shortcut_check.gml
@@ -0,0 +1,9 @@
+///shortcut_check()
+
+     if (keyboard_check_pressed(ord("G")))  show_galar_toggle();
+else if (keyboard_check_pressed(ord("I")))  make_screenshot();
+else if (keyboard_check_pressed(ord("S")))  show_shiny_toggle();
+
+else for (var i=ord("0"); i<=ord("9"); i++)
+    if (keyboard_check_pressed(i))
+        box_gen_jump(i - ord("0"));
\ No newline at end of file
diff --git a/Project/DexTool/scripts/shortcut_check/shortcut_check.yy b/Project/DexTool/scripts/shortcut_check/shortcut_check.yy
new file mode 100644
index 0000000..02f4279
--- /dev/null
+++ b/Project/DexTool/scripts/shortcut_check/shortcut_check.yy
@@ -0,0 +1,8 @@
+{
+    "id": "c6341f0c-570d-0e72-8439-2672f5cbb32e",
+    "modelName": "GMScript",
+    "mvc": "1.0",
+    "name": "shortcut_check",
+    "IsCompatibility": false,
+    "IsDnD": false
+}
\ No newline at end of file
diff --git a/Project/DexTool/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy b/Project/DexTool/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy
index e7f1542..1cbc517 100644
--- a/Project/DexTool/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy
+++ b/Project/DexTool/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy
@@ -58,7 +58,10 @@
         "5e879a22-94f8-a47e-fee7-5e134971dd7f",
         "2370f9cd-bc43-8204-019c-9bc13fa8d58f",
         "18704ffc-a564-c635-1f87-c3fbc7a7c1c0",
-        "e10f4338-d865-41ce-6c7c-ffe8b9302bc2"
+        "e10f4338-d865-41ce-6c7c-ffe8b9302bc2",
+        "5d6dc131-402b-45b8-c0ee-331d3e8a9908",
+        "c6341f0c-570d-0e72-8439-2672f5cbb32e",
+        "4a34078c-7fa4-d9ca-eb35-df0a0ce93667"
     ],
     "filterType": "GMScript",
     "folderName": "scripts",