diff --git a/Project/objects/obj_global/Draw_0.gml b/Project/objects/obj_global/Draw_0.gml
index 85b28f8..62aeb75 100644
--- a/Project/objects/obj_global/Draw_0.gml
+++ b/Project/objects/obj_global/Draw_0.gml
@@ -5,7 +5,7 @@ hud_draw_counter();
 hud_draw_progress();
 
 // Debug
-draw_guidelines(true);
+draw_guidelines(false);
 
 draw_reset();
 
diff --git a/Project/scripts/make_screenshot/make_screenshot.gml b/Project/scripts/make_screenshot/make_screenshot.gml
index 49f07ac..0c8fa08 100644
--- a/Project/scripts/make_screenshot/make_screenshot.gml
+++ b/Project/scripts/make_screenshot/make_screenshot.gml
@@ -1,71 +1,101 @@
 // Set Size
 
-//var size_w = 40*6*6 + 4*7;
-//var size_h = ceil(global.box_count-1)/6 * 30 + 4*(ceil(global.box_count-1)+1)
+if (!global.show_shiny) // Regulars
+{
+    var slots_per_line = 32;
+    var slots_h = ceil(global.dex_len/slots_per_line);
+    
+    var slot_w = 40;
+    var slot_h = 30;
+    
+    var size_w = slots_per_line * slot_w + slot_w;
+    var size_h = slots_h * slot_h;
+    
+    var surf = surface_create(size_w, size_h);
+    surface_set_target(surf);
+    draw_clear(c_white);
+    
+    // Slots
+    var current = 1;
 
-var slots_per_line = 32;
-var slots_h = ceil(global.dex_len/slots_per_line);
-
-var slot_w = 40;
-var slot_h = 30;
-
-var size_w = slots_per_line * slot_w + slot_w;
-var size_h = slots_h * slot_h;
-
-var surf = surface_create(size_w, size_h);
-surface_set_target(surf);
-draw_clear(c_white);
-
-// Slots
-var current = 1;
-
-for (var i=1; i<=slots_h; i++)
-    for (var j=1; j<slots_per_line; j++)
-        if (current<global.dex_len)
-        {
-            while(!check_skip(current))
-                current++;
-            
-            var px = j*slot_w;
-            var py = i*slot_h;
-            
-            if (global.savedata[current])
+    for (var i=1; i<=slots_h; i++)
+        for (var j=1; j<slots_per_line; j++)
+            if (current<global.dex_len)
             {
-                draw_set_color(c_red);
+                while(!check_skip(current))
+                    current++;
+                
+                var px = j*slot_w;
+                var py = i*slot_h;
+                
+                draw_set_color(get_color3(global.savedata[global.dexdata[current, dex.idno]], false));
                 draw_rectangle(px, py, px+slot_w, py+slot_h, false);
+                
+                draw_set_color(c_black);
+                draw_rectangle(px, py, px+slot_w, py+slot_h, true);
+                
+                draw_sprite(make_sprite(global.dexdata[current, dex.pokemon], global.dexdata[current, dex.form]), 0, j*slot_w+slot_w/2, i*slot_h+slot_h/2);
+                
+                show_debug_message("Snapshot: Drew #"+global.dexdata[current, dex.dexno]+" "+global.dexdata[current, dex.pokemon]+"."); 
+                
+                current++;
             }
+            else
+                break;
+}
+else // Shinies
+{
+    var mult = 2;
+    var offset = 40/* * mult / 2*/;
+    var slot_w = offset * 5;
+    var slot_h = 30 * mult;
+    
+    var size_w = slot_w + offset*2;
+    var size_h = slot_h*global.progress + offset*2;
+    
+    var surf = surface_create(size_w, size_h);
+    surface_set_target(surf);
+    draw_clear(c_white);
+    
+    var current = 1;
+    
+    for (var i=0; current<global.dex_len; i++)
+    {
+        while(!check_skip(current))
+            current++;
+            
+        if (global.savedata[global.dexdata[current, dex.idno]])
+        {
+            var px = offset;
+            var py = offset + i*slot_h;
+        
+            draw_set_color(get_color3(global.savedata[global.dexdata[current, dex.idno]], false));
+            draw_rectangle(px, py, px+slot_w, py+slot_h, false);
             
             draw_set_color(c_black);
             draw_rectangle(px, py, px+slot_w, py+slot_h, true);
             
-            draw_sprite(make_sprite(global.dexdata[current, dex.pokemon], global.dexdata[current, dex.form]), 0, j*slot_w+slot_w/2, i*slot_h+slot_h/2);
+            draw_sprite_ext(make_sprite(global.dexdata[current, dex.pokemon], global.dexdata[current, dex.form]), 0, px+offset*mult/2, offset+i*slot_h+slot_h/2, mult, mult, image_angle, image_blend, image_alpha);
+            
+            draw_set_font(global.font);
+            draw_set_color(c_white);
+            draw_set_valign(fa_middle);
+            draw_set_halign(fa_center);
+            draw_text_transformed(/*px+offset*mult*/px+slot_w*0.7, offset+i*slot_h+slot_h/2, "334", mult*2.5, mult*2.5, image_angle);
             
             show_debug_message("Snapshot: Drew #"+global.dexdata[current, dex.dexno]+" "+global.dexdata[current, dex.pokemon]+"."); 
-            
-            current++;
         }
         else
-            break;
-
-
-// Sprites
-
-/*for (i=1; i<=slots_h; i++)
-    for (var j=1; j<slots_per_line; j++)
-        if (current<global.dex_len)
-        {
-            while(!check_skip(current))
-                current++;
+            i--;
             
-            var px = j*slot_w;
-            var py = i*slot_h;
+        current++;
+    }
+}
+
+draw_set_color(c_white);
+draw_set_valign(fa_top);
+draw_set_halign(fa_left);
 
-            draw_sprite(make_sprite(global.dexdata[current, dex.pokemon], global.dexdata[current, dex.form]), 0, slot_w/2, slot_h/2);
-            
-            current++;
-            
-            show_debug_message("Snapshot: Drew #"+global.dexdata[current, dex.dexno]+" "+global.dexdata[current, dex.pokemon]+".");
-        }*/
 
 // Saving
 
@@ -78,9 +108,4 @@ var ext = ".png";
 sprite_save(sprtemp, 0, filename+ext);
 
 var user = string(environment_get_variable("USERNAME"));
-var dir = "C:\\Users\\"+string(user)+"\\Pictures";
-var savestring = dir+"\\"+filename+".png";
-var fromstring = "C:\\Users\\"+user+"\\AppData\\Local\\LivingDexSS\\"+filename+ext;
-//file_move_ns(fromstring, savestring);
-
-show_debug_message("Image exported as '"+savestring+"'.");
+show_debug_message("Image exported to C:\Users"+chr(92)+user+"\AppData\Local\DexTool"+filename+ext+".");