diff --git a/data/sprites/official/arrghus.1.zspr b/data/sprites/official/arrghus.2.zspr
similarity index 98%
rename from data/sprites/official/arrghus.1.zspr
rename to data/sprites/official/arrghus.2.zspr
index fd2eb5e4..2064009d 100644
Binary files a/data/sprites/official/arrghus.1.zspr and b/data/sprites/official/arrghus.2.zspr differ
diff --git a/data/sprites/official/bigkey.1.zspr b/data/sprites/official/bigkey.1.zspr
new file mode 100644
index 00000000..eab4854e
Binary files /dev/null and b/data/sprites/official/bigkey.1.zspr differ
diff --git a/data/sprites/official/blacksmithlink.1.zspr b/data/sprites/official/blacksmithlink.1.zspr
new file mode 100644
index 00000000..e9aeb31a
Binary files /dev/null and b/data/sprites/official/blacksmithlink.1.zspr differ
diff --git a/data/sprites/official/bob.1.zspr b/data/sprites/official/bob.1.zspr
new file mode 100644
index 00000000..25fc0410
Binary files /dev/null and b/data/sprites/official/bob.1.zspr differ
diff --git a/data/sprites/official/boo.1.zspr b/data/sprites/official/boo-two.1.zspr
similarity index 100%
rename from data/sprites/official/boo.1.zspr
rename to data/sprites/official/boo-two.1.zspr
diff --git a/data/sprites/official/boo.2.zspr b/data/sprites/official/boo.2.zspr
new file mode 100644
index 00000000..24c74bde
Binary files /dev/null and b/data/sprites/official/boo.2.zspr differ
diff --git a/data/sprites/official/broccoli.1.zspr b/data/sprites/official/broccoli.1.zspr
new file mode 100644
index 00000000..e335df01
Binary files /dev/null and b/data/sprites/official/broccoli.1.zspr differ
diff --git a/data/sprites/official/boy.1.zspr b/data/sprites/official/bsboy.1.zspr
similarity index 100%
rename from data/sprites/official/boy.1.zspr
rename to data/sprites/official/bsboy.1.zspr
diff --git a/data/sprites/official/girl.1.zspr b/data/sprites/official/bsgirl.1.zspr
similarity index 100%
rename from data/sprites/official/girl.1.zspr
rename to data/sprites/official/bsgirl.1.zspr
diff --git a/data/sprites/official/cheepcheep.1.zspr b/data/sprites/official/cheepcheep.1.zspr
new file mode 100644
index 00000000..a49545f2
Binary files /dev/null and b/data/sprites/official/cheepcheep.1.zspr differ
diff --git a/data/sprites/official/conker.1.zspr b/data/sprites/official/conker.1.zspr
new file mode 100644
index 00000000..121d5233
Binary files /dev/null and b/data/sprites/official/conker.1.zspr differ
diff --git a/data/sprites/official/cursor.1.zspr b/data/sprites/official/cursor.1.zspr
new file mode 100644
index 00000000..45bc9739
Binary files /dev/null and b/data/sprites/official/cursor.1.zspr differ
diff --git a/data/sprites/official/darkzora.1.zspr b/data/sprites/official/darkzora.2.zspr
similarity index 97%
rename from data/sprites/official/darkzora.1.zspr
rename to data/sprites/official/darkzora.2.zspr
index 0540f4d9..fbb15c69 100644
Binary files a/data/sprites/official/darkzora.1.zspr and b/data/sprites/official/darkzora.2.zspr differ
diff --git a/data/sprites/official/froglink.1.zspr b/data/sprites/official/froglink.2.zspr
similarity index 96%
rename from data/sprites/official/froglink.1.zspr
rename to data/sprites/official/froglink.2.zspr
index b2498322..1932df06 100644
Binary files a/data/sprites/official/froglink.1.zspr and b/data/sprites/official/froglink.2.zspr differ
diff --git a/data/sprites/official/garfield.1.zspr b/data/sprites/official/garfield.2.zspr
similarity index 94%
rename from data/sprites/official/garfield.1.zspr
rename to data/sprites/official/garfield.2.zspr
index e28c1706..6ca890e8 100644
Binary files a/data/sprites/official/garfield.1.zspr and b/data/sprites/official/garfield.2.zspr differ
diff --git a/data/sprites/official/hyruleknight.1.zspr b/data/sprites/official/hyruleknight.1.zspr
new file mode 100644
index 00000000..a8815bc3
Binary files /dev/null and b/data/sprites/official/hyruleknight.1.zspr differ
diff --git a/data/sprites/official/jogurt.1.zspr b/data/sprites/official/jogurt.1.zspr
new file mode 100644
index 00000000..b229060c
Binary files /dev/null and b/data/sprites/official/jogurt.1.zspr differ
diff --git a/data/sprites/official/linkhatcolor.1.zspr b/data/sprites/official/linkhatcolor.1.zspr
new file mode 100644
index 00000000..af53898d
Binary files /dev/null and b/data/sprites/official/linkhatcolor.1.zspr differ
diff --git a/data/sprites/official/linktuniccolor.1.zspr b/data/sprites/official/linktuniccolor.1.zspr
new file mode 100644
index 00000000..305a9f8f
Binary files /dev/null and b/data/sprites/official/linktuniccolor.1.zspr differ
diff --git a/data/sprites/official/mangalink.1.zspr b/data/sprites/official/mangalink.1.zspr
new file mode 100644
index 00000000..adb57b99
Binary files /dev/null and b/data/sprites/official/mangalink.1.zspr differ
diff --git a/data/sprites/official/maplequeen.1.zspr b/data/sprites/official/maplequeen.2.zspr
similarity index 98%
rename from data/sprites/official/maplequeen.1.zspr
rename to data/sprites/official/maplequeen.2.zspr
index e26032a0..35b7deec 100644
Binary files a/data/sprites/official/maplequeen.1.zspr and b/data/sprites/official/maplequeen.2.zspr differ
diff --git a/data/sprites/official/mario-classic.1.zspr b/data/sprites/official/mario-classic.2.zspr
similarity index 99%
rename from data/sprites/official/mario-classic.1.zspr
rename to data/sprites/official/mario-classic.2.zspr
index 60ea7f94..6443e327 100644
Binary files a/data/sprites/official/mario-classic.1.zspr and b/data/sprites/official/mario-classic.2.zspr differ
diff --git a/data/sprites/official/mariocappy.1.zspr b/data/sprites/official/mariocappy.1.zspr
new file mode 100644
index 00000000..b888396d
Binary files /dev/null and b/data/sprites/official/mariocappy.1.zspr differ
diff --git a/data/sprites/official/missingno.1.zspr b/data/sprites/official/missingno.1.zspr
new file mode 100644
index 00000000..68e61b9b
Binary files /dev/null and b/data/sprites/official/missingno.1.zspr differ
diff --git a/data/sprites/official/mog.1.zspr b/data/sprites/official/mog.2.zspr
similarity index 99%
rename from data/sprites/official/mog.1.zspr
rename to data/sprites/official/mog.2.zspr
index 2ef1dfc0..a6ed2225 100644
Binary files a/data/sprites/official/mog.1.zspr and b/data/sprites/official/mog.2.zspr differ
diff --git a/data/sprites/official/navi.1.zspr b/data/sprites/official/navi.1.zspr
new file mode 100644
index 00000000..4621bf4a
Binary files /dev/null and b/data/sprites/official/navi.1.zspr differ
diff --git a/data/sprites/official/neslink.1.zspr b/data/sprites/official/neslink.1.zspr
new file mode 100644
index 00000000..805b3162
Binary files /dev/null and b/data/sprites/official/neslink.1.zspr differ
diff --git a/data/sprites/official/oldman.1.zspr b/data/sprites/official/oldman.2.zspr
similarity index 98%
rename from data/sprites/official/oldman.1.zspr
rename to data/sprites/official/oldman.2.zspr
index 1a45e5c7..1d47cdac 100644
Binary files a/data/sprites/official/oldman.1.zspr and b/data/sprites/official/oldman.2.zspr differ
diff --git a/data/sprites/official/pikachu.1.zspr b/data/sprites/official/pikachu.1.zspr
new file mode 100644
index 00000000..0b8a88c4
Binary files /dev/null and b/data/sprites/official/pikachu.1.zspr differ
diff --git a/data/sprites/official/pinkribbonlink.1.zspr b/data/sprites/official/pinkribbonlink.2.zspr
similarity index 99%
rename from data/sprites/official/pinkribbonlink.1.zspr
rename to data/sprites/official/pinkribbonlink.2.zspr
index 5e0fc907..ba516f18 100644
Binary files a/data/sprites/official/pinkribbonlink.1.zspr and b/data/sprites/official/pinkribbonlink.2.zspr differ
diff --git a/data/sprites/official/santalink.1.zspr b/data/sprites/official/santalink.2.zspr
similarity index 99%
rename from data/sprites/official/santalink.1.zspr
rename to data/sprites/official/santalink.2.zspr
index 2495f0c0..0e78fedb 100644
Binary files a/data/sprites/official/santalink.1.zspr and b/data/sprites/official/santalink.2.zspr differ
diff --git a/data/sprites/official/shadowsaku.1.zspr b/data/sprites/official/shadowsaku.2.zspr
similarity index 98%
rename from data/sprites/official/shadowsaku.1.zspr
rename to data/sprites/official/shadowsaku.2.zspr
index 42701755..8972f9f2 100644
Binary files a/data/sprites/official/shadowsaku.1.zspr and b/data/sprites/official/shadowsaku.2.zspr differ
diff --git a/data/sprites/official/soldiersprite.1.zspr b/data/sprites/official/soldiersprite.1.zspr
new file mode 100644
index 00000000..d5e8ee35
Binary files /dev/null and b/data/sprites/official/soldiersprite.1.zspr differ
diff --git a/data/sprites/official/squirtle.1.zspr b/data/sprites/official/squirtle.1.zspr
new file mode 100644
index 00000000..274bf1c7
Binary files /dev/null and b/data/sprites/official/squirtle.1.zspr differ
diff --git a/data/sprites/official/superbunny.1.zspr b/data/sprites/official/superbunny.2.zspr
similarity index 98%
rename from data/sprites/official/superbunny.1.zspr
rename to data/sprites/official/superbunny.2.zspr
index f5571369..b842d1c3 100644
Binary files a/data/sprites/official/superbunny.1.zspr and b/data/sprites/official/superbunny.2.zspr differ
diff --git a/data/sprites/official/supermeatboy.1.zspr b/data/sprites/official/supermeatboy.1.zspr
new file mode 100644
index 00000000..ad4368bb
Binary files /dev/null and b/data/sprites/official/supermeatboy.1.zspr differ
diff --git a/data/sprites/official/terra.1.zspr b/data/sprites/official/terra.1.zspr
new file mode 100644
index 00000000..e24ca87a
Binary files /dev/null and b/data/sprites/official/terra.1.zspr differ
diff --git a/data/sprites/official/tile.1.zspr b/data/sprites/official/tile.1.zspr
deleted file mode 100644
index 98820f9e..00000000
Binary files a/data/sprites/official/tile.1.zspr and /dev/null differ
diff --git a/data/sprites/official/tile.2.zspr b/data/sprites/official/tile.2.zspr
new file mode 100644
index 00000000..38332bb0
Binary files /dev/null and b/data/sprites/official/tile.2.zspr differ
diff --git a/data/sprites/official/toad.1.zspr b/data/sprites/official/toad.2.zspr
similarity index 98%
rename from data/sprites/official/toad.1.zspr
rename to data/sprites/official/toad.2.zspr
index a051ed9e..6abca2d7 100644
Binary files a/data/sprites/official/toad.1.zspr and b/data/sprites/official/toad.2.zspr differ
diff --git a/data/sprites/official/trogdor.1.zspr b/data/sprites/official/trogdor.1.zspr
new file mode 100644
index 00000000..b37191ac
Binary files /dev/null and b/data/sprites/official/trogdor.1.zspr differ
diff --git a/data/sprites/official/wizzrobe.1.zspr b/data/sprites/official/wizzrobe.2.zspr
similarity index 97%
rename from data/sprites/official/wizzrobe.1.zspr
rename to data/sprites/official/wizzrobe.2.zspr
index f8938bde..f79195d2 100644
Binary files a/data/sprites/official/wizzrobe.1.zspr and b/data/sprites/official/wizzrobe.2.zspr differ
diff --git a/data/sprites/official/zora.1.zspr b/data/sprites/official/zora.1.zspr
deleted file mode 100644
index ca417921..00000000
Binary files a/data/sprites/official/zora.1.zspr and /dev/null differ
diff --git a/data/sprites/official/zora.2.zspr b/data/sprites/official/zora.2.zspr
new file mode 100644
index 00000000..1ca568e1
Binary files /dev/null and b/data/sprites/official/zora.2.zspr differ