diff --git a/data/credits/shine.gif b/data/credits/shine.gif
new file mode 100644
index 00000000..04630327
Binary files /dev/null and b/data/credits/shine.gif differ
diff --git a/data/credits/shine.png b/data/credits/shine.png
deleted file mode 100644
index d7364df9..00000000
Binary files a/data/credits/shine.png and /dev/null differ
diff --git a/data/ending/ending1.gif b/data/ending/ending1.gif
new file mode 100644
index 00000000..aa74226e
Binary files /dev/null and b/data/ending/ending1.gif differ
diff --git a/data/ending/ending1.png b/data/ending/ending1.png
deleted file mode 100644
index d3c6470c..00000000
Binary files a/data/ending/ending1.png and /dev/null differ
diff --git a/data/ending/ending1_zxarne.png b/data/ending/ending1_zxarne.png
deleted file mode 100644
index e6e49442..00000000
Binary files a/data/ending/ending1_zxarne.png and /dev/null differ
diff --git a/data/ending/ending2.gif b/data/ending/ending2.gif
new file mode 100644
index 00000000..40237af3
Binary files /dev/null and b/data/ending/ending2.gif differ
diff --git a/data/ending/ending2.png b/data/ending/ending2.png
deleted file mode 100644
index eabb459d..00000000
Binary files a/data/ending/ending2.png and /dev/null differ
diff --git a/data/ending/ending2_zxarne.png b/data/ending/ending2_zxarne.png
deleted file mode 100644
index ba44af15..00000000
Binary files a/data/ending/ending2_zxarne.png and /dev/null differ
diff --git a/data/ending/ending3.gif b/data/ending/ending3.gif
new file mode 100644
index 00000000..9c61bf02
Binary files /dev/null and b/data/ending/ending3.gif differ
diff --git a/data/ending/ending3.png b/data/ending/ending3.png
deleted file mode 100644
index f6d59412..00000000
Binary files a/data/ending/ending3.png and /dev/null differ
diff --git a/data/ending/ending3_zxarne.png b/data/ending/ending3_zxarne.png
deleted file mode 100644
index 00374d68..00000000
Binary files a/data/ending/ending3_zxarne.png and /dev/null differ
diff --git a/data/ending/ending4.gif b/data/ending/ending4.gif
new file mode 100644
index 00000000..3f8933b4
Binary files /dev/null and b/data/ending/ending4.gif differ
diff --git a/data/ending/ending4.png b/data/ending/ending4.png
deleted file mode 100644
index 55c88af9..00000000
Binary files a/data/ending/ending4.png and /dev/null differ
diff --git a/data/ending/ending4_zxarne.png b/data/ending/ending4_zxarne.png
deleted file mode 100644
index f262b9e1..00000000
Binary files a/data/ending/ending4_zxarne.png and /dev/null differ
diff --git a/data/ending/ending5.gif b/data/ending/ending5.gif
new file mode 100644
index 00000000..cbdad65e
Binary files /dev/null and b/data/ending/ending5.gif differ
diff --git a/data/ending/ending5.png b/data/ending/ending5.png
deleted file mode 100644
index da399183..00000000
Binary files a/data/ending/ending5.png and /dev/null differ
diff --git a/data/ending/ending5_zxarne.png b/data/ending/ending5_zxarne.png
deleted file mode 100644
index 4bddd7f7..00000000
Binary files a/data/ending/ending5_zxarne.png and /dev/null differ
diff --git a/data/enemies/abad.gif b/data/enemies/abad.gif
new file mode 100644
index 00000000..9316e7e1
Binary files /dev/null and b/data/enemies/abad.gif differ
diff --git a/data/enemies/abad.png b/data/enemies/abad.png
deleted file mode 100644
index f6efe686..00000000
Binary files a/data/enemies/abad.png and /dev/null differ
diff --git a/data/enemies/abad_bell.gif b/data/enemies/abad_bell.gif
new file mode 100644
index 00000000..0da04576
Binary files /dev/null and b/data/enemies/abad_bell.gif differ
diff --git a/data/enemies/abad_bell.png b/data/enemies/abad_bell.png
deleted file mode 100644
index 9b5c9965..00000000
Binary files a/data/enemies/abad_bell.png and /dev/null differ
diff --git a/data/enemies/amstrad_cs.gif b/data/enemies/amstrad_cs.gif
new file mode 100644
index 00000000..185f6994
Binary files /dev/null and b/data/enemies/amstrad_cs.gif differ
diff --git a/data/enemies/amstrad_cs.png b/data/enemies/amstrad_cs.png
deleted file mode 100644
index 76099b91..00000000
Binary files a/data/enemies/amstrad_cs.png and /dev/null differ
diff --git a/data/enemies/arounders_door.gif b/data/enemies/arounders_door.gif
new file mode 100644
index 00000000..f4f08e3c
Binary files /dev/null and b/data/enemies/arounders_door.gif differ
diff --git a/data/enemies/arounders_door.png b/data/enemies/arounders_door.png
deleted file mode 100644
index ad3c8c46..00000000
Binary files a/data/enemies/arounders_door.png and /dev/null differ
diff --git a/data/enemies/arounders_machine.gif b/data/enemies/arounders_machine.gif
new file mode 100644
index 00000000..e6c5e7d5
Binary files /dev/null and b/data/enemies/arounders_machine.gif differ
diff --git a/data/enemies/arounders_machine.png b/data/enemies/arounders_machine.png
deleted file mode 100644
index 966c4275..00000000
Binary files a/data/enemies/arounders_machine.png and /dev/null differ
diff --git a/data/enemies/bat.gif b/data/enemies/bat.gif
new file mode 100644
index 00000000..2119e7c4
Binary files /dev/null and b/data/enemies/bat.gif differ
diff --git a/data/enemies/bat.png b/data/enemies/bat.png
deleted file mode 100644
index a9f4d982..00000000
Binary files a/data/enemies/bat.png and /dev/null differ
diff --git a/data/enemies/batman.gif b/data/enemies/batman.gif
new file mode 100644
index 00000000..26d21ca5
Binary files /dev/null and b/data/enemies/batman.gif differ
diff --git a/data/enemies/batman.png b/data/enemies/batman.png
deleted file mode 100644
index f73bc9ba..00000000
Binary files a/data/enemies/batman.png and /dev/null differ
diff --git a/data/enemies/batman_bell.gif b/data/enemies/batman_bell.gif
new file mode 100644
index 00000000..afcf8012
Binary files /dev/null and b/data/enemies/batman_bell.gif differ
diff --git a/data/enemies/batman_bell.png b/data/enemies/batman_bell.png
deleted file mode 100644
index 3be22617..00000000
Binary files a/data/enemies/batman_bell.png and /dev/null differ
diff --git a/data/enemies/batman_fire.gif b/data/enemies/batman_fire.gif
new file mode 100644
index 00000000..9af403bb
Binary files /dev/null and b/data/enemies/batman_fire.gif differ
diff --git a/data/enemies/batman_fire.png b/data/enemies/batman_fire.png
deleted file mode 100644
index c5fcc44c..00000000
Binary files a/data/enemies/batman_fire.png and /dev/null differ
diff --git a/data/enemies/bell.gif b/data/enemies/bell.gif
new file mode 100644
index 00000000..a3c1693c
Binary files /dev/null and b/data/enemies/bell.gif differ
diff --git a/data/enemies/bell.png b/data/enemies/bell.png
deleted file mode 100644
index fc41e193..00000000
Binary files a/data/enemies/bell.png and /dev/null differ
diff --git a/data/enemies/bin.gif b/data/enemies/bin.gif
new file mode 100644
index 00000000..50faf798
Binary files /dev/null and b/data/enemies/bin.gif differ
diff --git a/data/enemies/bin.png b/data/enemies/bin.png
deleted file mode 100644
index 592229ef..00000000
Binary files a/data/enemies/bin.png and /dev/null differ
diff --git a/data/enemies/bird.gif b/data/enemies/bird.gif
new file mode 100644
index 00000000..1bce2e45
Binary files /dev/null and b/data/enemies/bird.gif differ
diff --git a/data/enemies/bird.png b/data/enemies/bird.png
deleted file mode 100644
index 6ac3b744..00000000
Binary files a/data/enemies/bird.png and /dev/null differ
diff --git a/data/enemies/breakout.gif b/data/enemies/breakout.gif
new file mode 100644
index 00000000..a9066b12
Binary files /dev/null and b/data/enemies/breakout.gif differ
diff --git a/data/enemies/breakout.png b/data/enemies/breakout.png
deleted file mode 100644
index fd512368..00000000
Binary files a/data/enemies/breakout.png and /dev/null differ
diff --git a/data/enemies/bry.gif b/data/enemies/bry.gif
new file mode 100644
index 00000000..aaaacdd0
Binary files /dev/null and b/data/enemies/bry.gif differ
diff --git a/data/enemies/bry.png b/data/enemies/bry.png
deleted file mode 100644
index 59f0d0e8..00000000
Binary files a/data/enemies/bry.png and /dev/null differ
diff --git a/data/enemies/chip.gif b/data/enemies/chip.gif
new file mode 100644
index 00000000..b0a5ac10
Binary files /dev/null and b/data/enemies/chip.gif differ
diff --git a/data/enemies/chip.png b/data/enemies/chip.png
deleted file mode 100644
index efeaf427..00000000
Binary files a/data/enemies/chip.png and /dev/null differ
diff --git a/data/enemies/code.gif b/data/enemies/code.gif
new file mode 100644
index 00000000..981fbcc2
Binary files /dev/null and b/data/enemies/code.gif differ
diff --git a/data/enemies/code.png b/data/enemies/code.png
deleted file mode 100644
index e7663c40..00000000
Binary files a/data/enemies/code.png and /dev/null differ
diff --git a/data/enemies/congo.gif b/data/enemies/congo.gif
new file mode 100644
index 00000000..c4e893bc
Binary files /dev/null and b/data/enemies/congo.gif differ
diff --git a/data/enemies/congo.png b/data/enemies/congo.png
deleted file mode 100644
index 08b5efbb..00000000
Binary files a/data/enemies/congo.png and /dev/null differ
diff --git a/data/enemies/crosshair.gif b/data/enemies/crosshair.gif
new file mode 100644
index 00000000..a1bf75cc
Binary files /dev/null and b/data/enemies/crosshair.gif differ
diff --git a/data/enemies/crosshair.png b/data/enemies/crosshair.png
deleted file mode 100644
index e2425ddc..00000000
Binary files a/data/enemies/crosshair.png and /dev/null differ
diff --git a/data/enemies/demon.gif b/data/enemies/demon.gif
new file mode 100644
index 00000000..be1b0c16
Binary files /dev/null and b/data/enemies/demon.gif differ
diff --git a/data/enemies/demon.png b/data/enemies/demon.png
deleted file mode 100644
index 63fedac5..00000000
Binary files a/data/enemies/demon.png and /dev/null differ
diff --git a/data/enemies/dimallas.gif b/data/enemies/dimallas.gif
new file mode 100644
index 00000000..fa9ef4be
Binary files /dev/null and b/data/enemies/dimallas.gif differ
diff --git a/data/enemies/dimallas.png b/data/enemies/dimallas.png
deleted file mode 100644
index 99e9942e..00000000
Binary files a/data/enemies/dimallas.png and /dev/null differ
diff --git a/data/enemies/dong.gif b/data/enemies/dong.gif
new file mode 100644
index 00000000..c08a2e63
Binary files /dev/null and b/data/enemies/dong.gif differ
diff --git a/data/enemies/dong.png b/data/enemies/dong.png
deleted file mode 100644
index 26ee88ec..00000000
Binary files a/data/enemies/dong.png and /dev/null differ
diff --git a/data/enemies/elsa.gif b/data/enemies/elsa.gif
new file mode 100644
index 00000000..6f10d051
Binary files /dev/null and b/data/enemies/elsa.gif differ
diff --git a/data/enemies/elsa.png b/data/enemies/elsa.png
deleted file mode 100644
index 3f304910..00000000
Binary files a/data/enemies/elsa.png and /dev/null differ
diff --git a/data/enemies/floppy.gif b/data/enemies/floppy.gif
new file mode 100644
index 00000000..86e0aa1e
Binary files /dev/null and b/data/enemies/floppy.gif differ
diff --git a/data/enemies/floppy.png b/data/enemies/floppy.png
deleted file mode 100644
index f138f89d..00000000
Binary files a/data/enemies/floppy.png and /dev/null differ
diff --git a/data/enemies/flying_arounder.gif b/data/enemies/flying_arounder.gif
new file mode 100644
index 00000000..31418a46
Binary files /dev/null and b/data/enemies/flying_arounder.gif differ
diff --git a/data/enemies/flying_arounder.png b/data/enemies/flying_arounder.png
deleted file mode 100644
index e415f6d1..00000000
Binary files a/data/enemies/flying_arounder.png and /dev/null differ
diff --git a/data/enemies/guitar.gif b/data/enemies/guitar.gif
new file mode 100644
index 00000000..49a5db48
Binary files /dev/null and b/data/enemies/guitar.gif differ
diff --git a/data/enemies/guitar.png b/data/enemies/guitar.png
deleted file mode 100644
index 76f7bbdf..00000000
Binary files a/data/enemies/guitar.png and /dev/null differ
diff --git a/data/enemies/heavy.gif b/data/enemies/heavy.gif
new file mode 100644
index 00000000..05b1f7eb
Binary files /dev/null and b/data/enemies/heavy.gif differ
diff --git a/data/enemies/heavy.png b/data/enemies/heavy.png
deleted file mode 100644
index 073597f5..00000000
Binary files a/data/enemies/heavy.png and /dev/null differ
diff --git a/data/enemies/jailbattle_alien.gif b/data/enemies/jailbattle_alien.gif
new file mode 100644
index 00000000..306f1b78
Binary files /dev/null and b/data/enemies/jailbattle_alien.gif differ
diff --git a/data/enemies/jailbattle_alien.png b/data/enemies/jailbattle_alien.png
deleted file mode 100644
index 0956c993..00000000
Binary files a/data/enemies/jailbattle_alien.png and /dev/null differ
diff --git a/data/enemies/jailbattle_human.gif b/data/enemies/jailbattle_human.gif
new file mode 100644
index 00000000..9e341b7a
Binary files /dev/null and b/data/enemies/jailbattle_human.gif differ
diff --git a/data/enemies/jailbattle_human.png b/data/enemies/jailbattle_human.png
deleted file mode 100644
index d64e6ccb..00000000
Binary files a/data/enemies/jailbattle_human.png and /dev/null differ
diff --git a/data/enemies/jailer_#1.gif b/data/enemies/jailer_#1.gif
new file mode 100644
index 00000000..67b9025f
Binary files /dev/null and b/data/enemies/jailer_#1.gif differ
diff --git a/data/enemies/jailer_#1.png b/data/enemies/jailer_#1.png
deleted file mode 100644
index 0a4f570c..00000000
Binary files a/data/enemies/jailer_#1.png and /dev/null differ
diff --git a/data/enemies/jailer_#2.gif b/data/enemies/jailer_#2.gif
new file mode 100644
index 00000000..7eec2459
Binary files /dev/null and b/data/enemies/jailer_#2.gif differ
diff --git a/data/enemies/jailer_#2.png b/data/enemies/jailer_#2.png
deleted file mode 100644
index 2ad1e1ef..00000000
Binary files a/data/enemies/jailer_#2.png and /dev/null differ
diff --git a/data/enemies/jailer_#3.gif b/data/enemies/jailer_#3.gif
new file mode 100644
index 00000000..89eaaaa9
Binary files /dev/null and b/data/enemies/jailer_#3.gif differ
diff --git a/data/enemies/jailer_#3.png b/data/enemies/jailer_#3.png
deleted file mode 100644
index 41f4eb2d..00000000
Binary files a/data/enemies/jailer_#3.png and /dev/null differ
diff --git a/data/enemies/jeannine.gif b/data/enemies/jeannine.gif
new file mode 100644
index 00000000..68293d5f
Binary files /dev/null and b/data/enemies/jeannine.gif differ
diff --git a/data/enemies/jeannine.png b/data/enemies/jeannine.png
deleted file mode 100644
index 88d2ce51..00000000
Binary files a/data/enemies/jeannine.png and /dev/null differ
diff --git a/data/enemies/lamp.gif b/data/enemies/lamp.gif
new file mode 100644
index 00000000..5dc1ef77
Binary files /dev/null and b/data/enemies/lamp.gif differ
diff --git a/data/enemies/lamp.png b/data/enemies/lamp.png
deleted file mode 100644
index c1333dca..00000000
Binary files a/data/enemies/lamp.png and /dev/null differ
diff --git a/data/enemies/lord_abad.gif b/data/enemies/lord_abad.gif
new file mode 100644
index 00000000..e2465658
Binary files /dev/null and b/data/enemies/lord_abad.gif differ
diff --git a/data/enemies/lord_abad.png b/data/enemies/lord_abad.png
deleted file mode 100644
index a0d8fde0..00000000
Binary files a/data/enemies/lord_abad.png and /dev/null differ
diff --git a/data/enemies/matatunos.gif b/data/enemies/matatunos.gif
new file mode 100644
index 00000000..6b41861f
Binary files /dev/null and b/data/enemies/matatunos.gif differ
diff --git a/data/enemies/matatunos.png b/data/enemies/matatunos.png
deleted file mode 100644
index ebc25fdc..00000000
Binary files a/data/enemies/matatunos.png and /dev/null differ
diff --git a/data/enemies/mummy.gif b/data/enemies/mummy.gif
new file mode 100644
index 00000000..dcda7fcf
Binary files /dev/null and b/data/enemies/mummy.gif differ
diff --git a/data/enemies/mummy.png b/data/enemies/mummy.png
deleted file mode 100644
index b6d2c360..00000000
Binary files a/data/enemies/mummy.png and /dev/null differ
diff --git a/data/enemies/paco.gif b/data/enemies/paco.gif
new file mode 100644
index 00000000..8c071791
Binary files /dev/null and b/data/enemies/paco.gif differ
diff --git a/data/enemies/paco.png b/data/enemies/paco.png
deleted file mode 100644
index 2367c9e1..00000000
Binary files a/data/enemies/paco.png and /dev/null differ
diff --git a/data/enemies/qvoid.gif b/data/enemies/qvoid.gif
new file mode 100644
index 00000000..4ae89a61
Binary files /dev/null and b/data/enemies/qvoid.gif differ
diff --git a/data/enemies/qvoid.png b/data/enemies/qvoid.png
deleted file mode 100644
index 8192c3fe..00000000
Binary files a/data/enemies/qvoid.png and /dev/null differ
diff --git a/data/enemies/robot.gif b/data/enemies/robot.gif
new file mode 100644
index 00000000..1047826d
Binary files /dev/null and b/data/enemies/robot.gif differ
diff --git a/data/enemies/robot.png b/data/enemies/robot.png
deleted file mode 100644
index e8aa16fe..00000000
Binary files a/data/enemies/robot.png and /dev/null differ
diff --git a/data/enemies/sam.gif b/data/enemies/sam.gif
new file mode 100644
index 00000000..3fb8edba
Binary files /dev/null and b/data/enemies/sam.gif differ
diff --git a/data/enemies/sam.png b/data/enemies/sam.png
deleted file mode 100644
index 3af3e524..00000000
Binary files a/data/enemies/sam.png and /dev/null differ
diff --git a/data/enemies/shock.gif b/data/enemies/shock.gif
new file mode 100644
index 00000000..3ad9cb1b
Binary files /dev/null and b/data/enemies/shock.gif differ
diff --git a/data/enemies/shock.png b/data/enemies/shock.png
deleted file mode 100644
index 7e16e9e0..00000000
Binary files a/data/enemies/shock.png and /dev/null differ
diff --git a/data/enemies/sigmasua.gif b/data/enemies/sigmasua.gif
new file mode 100644
index 00000000..ecfe5bb9
Binary files /dev/null and b/data/enemies/sigmasua.gif differ
diff --git a/data/enemies/sigmasua.png b/data/enemies/sigmasua.png
deleted file mode 100644
index 111075ef..00000000
Binary files a/data/enemies/sigmasua.png and /dev/null differ
diff --git a/data/enemies/spark.gif b/data/enemies/spark.gif
new file mode 100644
index 00000000..8126019c
Binary files /dev/null and b/data/enemies/spark.gif differ
diff --git a/data/enemies/spark.png b/data/enemies/spark.png
deleted file mode 100644
index 550eedc8..00000000
Binary files a/data/enemies/spark.png and /dev/null differ
diff --git a/data/enemies/special/aerojailer.gif b/data/enemies/special/aerojailer.gif
new file mode 100644
index 00000000..38351963
Binary files /dev/null and b/data/enemies/special/aerojailer.gif differ
diff --git a/data/enemies/special/aerojailer.png b/data/enemies/special/aerojailer.png
deleted file mode 100644
index dcdbb291..00000000
Binary files a/data/enemies/special/aerojailer.png and /dev/null differ
diff --git a/data/enemies/special/arounder.gif b/data/enemies/special/arounder.gif
new file mode 100644
index 00000000..aa75f4db
Binary files /dev/null and b/data/enemies/special/arounder.gif differ
diff --git a/data/enemies/special/arounder.png b/data/enemies/special/arounder.png
deleted file mode 100644
index 9d9db919..00000000
Binary files a/data/enemies/special/arounder.png and /dev/null differ
diff --git a/data/enemies/special/pepe_rosita_job.gif b/data/enemies/special/pepe_rosita_job.gif
new file mode 100644
index 00000000..6ced01fd
Binary files /dev/null and b/data/enemies/special/pepe_rosita_job.gif differ
diff --git a/data/enemies/special/pepe_rosita_job.png b/data/enemies/special/pepe_rosita_job.png
deleted file mode 100644
index 44e564a7..00000000
Binary files a/data/enemies/special/pepe_rosita_job.png and /dev/null differ
diff --git a/data/enemies/special/shooting_star.gif b/data/enemies/special/shooting_star.gif
new file mode 100644
index 00000000..a8dd06a6
Binary files /dev/null and b/data/enemies/special/shooting_star.gif differ
diff --git a/data/enemies/special/shooting_star.png b/data/enemies/special/shooting_star.png
deleted file mode 100644
index 4a9a8fd7..00000000
Binary files a/data/enemies/special/shooting_star.png and /dev/null differ
diff --git a/data/enemies/spider.gif b/data/enemies/spider.gif
new file mode 100644
index 00000000..ee536c81
Binary files /dev/null and b/data/enemies/spider.gif differ
diff --git a/data/enemies/spider.png b/data/enemies/spider.png
deleted file mode 100644
index 7ca50d48..00000000
Binary files a/data/enemies/spider.png and /dev/null differ
diff --git a/data/enemies/stopped_arounder.gif b/data/enemies/stopped_arounder.gif
new file mode 100644
index 00000000..3fe9d92b
Binary files /dev/null and b/data/enemies/stopped_arounder.gif differ
diff --git a/data/enemies/stopped_arounder.png b/data/enemies/stopped_arounder.png
deleted file mode 100644
index c3b0fa51..00000000
Binary files a/data/enemies/stopped_arounder.png and /dev/null differ
diff --git a/data/enemies/tree_thing.gif b/data/enemies/tree_thing.gif
new file mode 100644
index 00000000..c29929cf
Binary files /dev/null and b/data/enemies/tree_thing.gif differ
diff --git a/data/enemies/tree_thing.png b/data/enemies/tree_thing.png
deleted file mode 100644
index 3d71fcec..00000000
Binary files a/data/enemies/tree_thing.png and /dev/null differ
diff --git a/data/enemies/tuno.gif b/data/enemies/tuno.gif
new file mode 100644
index 00000000..b40d53b6
Binary files /dev/null and b/data/enemies/tuno.gif differ
diff --git a/data/enemies/tuno.png b/data/enemies/tuno.png
deleted file mode 100644
index 4ecc0d82..00000000
Binary files a/data/enemies/tuno.png and /dev/null differ
diff --git a/data/enemies/tv.gif b/data/enemies/tv.gif
new file mode 100644
index 00000000..ac633357
Binary files /dev/null and b/data/enemies/tv.gif differ
diff --git a/data/enemies/tv.png b/data/enemies/tv.png
deleted file mode 100644
index f2326530..00000000
Binary files a/data/enemies/tv.png and /dev/null differ
diff --git a/data/enemies/tv_panel.gif b/data/enemies/tv_panel.gif
new file mode 100644
index 00000000..fa769c28
Binary files /dev/null and b/data/enemies/tv_panel.gif differ
diff --git a/data/enemies/tv_panel.png b/data/enemies/tv_panel.png
deleted file mode 100644
index 4d5fb982..00000000
Binary files a/data/enemies/tv_panel.png and /dev/null differ
diff --git a/data/enemies/upv_student.gif b/data/enemies/upv_student.gif
new file mode 100644
index 00000000..a44675cd
Binary files /dev/null and b/data/enemies/upv_student.gif differ
diff --git a/data/enemies/upv_student.png b/data/enemies/upv_student.png
deleted file mode 100644
index 29fad5f6..00000000
Binary files a/data/enemies/upv_student.png and /dev/null differ
diff --git a/data/enemies/walking_arounder.gif b/data/enemies/walking_arounder.gif
new file mode 100644
index 00000000..3c443d37
Binary files /dev/null and b/data/enemies/walking_arounder.gif differ
diff --git a/data/enemies/walking_arounder.png b/data/enemies/walking_arounder.png
deleted file mode 100644
index a1d36f29..00000000
Binary files a/data/enemies/walking_arounder.png and /dev/null differ
diff --git a/data/enemies/wave.gif b/data/enemies/wave.gif
new file mode 100644
index 00000000..95b70044
Binary files /dev/null and b/data/enemies/wave.gif differ
diff --git a/data/enemies/wave.png b/data/enemies/wave.png
deleted file mode 100644
index 68a764e1..00000000
Binary files a/data/enemies/wave.png and /dev/null differ
diff --git a/data/enemies/z80.gif b/data/enemies/z80.gif
new file mode 100644
index 00000000..5cf0bd10
Binary files /dev/null and b/data/enemies/z80.gif differ
diff --git a/data/enemies/z80.png b/data/enemies/z80.png
deleted file mode 100644
index e06da52d..00000000
Binary files a/data/enemies/z80.png and /dev/null differ
diff --git a/data/font/8bithud.gif b/data/font/8bithud.gif
new file mode 100644
index 00000000..da0ca194
Binary files /dev/null and b/data/font/8bithud.gif differ
diff --git a/data/font/8bithud.png b/data/font/8bithud.png
deleted file mode 100644
index 2ac5e4c8..00000000
Binary files a/data/font/8bithud.png and /dev/null differ
diff --git a/data/font/debug.gif b/data/font/debug.gif
new file mode 100644
index 00000000..e02c61ae
Binary files /dev/null and b/data/font/debug.gif differ
diff --git a/data/font/debug.png b/data/font/debug.png
deleted file mode 100644
index afa42204..00000000
Binary files a/data/font/debug.png and /dev/null differ
diff --git a/data/font/gauntlet.gif b/data/font/gauntlet.gif
new file mode 100644
index 00000000..af24b7f3
Binary files /dev/null and b/data/font/gauntlet.gif differ
diff --git a/data/font/gauntlet.png b/data/font/gauntlet.png
deleted file mode 100644
index a7c956a3..00000000
Binary files a/data/font/gauntlet.png and /dev/null differ
diff --git a/data/font/smb2.gif b/data/font/smb2.gif
new file mode 100644
index 00000000..88e98701
Binary files /dev/null and b/data/font/smb2.gif differ
diff --git a/data/font/smb2.png b/data/font/smb2.png
deleted file mode 100644
index 7f71dd53..00000000
Binary files a/data/font/smb2.png and /dev/null differ
diff --git a/data/font/subatomic.gif b/data/font/subatomic.gif
new file mode 100644
index 00000000..b0600090
Binary files /dev/null and b/data/font/subatomic.gif differ
diff --git a/data/font/subatomic.png b/data/font/subatomic.png
deleted file mode 100644
index 685fa774..00000000
Binary files a/data/font/subatomic.png and /dev/null differ
diff --git a/data/items/items.gif b/data/items/items.gif
new file mode 100644
index 00000000..c8391a5d
Binary files /dev/null and b/data/items/items.gif differ
diff --git a/data/items/items.png b/data/items/items.png
deleted file mode 100644
index fe524bb5..00000000
Binary files a/data/items/items.png and /dev/null differ
diff --git a/data/loading/loading_screen_bn.gif b/data/loading/loading_screen_bn.gif
new file mode 100644
index 00000000..a53e9784
Binary files /dev/null and b/data/loading/loading_screen_bn.gif differ
diff --git a/data/loading/loading_screen_color.gif b/data/loading/loading_screen_color.gif
new file mode 100644
index 00000000..2fbcfdb0
Binary files /dev/null and b/data/loading/loading_screen_color.gif differ
diff --git a/data/logo/jailgames.gif b/data/logo/jailgames.gif
new file mode 100644
index 00000000..adc09e83
Binary files /dev/null and b/data/logo/jailgames.gif differ
diff --git a/data/logo/jailgames.png b/data/logo/jailgames.png
deleted file mode 100644
index e85ceb9b..00000000
Binary files a/data/logo/jailgames.png and /dev/null differ
diff --git a/data/logo/since_1998.gif b/data/logo/since_1998.gif
new file mode 100644
index 00000000..11f1c1c8
Binary files /dev/null and b/data/logo/since_1998.gif differ
diff --git a/data/logo/since_1998.png b/data/logo/since_1998.png
deleted file mode 100644
index 6cbc741d..00000000
Binary files a/data/logo/since_1998.png and /dev/null differ
diff --git a/data/notifications/notify.png b/data/notifications/notify.png
deleted file mode 100644
index 753f74c7..00000000
Binary files a/data/notifications/notify.png and /dev/null differ
diff --git a/data/player/player.gif b/data/player/player.gif
new file mode 100644
index 00000000..3c811dad
Binary files /dev/null and b/data/player/player.gif differ
diff --git a/data/player/player.png b/data/player/player.png
deleted file mode 100644
index ef192296..00000000
Binary files a/data/player/player.png and /dev/null differ
diff --git a/data/player/player2.gif b/data/player/player2.gif
new file mode 100644
index 00000000..4140a755
Binary files /dev/null and b/data/player/player2.gif differ
diff --git a/data/player/player2.png b/data/player/player2.png
deleted file mode 100644
index 3e33e36c..00000000
Binary files a/data/player/player2.png and /dev/null differ
diff --git a/data/player/player_game_over.gif b/data/player/player_game_over.gif
new file mode 100644
index 00000000..f7d69b3b
Binary files /dev/null and b/data/player/player_game_over.gif differ
diff --git a/data/player/player_game_over.png b/data/player/player_game_over.png
deleted file mode 100644
index 7c92e3bc..00000000
Binary files a/data/player/player_game_over.png and /dev/null differ
diff --git a/data/test.gif b/data/test.gif
deleted file mode 100644
index 4fd9371a..00000000
Binary files a/data/test.gif and /dev/null differ
diff --git a/data/tilesets/standard.gif b/data/tilesets/standard.gif
new file mode 100644
index 00000000..b53e867b
Binary files /dev/null and b/data/tilesets/standard.gif differ
diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png
deleted file mode 100644
index ef7fa448..00000000
Binary files a/data/tilesets/standard.png and /dev/null differ
diff --git a/data/tilesets/standard_zxarne.png b/data/tilesets/standard_zxarne.png
deleted file mode 100644
index 7902e0ee..00000000
Binary files a/data/tilesets/standard_zxarne.png and /dev/null differ
diff --git a/data/title/loading_screen_bn.png b/data/title/loading_screen_bn.png
deleted file mode 100644
index 86fc82f6..00000000
Binary files a/data/title/loading_screen_bn.png and /dev/null differ
diff --git a/data/title/loading_screen_bn_zxarne.png b/data/title/loading_screen_bn_zxarne.png
deleted file mode 100644
index 3ed57e43..00000000
Binary files a/data/title/loading_screen_bn_zxarne.png and /dev/null differ
diff --git a/data/title/loading_screen_color.png b/data/title/loading_screen_color.png
deleted file mode 100644
index b559bf63..00000000
Binary files a/data/title/loading_screen_color.png and /dev/null differ
diff --git a/data/title/loading_screen_color_zxarne.png b/data/title/loading_screen_color_zxarne.png
deleted file mode 100644
index c436a4c5..00000000
Binary files a/data/title/loading_screen_color_zxarne.png and /dev/null differ
diff --git a/data/title/title_logo.gif b/data/title/title_logo.gif
new file mode 100644
index 00000000..56770a47
Binary files /dev/null and b/data/title/title_logo.gif differ
diff --git a/data/title/title_logo.png b/data/title/title_logo.png
deleted file mode 100644
index 2eeb85fd..00000000
Binary files a/data/title/title_logo.png and /dev/null differ