Changed Memorize to play ogg files

The memorize activity has been changed to use ogg files
instead of aiff files to save storage on the XO. The old
player images (aka icecream) has been removed from the
git tree as well.

298 files changed, 87 insertions, 150 deletions

diff --git a/csound/univorc.csd b/csound/univorc.csd
index 639aa27..b646f8f 100644
--- a/csound/univorc.csd
+++ b/csound/univorc.csd
@@ -25,19 +25,13 @@ instr 108
 */
 S1 strget p4
 inst = p5
-ich    filenchnls S1
-iln    filelen  S1
+ich = 1
+iln = 10
 ioffset = p8
 
 Slen  sprintf "sfplay.%d.flen", p5  ; file length channel
 chnset iln, Slen
 
-if ioffset >= iln then
-turnoff
-else
-iln = iln - ioffset
-endif
-
 Splay sprintf "sfplay.%d.on", inst  ; instance control channel
 Sname sprintf "sfplay.%d.fname", inst  ; filename channel
 Sgain sprintf "sfplay.%d.gain", inst ; gain channel
@@ -68,10 +62,10 @@ printf "sfplay:%d OFF\n", 1, inst
 turnoff
 endif
 if ich = 1 then
-a1 diskin2 S1,1,ioffset,1
+a1 oggplay S1, ioffset
 a2 = a1
 else
-a1,a2 diskin2 S1,1,ioffset,1
+a1,a2 oggplay S1, ioffset
 endif
      outs a1*kg1, a2*kg1
 printf_i "sfplay:%d\n", 1, inst
diff --git a/game.py b/game.py
index 46da2e2..30fdae7 100755
--- a/game.py
+++ b/game.py
@@ -147,7 +147,7 @@ class MemorizeGame(gobject.GObject):
         if self.sound == 1:
             snd = self.model.grid[id].get('snd', None)
             if snd != None:
-                self.cs.perform('i 108 0.0 3.0 "%s" 1 0.9 0.1'%(snd))                
+                self.cs.perform('i 108 0.0 3.0 "%s" 1 0.9 0'%(snd))                
                 _logger.debug('Audio: play sound=%s'%snd)
                 
         # First card case
diff --git a/games/drumgit/drumgit.mem b/games/drumgit/drumgit.mem
index 42db853..5d41c15 100644
--- a/games/drumgit/drumgit.mem
+++ b/games/drumgit/drumgit.mem
@@ -1,57 +1,24 @@
 <?xml version="1.0"?>
 <memorize name="drumgit" scoresnd="score.wav" winsnd="win.wav" divided="0" >
 
- <pair aimg="drumkit1_b.jpg" asnd="beat1_a.aiff" bimg="drumkit1_b.jpg" bsnd="beat1_a.aiff" color="100" />
- <pair aimg="drumkit2_b.jpg" asnd="beat1_b.aiff" bimg="drumkit2_b.jpg" bsnd="beat1_b.aiff" color="100" />
- <pair aimg="drumkit3_b.jpg" asnd="beat1_c.aiff" bimg="drumkit3_b.jpg" bsnd="beat1_c.aiff" color="100" />
- <pair aimg="drumkit4_b.jpg" asnd="beat8.aiff" bimg="drumkit4_b.jpg" bsnd="beat8.aiff" color="100" />
+ <pair aimg="drumkit1_b.jpg" asnd="beat1_a.ogg" bimg="drumkit1_b.jpg" bsnd="beat1_a.ogg" color="100" />
+ <pair aimg="drumkit2_b.jpg" asnd="beat1_b.ogg" bimg="drumkit2_b.jpg" bsnd="beat1_b.ogg" color="100" />
+ <pair aimg="drumkit3_b.jpg" asnd="beat1_c.ogg" bimg="drumkit3_b.jpg" bsnd="beat1_c.ogg" color="100" />
+ <pair aimg="drumkit4_b.jpg" asnd="beat8.ogg" bimg="drumkit4_b.jpg" bsnd="beat8.ogg" color="100" />
 
- <pair aimg="drumkit6_b.jpg" asnd="beat3.aiff" bimg="drumkit6_b.jpg" bsnd="beat3.aiff" color="100" />
- <pair aimg="drumkit7_b.jpg" asnd="beat4.aiff" bimg="drumkit7_b.jpg" bsnd="beat4.aiff" color="100" />
- <pair aimg="drumkit8_b.jpg" asnd="beat14.aiff" bimg="drumkit8_b.jpg" bsnd="beat14.aiff" color="100" />
- <pair aimg="drumkit9_b.jpg" asnd="beat6_2.aiff" bimg="drumkit9_b.jpg" bsnd="beat6_2.aiff" color="100" />
+ <pair aimg="drumkit6_b.jpg" asnd="beat3.ogg" bimg="drumkit6_b.jpg" bsnd="beat3.ogg" color="100" />
+ <pair aimg="drumkit7_b.jpg" asnd="beat4.ogg" bimg="drumkit7_b.jpg" bsnd="beat4.ogg" color="100" />
+ <pair aimg="drumkit8_b.jpg" asnd="beat14.ogg" bimg="drumkit8_b.jpg" bsnd="beat14.ogg" color="100" />
+ <pair aimg="drumkit9_b.jpg" asnd="beat6_2.ogg" bimg="drumkit9_b.jpg" bsnd="beat6_2.ogg" color="100" />
 
- <pair aimg="guitar1_2.jpg" asnd="bending_a.aiff" bimg="guitar1_2.jpg" bsnd="bending_a.aiff" color="100" />
- <pair aimg="guitar2_2.jpg" asnd="bending_b.aiff" bimg="guitar2_2.jpg" bsnd="bending_b.aiff" color="100" />
- <pair aimg="guitar3_2.jpg" asnd="flashcomp2a.aiff" bimg="guitar3_2.jpg" bsnd="flashcomp2a.aiff" color="100" />
- <pair aimg="guitar4_2.jpg" asnd="flashcomp2b.aiff" bimg="guitar4_2.jpg" bsnd="flashcomp2b.aiff" color="100" />
+ <pair aimg="guitar1_2.jpg" asnd="bending_a.ogg" bimg="guitar1_2.jpg" bsnd="bending_a.ogg" color="100" />
+ <pair aimg="guitar2_2.jpg" asnd="bending_b.ogg" bimg="guitar2_2.jpg" bsnd="bending_b.ogg" color="100" />
+ <pair aimg="guitar3_2.jpg" asnd="flashcomp2a.ogg" bimg="guitar3_2.jpg" bsnd="flashcomp2a.ogg" color="100" />
+ <pair aimg="guitar4_2.jpg" asnd="flashcomp2b.ogg" bimg="guitar4_2.jpg" bsnd="flashcomp2b.ogg" color="100" />
 
- <pair aimg="guitar5_2.jpg" asnd="gedaempft.aiff" bimg="guitar5_2.jpg" bsnd="gedaempft.aiff" color="100" />
- <pair aimg="guitar6_2.jpg" asnd="ungedaempft.aiff" bimg="guitar6_2.jpg" bsnd="ungedaempft.aiff" color="100" />
- <pair aimg="guitar7_2.jpg" asnd="jimi4.aiff" bimg="guitar7_2.jpg" bsnd="jimi4.aiff" color="100" />
- <pair aimg="guitar8_2.jpg" asnd="git_hit1.aiff" bimg="guitar8_2.jpg" bsnd="git_hit1.aiff" color="100" />
+ <pair aimg="guitar5_2.jpg" asnd="gedaempft.ogg" bimg="guitar5_2.jpg" bsnd="gedaempft.ogg" color="100" />
+ <pair aimg="guitar6_2.jpg" asnd="ungedaempft.ogg" bimg="guitar6_2.jpg" bsnd="ungedaempft.ogg" color="100" />
+ <pair aimg="guitar7_2.jpg" asnd="jimi4.ogg" bimg="guitar7_2.jpg" bsnd="jimi4.ogg" color="100" />
+ <pair aimg="guitar8_2.jpg" asnd="git_hit1.ogg" bimg="guitar8_2.jpg" bsnd="git_hit1.ogg" color="100" />
 
 </memorize>
-
-<!--
-game_name=drumgit
-score_sound=score.wav
-win_sound=score.wav
-divided=False
-face= 
-# Cards
-,drumkit1_b.jpg,beat1_a.wav,,,,,,,drumkit1_b.jpg,beat1_a.wav,,,,,
-,drumkit2_b.jpg,beat1_b.wav,,,,,,,drumkit2_b.jpg,beat1_b.wav,,,,,
-,drumkit3_b.jpg,beat1_c.wav,,,,,,,drumkit3_b.jpg,beat1_c.wav,,,,,
-,drumkit4_b.jpg,beat8.wav,,,,,,,drumkit4_b.jpg,beat8.wav,,,,,
-,drumkit5_b.jpg,beat2.wav,,,,,,,drumkit5_b.jpg,beat2.wav,,,,,
-,drumkit6_b.jpg,beat3.wav,,,,,,,drumkit6_b.jpg,beat3.wav,,,,,
-,drumkit7_b.jpg,beat4.wav,,,,,,,drumkit7_b.jpg,beat4.wav,,,,,
-,drumkit8_b.jpg,beat14.wav,,,,,,,drumkit8_b.jpg,beat14.wav,,,,,
-,drumkit9_b.jpg,beat6_2.wav,,,,,,,drumkit9_b.jpg,beat6_2.wav,,,,,
-,drumkit10_b.jpg,beat16.wav,,,,,,,drumkit10_b.jpg,beat16.wav,,,,,
-,drumkit11_b.jpg,beat17.wav,,,,,,,drumkit11_b.jpg,beat17.wav,,,,,
-,drumkit12_b.jpg,beat10.wav,,,,,,,drumkit12_b.jpg,beat10.wav,,,,,
-,guitar1_2.jpg,bending_a.wav,,,,,,,guitar1_2.jpg,bending_a.wav,,,,,
-,guitar2_2.jpg,bending_b.wav,,,,,,,guitar2_2.jpg,bending_b.wav,,,,,
-,guitar3_2.jpg,flashcomp2a.wav,,,,,,,guitar3_2.jpg,flashcomp2a.wav,,,,,
-,guitar4_2.jpg,flashcomp2b.wav,,,,,,,guitar4_2.jpg,flashcomp2b.wav,,,,,
-,guitar5_2.jpg,gedaempft.wav,,,,,,,guitar5_2.jpg,gedaempft.wav,,,,,
-,guitar6_2.jpg,ungedaempft.wav,,,,,,,guitar6_2.jpg,ungedaempft.wav,,,,,
-,guitar7_2.jpg,jimi4.wav,,,,,,,guitar7_2.jpg,jimi4.wav,,,,,
-,guitar8_2.jpg,git_hit1.wav,,,,,,,guitar8_2.jpg,git_hit1.wav,,,,,
-,guitar9_2.jpg,git_hit4.wav,,,,,,,guitar9_2.jpg,git_hit4.wav,,,,,
-,guitar10_2.jpg,guitcello.wav,,,,,,,guitar10_2.jpg,guitcello.wav,,,,,
-,guitar11_2.jpg,flasholet4.wav,,,,,,,guitar11_2.jpg,flasholet4.wav,,,,,
-,guitar12_2.jpg,jimi1.wav,,,,,,,guitar12_2.jpg,jimi1.wav,,,,,
--->
\ No newline at end of file
diff --git a/games/drumgit/sounds/beat10.aiff b/games/drumgit/sounds/beat10.aiff
deleted file mode 100644
index 7a86e46..0000000
--- a/games/drumgit/sounds/beat10.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/beat10.ogg b/games/drumgit/sounds/beat10.ogg
new file mode 100644
index 0000000..8539dbd
--- /dev/null
+++ b/games/drumgit/sounds/beat10.ogg
diff --git a/games/drumgit/sounds/beat14.aiff b/games/drumgit/sounds/beat14.aiff
deleted file mode 100644
index ae530e2..0000000
--- a/games/drumgit/sounds/beat14.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/beat14.ogg b/games/drumgit/sounds/beat14.ogg
new file mode 100644
index 0000000..5356ad0
--- /dev/null
+++ b/games/drumgit/sounds/beat14.ogg
diff --git a/games/drumgit/sounds/beat16.aiff b/games/drumgit/sounds/beat16.aiff
deleted file mode 100644
index 9bd9474..0000000
--- a/games/drumgit/sounds/beat16.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/beat16.ogg b/games/drumgit/sounds/beat16.ogg
new file mode 100644
index 0000000..63578ea
--- /dev/null
+++ b/games/drumgit/sounds/beat16.ogg
diff --git a/games/drumgit/sounds/beat17.aiff b/games/drumgit/sounds/beat17.aiff
deleted file mode 100644
index 92990b4..0000000
--- a/games/drumgit/sounds/beat17.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/beat17.ogg b/games/drumgit/sounds/beat17.ogg
new file mode 100644
index 0000000..6f07ce1
--- /dev/null
+++ b/games/drumgit/sounds/beat17.ogg
diff --git a/games/drumgit/sounds/beat1_a.aiff b/games/drumgit/sounds/beat1_a.aiff
deleted file mode 100644
index 654ba5f..0000000
--- a/games/drumgit/sounds/beat1_a.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/beat1_a.ogg b/games/drumgit/sounds/beat1_a.ogg
new file mode 100644
index 0000000..52f5ad4
--- /dev/null
+++ b/games/drumgit/sounds/beat1_a.ogg
diff --git a/games/drumgit/sounds/beat1_b.aiff b/games/drumgit/sounds/beat1_b.aiff
deleted file mode 100644
index a8328e9..0000000
--- a/games/drumgit/sounds/beat1_b.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/beat1_b.ogg b/games/drumgit/sounds/beat1_b.ogg
new file mode 100644
index 0000000..972fed2
--- /dev/null
+++ b/games/drumgit/sounds/beat1_b.ogg
diff --git a/games/drumgit/sounds/beat1_c.aiff b/games/drumgit/sounds/beat1_c.aiff
deleted file mode 100644
index 776bb23..0000000
--- a/games/drumgit/sounds/beat1_c.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/beat1_c.ogg b/games/drumgit/sounds/beat1_c.ogg
new file mode 100644
index 0000000..0256d07
--- /dev/null
+++ b/games/drumgit/sounds/beat1_c.ogg
diff --git a/games/drumgit/sounds/beat2.aiff b/games/drumgit/sounds/beat2.aiff
deleted file mode 100644
index 33069d4..0000000
--- a/games/drumgit/sounds/beat2.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/beat2.ogg b/games/drumgit/sounds/beat2.ogg
new file mode 100644
index 0000000..c8a5406
--- /dev/null
+++ b/games/drumgit/sounds/beat2.ogg
diff --git a/games/drumgit/sounds/beat3.aiff b/games/drumgit/sounds/beat3.aiff
deleted file mode 100644
index 3c22de6..0000000
--- a/games/drumgit/sounds/beat3.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/beat3.ogg b/games/drumgit/sounds/beat3.ogg
new file mode 100644
index 0000000..61483ff
--- /dev/null
+++ b/games/drumgit/sounds/beat3.ogg
diff --git a/games/drumgit/sounds/beat4.aiff b/games/drumgit/sounds/beat4.aiff
deleted file mode 100644
index 1c2fe08..0000000
--- a/games/drumgit/sounds/beat4.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/beat4.ogg b/games/drumgit/sounds/beat4.ogg
new file mode 100644
index 0000000..19f00fd
--- /dev/null
+++ b/games/drumgit/sounds/beat4.ogg
diff --git a/games/drumgit/sounds/beat6_2.aiff b/games/drumgit/sounds/beat6_2.aiff
deleted file mode 100644
index 911e630..0000000
--- a/games/drumgit/sounds/beat6_2.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/beat6_2.ogg b/games/drumgit/sounds/beat6_2.ogg
new file mode 100644
index 0000000..d6021f9
--- /dev/null
+++ b/games/drumgit/sounds/beat6_2.ogg
diff --git a/games/drumgit/sounds/beat8.aiff b/games/drumgit/sounds/beat8.aiff
deleted file mode 100644
index fa85017..0000000
--- a/games/drumgit/sounds/beat8.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/beat8.ogg b/games/drumgit/sounds/beat8.ogg
new file mode 100644
index 0000000..0266665
--- /dev/null
+++ b/games/drumgit/sounds/beat8.ogg
diff --git a/games/drumgit/sounds/bending_a.aiff b/games/drumgit/sounds/bending_a.aiff
deleted file mode 100644
index 661c67f..0000000
--- a/games/drumgit/sounds/bending_a.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/bending_a.ogg b/games/drumgit/sounds/bending_a.ogg
new file mode 100644
index 0000000..c30c44d
--- /dev/null
+++ b/games/drumgit/sounds/bending_a.ogg
diff --git a/games/drumgit/sounds/bending_b.aiff b/games/drumgit/sounds/bending_b.aiff
deleted file mode 100644
index ddbfb97..0000000
--- a/games/drumgit/sounds/bending_b.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/bending_b.ogg b/games/drumgit/sounds/bending_b.ogg
new file mode 100644
index 0000000..a3ba1b1
--- /dev/null
+++ b/games/drumgit/sounds/bending_b.ogg
diff --git a/games/drumgit/sounds/flashcomp2a.aiff b/games/drumgit/sounds/flashcomp2a.aiff
deleted file mode 100644
index 3b5f284..0000000
--- a/games/drumgit/sounds/flashcomp2a.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/flashcomp2a.ogg b/games/drumgit/sounds/flashcomp2a.ogg
new file mode 100644
index 0000000..4814311
--- /dev/null
+++ b/games/drumgit/sounds/flashcomp2a.ogg
diff --git a/games/drumgit/sounds/flashcomp2b.aiff b/games/drumgit/sounds/flashcomp2b.aiff
deleted file mode 100644
index 0d7d14d..0000000
--- a/games/drumgit/sounds/flashcomp2b.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/flashcomp2b.ogg b/games/drumgit/sounds/flashcomp2b.ogg
new file mode 100644
index 0000000..eb9457f
--- /dev/null
+++ b/games/drumgit/sounds/flashcomp2b.ogg
diff --git a/games/drumgit/sounds/flasholet4.aiff b/games/drumgit/sounds/flasholet4.aiff
deleted file mode 100644
index 0c4d56e..0000000
--- a/games/drumgit/sounds/flasholet4.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/flasholet4.ogg b/games/drumgit/sounds/flasholet4.ogg
new file mode 100644
index 0000000..4662472
--- /dev/null
+++ b/games/drumgit/sounds/flasholet4.ogg
diff --git a/games/drumgit/sounds/gedaempft.aiff b/games/drumgit/sounds/gedaempft.aiff
deleted file mode 100644
index 0ede22e..0000000
--- a/games/drumgit/sounds/gedaempft.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/gedaempft.ogg b/games/drumgit/sounds/gedaempft.ogg
new file mode 100644
index 0000000..9ce892b
--- /dev/null
+++ b/games/drumgit/sounds/gedaempft.ogg
diff --git a/games/drumgit/sounds/git_hit1.aiff b/games/drumgit/sounds/git_hit1.aiff
deleted file mode 100644
index ac7a33e..0000000
--- a/games/drumgit/sounds/git_hit1.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/git_hit1.ogg b/games/drumgit/sounds/git_hit1.ogg
new file mode 100644
index 0000000..3fa6f03
--- /dev/null
+++ b/games/drumgit/sounds/git_hit1.ogg
diff --git a/games/drumgit/sounds/git_hit4.aiff b/games/drumgit/sounds/git_hit4.aiff
deleted file mode 100644
index 528d843..0000000
--- a/games/drumgit/sounds/git_hit4.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/git_hit4.ogg b/games/drumgit/sounds/git_hit4.ogg
new file mode 100644
index 0000000..9b9840f
--- /dev/null
+++ b/games/drumgit/sounds/git_hit4.ogg
diff --git a/games/drumgit/sounds/guitcello.aiff b/games/drumgit/sounds/guitcello.aiff
deleted file mode 100644
index 0d5c90b..0000000
--- a/games/drumgit/sounds/guitcello.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/guitcello.ogg b/games/drumgit/sounds/guitcello.ogg
new file mode 100644
index 0000000..4ae7217
--- /dev/null
+++ b/games/drumgit/sounds/guitcello.ogg
diff --git a/games/drumgit/sounds/jimi1.aiff b/games/drumgit/sounds/jimi1.aiff
deleted file mode 100644
index 94c50e4..0000000
--- a/games/drumgit/sounds/jimi1.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/jimi1.ogg b/games/drumgit/sounds/jimi1.ogg
new file mode 100644
index 0000000..7866ebd
--- /dev/null
+++ b/games/drumgit/sounds/jimi1.ogg
diff --git a/games/drumgit/sounds/jimi4.aiff b/games/drumgit/sounds/jimi4.aiff
deleted file mode 100644
index a70611a..0000000
--- a/games/drumgit/sounds/jimi4.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/jimi4.ogg b/games/drumgit/sounds/jimi4.ogg
new file mode 100644
index 0000000..f3fd1f0
--- /dev/null
+++ b/games/drumgit/sounds/jimi4.ogg
diff --git a/games/drumgit/sounds/ungedaempft.aiff b/games/drumgit/sounds/ungedaempft.aiff
deleted file mode 100644
index d9e5d7c..0000000
--- a/games/drumgit/sounds/ungedaempft.aiff
+++ /dev/null
diff --git a/games/drumgit/sounds/ungedaempft.ogg b/games/drumgit/sounds/ungedaempft.ogg
new file mode 100644
index 0000000..dad403e
--- /dev/null
+++ b/games/drumgit/sounds/ungedaempft.ogg
diff --git a/games/letters1/letters1.mem b/games/letters1/letters1.mem
index fdc18bc..87d626d 100755
--- a/games/letters1/letters1.mem
+++ b/games/letters1/letters1.mem
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <memorize name="letters1" scoresnd="score.wav" winsnd="win.wav" divided="1" face1="1" face2="2" >
 
- <pair achar="A" asnd="a.aiff" bchar="a" bsnd="a.aiff"/>
- <pair achar="E" asnd="e.aiff" bchar="e" bsnd="e.aiff"/>
- <pair achar="I" asnd="i.aiff" bchar="i" bsnd="i.aiff"/>
- <pair achar="O" asnd="o.aiff" bchar="o" bsnd="o.aiff"/>
- <pair achar="U" asnd="u.aiff" bchar="u" bsnd="u.aiff"/>
- <pair achar="B" asnd="b.aiff" bchar="b" bsnd="b.aiff"/>
- <pair achar="C" asnd="c.aiff" bchar="c" bsnd="c.aiff"/>
- <pair achar="D" asnd="d.aiff" bchar="d" bsnd="d.aiff"/>
- <pair achar="F" asnd="f.aiff" bchar="f" bsnd="f.aiff"/>
- <pair achar="G" asnd="g.aiff" bchar="g" bsnd="g.aiff"/>
- <pair achar="H" asnd="h.aiff" bchar="h" bsnd="h.aiff"/>
- <pair achar="J" asnd="j.aiff" bchar="j" bsnd="j.aiff"/>
- <pair achar="K" asnd="k.aiff" bchar="k" bsnd="k.aiff"/>
- <pair achar="L" asnd="l.aiff" bchar="l" bsnd="l.aiff"/>
- <pair achar="M" asnd="m.aiff" bchar="m" bsnd="m.aiff"/>
- <pair achar="N" asnd="n.aiff" bchar="n" bsnd="n.aiff"/>
- <pair achar="P" asnd="p.aiff" bchar="p" bsnd="p.aiff"/>
- <pair achar="Q" asnd="q.aiff" bchar="q" bsnd="q.aiff"/>
+ <pair achar="A" asnd="a.ogg" bchar="a" bsnd="a.ogg"/>
+ <pair achar="E" asnd="e.ogg" bchar="e" bsnd="e.ogg"/>
+ <pair achar="I" asnd="i.ogg" bchar="i" bsnd="i.ogg"/>
+ <pair achar="O" asnd="o.ogg" bchar="o" bsnd="o.ogg"/>
+ <pair achar="U" asnd="u.ogg" bchar="u" bsnd="u.ogg"/>
+ <pair achar="B" asnd="b.ogg" bchar="b" bsnd="b.ogg"/>
+ <pair achar="C" asnd="c.ogg" bchar="c" bsnd="c.ogg"/>
+ <pair achar="D" asnd="d.ogg" bchar="d" bsnd="d.ogg"/>
+ <pair achar="F" asnd="f.ogg" bchar="f" bsnd="f.ogg"/>
+ <pair achar="G" asnd="g.ogg" bchar="g" bsnd="g.ogg"/>
+ <pair achar="H" asnd="h.ogg" bchar="h" bsnd="h.ogg"/>
+ <pair achar="J" asnd="j.ogg" bchar="j" bsnd="j.ogg"/>
+ <pair achar="K" asnd="k.ogg" bchar="k" bsnd="k.ogg"/>
+ <pair achar="L" asnd="l.ogg" bchar="l" bsnd="l.ogg"/>
+ <pair achar="M" asnd="m.ogg" bchar="m" bsnd="m.ogg"/>
+ <pair achar="N" asnd="n.ogg" bchar="n" bsnd="n.ogg"/>
+ <pair achar="P" asnd="p.ogg" bchar="p" bsnd="p.ogg"/>
+ <pair achar="Q" asnd="q.ogg" bchar="q" bsnd="q.ogg"/>
 
 </memorize>
diff --git a/games/letters1/sounds/a.aiff b/games/letters1/sounds/a.aiff
deleted file mode 100644
index 6e10ac2..0000000
--- a/games/letters1/sounds/a.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/a.ogg b/games/letters1/sounds/a.ogg
new file mode 100644
index 0000000..94794c6
--- /dev/null
+++ b/games/letters1/sounds/a.ogg
diff --git a/games/letters1/sounds/b.aiff b/games/letters1/sounds/b.aiff
deleted file mode 100644
index fdb647e..0000000
--- a/games/letters1/sounds/b.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/b.ogg b/games/letters1/sounds/b.ogg
new file mode 100644
index 0000000..7180e82
--- /dev/null
+++ b/games/letters1/sounds/b.ogg
diff --git a/games/letters1/sounds/c.aiff b/games/letters1/sounds/c.aiff
deleted file mode 100644
index a9e7a2c..0000000
--- a/games/letters1/sounds/c.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/c.ogg b/games/letters1/sounds/c.ogg
new file mode 100644
index 0000000..f02a012
--- /dev/null
+++ b/games/letters1/sounds/c.ogg
diff --git a/games/letters1/sounds/d.aiff b/games/letters1/sounds/d.aiff
deleted file mode 100644
index c18352c..0000000
--- a/games/letters1/sounds/d.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/d.ogg b/games/letters1/sounds/d.ogg
new file mode 100644
index 0000000..39acde8
--- /dev/null
+++ b/games/letters1/sounds/d.ogg
diff --git a/games/letters1/sounds/e.aiff b/games/letters1/sounds/e.aiff
deleted file mode 100644
index 98e0922..0000000
--- a/games/letters1/sounds/e.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/e.ogg b/games/letters1/sounds/e.ogg
new file mode 100644
index 0000000..e118e85
--- /dev/null
+++ b/games/letters1/sounds/e.ogg
diff --git a/games/letters1/sounds/f.aiff b/games/letters1/sounds/f.aiff
deleted file mode 100644
index daa48b3..0000000
--- a/games/letters1/sounds/f.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/f.ogg b/games/letters1/sounds/f.ogg
new file mode 100644
index 0000000..e339d43
--- /dev/null
+++ b/games/letters1/sounds/f.ogg
diff --git a/games/letters1/sounds/g.aiff b/games/letters1/sounds/g.aiff
deleted file mode 100644
index d3b4e62..0000000
--- a/games/letters1/sounds/g.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/g.ogg b/games/letters1/sounds/g.ogg
new file mode 100644
index 0000000..d7b0af4
--- /dev/null
+++ b/games/letters1/sounds/g.ogg
diff --git a/games/letters1/sounds/h.aiff b/games/letters1/sounds/h.aiff
deleted file mode 100644
index 16e84ac..0000000
--- a/games/letters1/sounds/h.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/h.ogg b/games/letters1/sounds/h.ogg
new file mode 100644
index 0000000..55a62e1
--- /dev/null
+++ b/games/letters1/sounds/h.ogg
diff --git a/games/letters1/sounds/i.aiff b/games/letters1/sounds/i.aiff
deleted file mode 100644
index 9ead99c..0000000
--- a/games/letters1/sounds/i.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/i.ogg b/games/letters1/sounds/i.ogg
new file mode 100644
index 0000000..f1bc8db
--- /dev/null
+++ b/games/letters1/sounds/i.ogg
diff --git a/games/letters1/sounds/j.aiff b/games/letters1/sounds/j.aiff
deleted file mode 100644
index 721935f..0000000
--- a/games/letters1/sounds/j.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/j.ogg b/games/letters1/sounds/j.ogg
new file mode 100644
index 0000000..6164cdc
--- /dev/null
+++ b/games/letters1/sounds/j.ogg
diff --git a/games/letters1/sounds/k.aiff b/games/letters1/sounds/k.aiff
deleted file mode 100644
index ff8beb9..0000000
--- a/games/letters1/sounds/k.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/k.ogg b/games/letters1/sounds/k.ogg
new file mode 100644
index 0000000..3763ceb
--- /dev/null
+++ b/games/letters1/sounds/k.ogg
diff --git a/games/letters1/sounds/l.aiff b/games/letters1/sounds/l.aiff
deleted file mode 100644
index c44ed32..0000000
--- a/games/letters1/sounds/l.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/l.ogg b/games/letters1/sounds/l.ogg
new file mode 100644
index 0000000..8e478c8
--- /dev/null
+++ b/games/letters1/sounds/l.ogg
diff --git a/games/letters1/sounds/m.aiff b/games/letters1/sounds/m.aiff
deleted file mode 100644
index 4fe3670..0000000
--- a/games/letters1/sounds/m.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/m.ogg b/games/letters1/sounds/m.ogg
new file mode 100644
index 0000000..43cb68f
--- /dev/null
+++ b/games/letters1/sounds/m.ogg
diff --git a/games/letters1/sounds/n.aiff b/games/letters1/sounds/n.aiff
deleted file mode 100644
index 9991bbd..0000000
--- a/games/letters1/sounds/n.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/n.ogg b/games/letters1/sounds/n.ogg
new file mode 100644
index 0000000..41e589d
--- /dev/null
+++ b/games/letters1/sounds/n.ogg
diff --git a/games/letters1/sounds/o.aiff b/games/letters1/sounds/o.aiff
deleted file mode 100644
index f230102..0000000
--- a/games/letters1/sounds/o.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/o.ogg b/games/letters1/sounds/o.ogg
new file mode 100644
index 0000000..b81ec59
--- /dev/null
+++ b/games/letters1/sounds/o.ogg
diff --git a/games/letters1/sounds/p.aiff b/games/letters1/sounds/p.aiff
deleted file mode 100644
index 73a1166..0000000
--- a/games/letters1/sounds/p.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/p.ogg b/games/letters1/sounds/p.ogg
new file mode 100644
index 0000000..12097cb
--- /dev/null
+++ b/games/letters1/sounds/p.ogg
diff --git a/games/letters1/sounds/q.aiff b/games/letters1/sounds/q.aiff
deleted file mode 100644
index ebd8b12..0000000
--- a/games/letters1/sounds/q.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/q.ogg b/games/letters1/sounds/q.ogg
new file mode 100644
index 0000000..93bc15b
--- /dev/null
+++ b/games/letters1/sounds/q.ogg
diff --git a/games/letters1/sounds/u.aiff b/games/letters1/sounds/u.aiff
deleted file mode 100644
index 9d5f727..0000000
--- a/games/letters1/sounds/u.aiff
+++ /dev/null
diff --git a/games/letters1/sounds/u.ogg b/games/letters1/sounds/u.ogg
new file mode 100644
index 0000000..b799f1e
--- /dev/null
+++ b/games/letters1/sounds/u.ogg
diff --git a/games/letters2/letters2.mem b/games/letters2/letters2.mem
index 90fe3e1..1b30363 100755
--- a/games/letters2/letters2.mem
+++ b/games/letters2/letters2.mem
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <memorize name="letters2" scoresnd="score.wav" winsnd="win.wav" divided="1" face1="1" face2="2" >
 
- <pair achar="A" asnd="a.aiff" bchar="a" bsnd="a.aiff" />
- <pair achar="E" asnd="e.aiff" bchar="e" bsnd="e.aiff" />
- <pair achar="I" asnd="i.aiff" bchar="i" bsnd="i.aiff" />
- <pair achar="O" asnd="o.aiff" bchar="o" bsnd="o.aiff" />
- <pair achar="U" asnd="u.aiff" bchar="u" bsnd="u.aiff" />
- <pair achar="L" asnd="l.aiff" bchar="l" bsnd="l.aiff" />
- <pair achar="M" asnd="m.aiff" bchar="m" bsnd="m.aiff" />
- <pair achar="N" asnd="n.aiff" bchar="n" bsnd="n.aiff" />
- <pair achar="P" asnd="p.aiff" bchar="p" bsnd="p.aiff" />
- <pair achar="Q" asnd="q.aiff" bchar="q" bsnd="q.aiff" />
- <pair achar="R" asnd="r.aiff" bchar="r" bsnd="r.aiff" />
- <pair achar="S" asnd="s.aiff" bchar="s" bsnd="s.aiff" />
- <pair achar="T" asnd="t.aiff" bchar="t" bsnd="t.aiff" />
- <pair achar="V" asnd="v.aiff" bchar="v" bsnd="v.aiff" />
- <pair achar="W" asnd="w.aiff" bchar="w" bsnd="w.aiff" />
- <pair achar="X" asnd="x.aiff" bchar="x" bsnd="x.aiff" />
- <pair achar="Y" asnd="y.aiff" bchar="y" bsnd="y.aiff" />
- <pair achar="Z" asnd="z.aiff" bchar="z" bsnd="z.aiff" />
+ <pair achar="A" asnd="a.ogg" bchar="a" bsnd="a.ogg" />
+ <pair achar="E" asnd="e.ogg" bchar="e" bsnd="e.ogg" />
+ <pair achar="I" asnd="i.ogg" bchar="i" bsnd="i.ogg" />
+ <pair achar="O" asnd="o.ogg" bchar="o" bsnd="o.ogg" />
+ <pair achar="U" asnd="u.ogg" bchar="u" bsnd="u.ogg" />
+ <pair achar="L" asnd="l.ogg" bchar="l" bsnd="l.ogg" />
+ <pair achar="M" asnd="m.ogg" bchar="m" bsnd="m.ogg" />
+ <pair achar="N" asnd="n.ogg" bchar="n" bsnd="n.ogg" />
+ <pair achar="P" asnd="p.ogg" bchar="p" bsnd="p.ogg" />
+ <pair achar="Q" asnd="q.ogg" bchar="q" bsnd="q.ogg" />
+ <pair achar="R" asnd="r.ogg" bchar="r" bsnd="r.ogg" />
+ <pair achar="S" asnd="s.ogg" bchar="s" bsnd="s.ogg" />
+ <pair achar="T" asnd="t.ogg" bchar="t" bsnd="t.ogg" />
+ <pair achar="V" asnd="v.ogg" bchar="v" bsnd="v.ogg" />
+ <pair achar="W" asnd="w.ogg" bchar="w" bsnd="w.ogg" />
+ <pair achar="X" asnd="x.ogg" bchar="x" bsnd="x.ogg" />
+ <pair achar="Y" asnd="y.ogg" bchar="y" bsnd="y.ogg" />
+ <pair achar="Z" asnd="z.ogg" bchar="z" bsnd="z.ogg" />
 
 </memorize>
diff --git a/games/letters2/sounds/a.aiff b/games/letters2/sounds/a.aiff
deleted file mode 100644
index 6e10ac2..0000000
--- a/games/letters2/sounds/a.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/a.ogg b/games/letters2/sounds/a.ogg
new file mode 100644
index 0000000..ee0e24a
--- /dev/null
+++ b/games/letters2/sounds/a.ogg
diff --git a/games/letters2/sounds/e.aiff b/games/letters2/sounds/e.aiff
deleted file mode 100644
index 98e0922..0000000
--- a/games/letters2/sounds/e.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/e.ogg b/games/letters2/sounds/e.ogg
new file mode 100644
index 0000000..fc88457
--- /dev/null
+++ b/games/letters2/sounds/e.ogg
diff --git a/games/letters2/sounds/i.aiff b/games/letters2/sounds/i.aiff
deleted file mode 100644
index 9ead99c..0000000
--- a/games/letters2/sounds/i.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/i.ogg b/games/letters2/sounds/i.ogg
new file mode 100644
index 0000000..81210a9
--- /dev/null
+++ b/games/letters2/sounds/i.ogg
diff --git a/games/letters2/sounds/l.aiff b/games/letters2/sounds/l.aiff
deleted file mode 100644
index c44ed32..0000000
--- a/games/letters2/sounds/l.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/l.ogg b/games/letters2/sounds/l.ogg
new file mode 100644
index 0000000..0b502b3
--- /dev/null
+++ b/games/letters2/sounds/l.ogg
diff --git a/games/letters2/sounds/m.aiff b/games/letters2/sounds/m.aiff
deleted file mode 100644
index 4fe3670..0000000
--- a/games/letters2/sounds/m.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/m.ogg b/games/letters2/sounds/m.ogg
new file mode 100644
index 0000000..4d334b7
--- /dev/null
+++ b/games/letters2/sounds/m.ogg
diff --git a/games/letters2/sounds/n.aiff b/games/letters2/sounds/n.aiff
deleted file mode 100644
index 9991bbd..0000000
--- a/games/letters2/sounds/n.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/n.ogg b/games/letters2/sounds/n.ogg
new file mode 100644
index 0000000..93fbde8
--- /dev/null
+++ b/games/letters2/sounds/n.ogg
diff --git a/games/letters2/sounds/o.aiff b/games/letters2/sounds/o.aiff
deleted file mode 100644
index f230102..0000000
--- a/games/letters2/sounds/o.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/o.ogg b/games/letters2/sounds/o.ogg
new file mode 100644
index 0000000..5450fce
--- /dev/null
+++ b/games/letters2/sounds/o.ogg
diff --git a/games/letters2/sounds/p.aiff b/games/letters2/sounds/p.aiff
deleted file mode 100644
index 73a1166..0000000
--- a/games/letters2/sounds/p.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/p.ogg b/games/letters2/sounds/p.ogg
new file mode 100644
index 0000000..280dea3
--- /dev/null
+++ b/games/letters2/sounds/p.ogg
diff --git a/games/letters2/sounds/q.aiff b/games/letters2/sounds/q.aiff
deleted file mode 100644
index ebd8b12..0000000
--- a/games/letters2/sounds/q.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/q.ogg b/games/letters2/sounds/q.ogg
new file mode 100644
index 0000000..d62c148
--- /dev/null
+++ b/games/letters2/sounds/q.ogg
diff --git a/games/letters2/sounds/r.aiff b/games/letters2/sounds/r.aiff
deleted file mode 100644
index c1e0286..0000000
--- a/games/letters2/sounds/r.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/r.ogg b/games/letters2/sounds/r.ogg
new file mode 100644
index 0000000..aebaf02
--- /dev/null
+++ b/games/letters2/sounds/r.ogg
diff --git a/games/letters2/sounds/s.aiff b/games/letters2/sounds/s.aiff
deleted file mode 100644
index dcd6d85..0000000
--- a/games/letters2/sounds/s.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/s.ogg b/games/letters2/sounds/s.ogg
new file mode 100644
index 0000000..af5288a
--- /dev/null
+++ b/games/letters2/sounds/s.ogg
diff --git a/games/letters2/sounds/t.aiff b/games/letters2/sounds/t.aiff
deleted file mode 100644
index 5d5f060..0000000
--- a/games/letters2/sounds/t.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/t.ogg b/games/letters2/sounds/t.ogg
new file mode 100644
index 0000000..acf8530
--- /dev/null
+++ b/games/letters2/sounds/t.ogg
diff --git a/games/letters2/sounds/u.aiff b/games/letters2/sounds/u.aiff
deleted file mode 100644
index 9d5f727..0000000
--- a/games/letters2/sounds/u.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/u.ogg b/games/letters2/sounds/u.ogg
new file mode 100644
index 0000000..f577e0e
--- /dev/null
+++ b/games/letters2/sounds/u.ogg
diff --git a/games/letters2/sounds/v.aiff b/games/letters2/sounds/v.aiff
deleted file mode 100644
index 8c45b18..0000000
--- a/games/letters2/sounds/v.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/v.ogg b/games/letters2/sounds/v.ogg
new file mode 100644
index 0000000..7490413
--- /dev/null
+++ b/games/letters2/sounds/v.ogg
diff --git a/games/letters2/sounds/w.aiff b/games/letters2/sounds/w.aiff
deleted file mode 100644
index c5e1a5b..0000000
--- a/games/letters2/sounds/w.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/w.ogg b/games/letters2/sounds/w.ogg
new file mode 100644
index 0000000..36378ab
--- /dev/null
+++ b/games/letters2/sounds/w.ogg
diff --git a/games/letters2/sounds/x.aiff b/games/letters2/sounds/x.aiff
deleted file mode 100644
index 6435f60..0000000
--- a/games/letters2/sounds/x.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/x.ogg b/games/letters2/sounds/x.ogg
new file mode 100644
index 0000000..4b5102a
--- /dev/null
+++ b/games/letters2/sounds/x.ogg
diff --git a/games/letters2/sounds/y.aiff b/games/letters2/sounds/y.aiff
deleted file mode 100644
index 84e4f28..0000000
--- a/games/letters2/sounds/y.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/y.ogg b/games/letters2/sounds/y.ogg
new file mode 100644
index 0000000..16eb829
--- /dev/null
+++ b/games/letters2/sounds/y.ogg
diff --git a/games/letters2/sounds/z.aiff b/games/letters2/sounds/z.aiff
deleted file mode 100644
index f22df02..0000000
--- a/games/letters2/sounds/z.aiff
+++ /dev/null
diff --git a/games/letters2/sounds/z.ogg b/games/letters2/sounds/z.ogg
new file mode 100644
index 0000000..467ab6b
--- /dev/null
+++ b/games/letters2/sounds/z.ogg
diff --git a/games/numbers/numbers.mem b/games/numbers/numbers.mem
index 9dca873..a5bb2f6 100755
--- a/games/numbers/numbers.mem
+++ b/games/numbers/numbers.mem
@@ -1,45 +1,21 @@
 <?xml version="1.0"?>
 <memorize name="numbers" scoresnd="score.wav" winsnd="win.wav" divided="1" face1="1" face2="2" >
 
- <pair achar="1" asnd="01.aiff" bimg="01x.jpg" bsnd="01.aiff" />
- <pair achar="2" asnd="02.aiff" bimg="02x.jpg" bsnd="02.aiff" />
- <pair achar="3" asnd="03.aiff" bimg="03x.jpg" bsnd="03.aiff" />
- <pair achar="4" asnd="04.aiff" bimg="04x.jpg" bsnd="04.aiff" />
- <pair achar="5" asnd="05.aiff" bimg="05x.jpg" bsnd="05.aiff" />
- <pair achar="6" asnd="06.aiff" bimg="06x.jpg" bsnd="06.aiff" />
- <pair achar="7" asnd="07.aiff" bimg="07x.jpg" bsnd="07.aiff" />
- <pair achar="8" asnd="08.aiff" bimg="08x.jpg" bsnd="08.aiff" />
- <pair achar="9" asnd="09.aiff" bimg="09x.jpg" bsnd="09.aiff" />
- <pair achar="10" asnd="10.aiff" bimg="10x.jpg" bsnd="10.aiff" />
- <pair achar="11" asnd="11.aiff" bimg="11x.jpg" bsnd="11.aiff" />
- <pair achar="12" asnd="12.aiff" bimg="12x.jpg" bsnd="12.aiff" />
- <pair achar="13" asnd="13.aiff" bimg="13x.jpg" bsnd="13.aiff" />
- <pair achar="14" asnd="14.aiff" bimg="14x.jpg" bsnd="14.aiff" />
- <pair achar="15" asnd="15.aiff" bimg="15x.jpg" bsnd="15.aiff" />
+ <pair achar="1" asnd="01.ogg" bimg="01x.jpg" bsnd="01.ogg" />
+ <pair achar="2" asnd="02.ogg" bimg="02x.jpg" bsnd="02.ogg" />
+ <pair achar="3" asnd="03.ogg" bimg="03x.jpg" bsnd="03.ogg" />
+ <pair achar="4" asnd="04.ogg" bimg="04x.jpg" bsnd="04.ogg" />
+ <pair achar="5" asnd="05.ogg" bimg="05x.jpg" bsnd="05.ogg" />
+ <pair achar="6" asnd="06.ogg" bimg="06x.jpg" bsnd="06.ogg" />
+ <pair achar="7" asnd="07.ogg" bimg="07x.jpg" bsnd="07.ogg" />
+ <pair achar="8" asnd="08.ogg" bimg="08x.jpg" bsnd="08.ogg" />
+ <pair achar="9" asnd="09.ogg" bimg="09x.jpg" bsnd="09.ogg" />
+ <pair achar="10" asnd="10.ogg" bimg="10x.jpg" bsnd="10.ogg" />
+ <pair achar="11" asnd="11.ogg" bimg="11x.jpg" bsnd="11.ogg" />
+ <pair achar="12" asnd="12.ogg" bimg="12x.jpg" bsnd="12.ogg" />
+ <pair achar="13" asnd="13.ogg" bimg="13x.jpg" bsnd="13.ogg" />
+ <pair achar="14" asnd="14.ogg" bimg="14x.jpg" bsnd="14.ogg" />
+ <pair achar="15" asnd="15.ogg" bimg="15x.jpg" bsnd="15.ogg" />
 
 </memorize>
 
-<!--
-game_name=numbers
-score_sound=score.wav
-win_sound=score.wav
-divided=True
-face1=1
-face2=2
-# Cards
-1,,01.wav,1,,,,,2,01x.jpg,01.wav,,,,,
-1,,02.wav,2,,,,,2,02x.jpg,02.wav,,,,,
-1,,03.wav,3,,,,,2,03x.jpg,03.wav,,,,,
-1,,04.wav,4,,,,,2,04x.jpg,04.wav,,,,,
-1,,05.wav,5,,,,,2,05x.jpg,05.wav,,,,,
-1,,06.wav,6,,,,,2,06x.jpg,06.wav,,,,,
-1,,07.wav,7,,,,,2,07x.jpg,07.wav,,,,,
-1,,08.wav,8,,,,,2,08x.jpg,08.wav,,,,,
-1,,09.wav,9,,,,,2,09x.jpg,09.wav,,,,,
-1,,10.wav,10,,,,,2,10x.jpg,10.wav,,,,,
-1,,11.wav,11,,,,,2,11x.jpg,11.wav,,,,,
-1,,12.wav,12,,,,,2,12x.jpg,12.wav,,,,,
-1,,13.wav,13,,,,,2,13x.jpg,13.wav,,,,,
-1,,14.wav,14,,,,,2,14x.jpg,14.wav,,,,,
-1,,15.wav,15,,,,,2,15x.jpg,15.wav,,,,,
--->
diff --git a/games/numbers/sounds/01.aiff b/games/numbers/sounds/01.aiff
deleted file mode 100644
index 7ad64c8..0000000
--- a/games/numbers/sounds/01.aiff
+++ /dev/null
diff --git a/games/numbers/sounds/01.ogg b/games/numbers/sounds/01.ogg
new file mode 100644
index 0000000..783d287
--- /dev/null
+++ b/games/numbers/sounds/01.ogg
diff --git a/games/numbers/sounds/02.aiff b/games/numbers/sounds/02.aiff
deleted file mode 100644
index 3cd0671..0000000
--- a/games/numbers/sounds/02.aiff
+++ /dev/null
diff --git a/games/numbers/sounds/02.ogg b/games/numbers/sounds/02.ogg
new file mode 100644
index 0000000..d32f81a
--- /dev/null
+++ b/games/numbers/sounds/02.ogg
diff --git a/games/numbers/sounds/03.aiff b/games/numbers/sounds/03.aiff
deleted file mode 100644
index 21ac56b..0000000
--- a/games/numbers/sounds/03.aiff
+++ /dev/null
diff --git a/games/numbers/sounds/03.ogg b/games/numbers/sounds/03.ogg
new file mode 100644
index 0000000..fc4fe5c
--- /dev/null
+++ b/games/numbers/sounds/03.ogg
diff --git a/games/numbers/sounds/04.aiff b/games/numbers/sounds/04.aiff
deleted file mode 100644
index 060c191..0000000
--- a/games/numbers/sounds/04.aiff
+++ /dev/null
diff --git a/games/numbers/sounds/04.ogg b/games/numbers/sounds/04.ogg
new file mode 100644
index 0000000..9fdf52d
--- /dev/null
+++ b/games/numbers/sounds/04.ogg
diff --git a/games/numbers/sounds/05.aiff b/games/numbers/sounds/05.aiff
deleted file mode 100644
index 04c6911..0000000
--- a/games/numbers/sounds/05.aiff
+++ /dev/null
diff --git a/games/numbers/sounds/05.ogg b/games/numbers/sounds/05.ogg
new file mode 100644
index 0000000..a9cc4e6
--- /dev/null
+++ b/games/numbers/sounds/05.ogg
diff --git a/games/numbers/sounds/06.aiff b/games/numbers/sounds/06.aiff
deleted file mode 100644
index be5a88e..0000000
--- a/games/numbers/sounds/06.aiff
+++ /dev/null
diff --git a/games/numbers/sounds/06.ogg b/games/numbers/sounds/06.ogg
new file mode 100644
index 0000000..0b80f30
--- /dev/null
+++ b/games/numbers/sounds/06.ogg
diff --git a/games/numbers/sounds/07.aiff b/games/numbers/sounds/07.aiff
deleted file mode 100644
index e026fab..0000000
--- a/games/numbers/sounds/07.aiff
+++ /dev/null
diff --git a/games/numbers/sounds/07.ogg b/games/numbers/sounds/07.ogg
new file mode 100644
index 0000000..0335322
--- /dev/null
+++ b/games/numbers/sounds/07.ogg
diff --git a/games/numbers/sounds/08.aiff b/games/numbers/sounds/08.aiff
deleted file mode 100644
index e09fe23..0000000
--- a/games/numbers/sounds/08.aiff
+++ /dev/null
diff --git a/games/numbers/sounds/08.ogg b/games/numbers/sounds/08.ogg
new file mode 100644
index 0000000..57b6e6f
--- /dev/null
+++ b/games/numbers/sounds/08.ogg
diff --git a/games/numbers/sounds/09.aiff b/games/numbers/sounds/09.aiff
deleted file mode 100644
index 4e4189b..0000000
--- a/games/numbers/sounds/09.aiff
+++ /dev/null
diff --git a/games/numbers/sounds/09.ogg b/games/numbers/sounds/09.ogg
new file mode 100644
index 0000000..9a6d38f
--- /dev/null
+++ b/games/numbers/sounds/09.ogg
diff --git a/games/numbers/sounds/10.aiff b/games/numbers/sounds/10.aiff
deleted file mode 100644
index 4fc208f..0000000
--- a/games/numbers/sounds/10.aiff
+++ /dev/null
diff --git a/games/numbers/sounds/10.ogg b/games/numbers/sounds/10.ogg
new file mode 100644
index 0000000..90f1ee9
--- /dev/null
+++ b/games/numbers/sounds/10.ogg
diff --git a/games/numbers/sounds/11.aiff b/games/numbers/sounds/11.aiff
deleted file mode 100644
index bb8f756..0000000
--- a/games/numbers/sounds/11.aiff
+++ /dev/null
diff --git a/games/numbers/sounds/11.ogg b/games/numbers/sounds/11.ogg
new file mode 100644
index 0000000..6831912
--- /dev/null
+++ b/games/numbers/sounds/11.ogg
diff --git a/games/numbers/sounds/12.aiff b/games/numbers/sounds/12.aiff
deleted file mode 100644
index 8d116c1..0000000
--- a/games/numbers/sounds/12.aiff
+++ /dev/null
diff --git a/games/numbers/sounds/12.ogg b/games/numbers/sounds/12.ogg
new file mode 100644
index 0000000..9c40acc
--- /dev/null
+++ b/games/numbers/sounds/12.ogg
diff --git a/games/numbers/sounds/13.aiff b/games/numbers/sounds/13.aiff
deleted file mode 100644
index fd05a3c..0000000
--- a/games/numbers/sounds/13.aiff
+++ /dev/null
diff --git a/games/numbers/sounds/13.ogg b/games/numbers/sounds/13.ogg
new file mode 100644
index 0000000..d6631ff
--- /dev/null
+++ b/games/numbers/sounds/13.ogg
diff --git a/games/numbers/sounds/14.aiff b/games/numbers/sounds/14.aiff
deleted file mode 100644
index dfbbd00..0000000
--- a/games/numbers/sounds/14.aiff
+++ /dev/null
diff --git a/games/numbers/sounds/14.ogg b/games/numbers/sounds/14.ogg
new file mode 100644
index 0000000..d04ea09
--- /dev/null
+++ b/games/numbers/sounds/14.ogg
diff --git a/games/numbers/sounds/15.aiff b/games/numbers/sounds/15.aiff
deleted file mode 100644
index d159c22..0000000
--- a/games/numbers/sounds/15.aiff
+++ /dev/null
diff --git a/games/numbers/sounds/15.ogg b/games/numbers/sounds/15.ogg
new file mode 100644
index 0000000..7527b4b
--- /dev/null
+++ b/games/numbers/sounds/15.ogg
diff --git a/games/phonemes/phonemes.mem b/games/phonemes/phonemes.mem
index 3511a59..689edcb 100755
--- a/games/phonemes/phonemes.mem
+++ b/games/phonemes/phonemes.mem
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <memorize name="phonemes" scoresnd="score.wav" winsnd="win.wav" divided="1" face1="1" face2="2" >
 
- <pair aimg="agua1.jpg" asnd="agua1.aiff" bimg="agua2.jpg" bsnd="agua2.aiff" />
- <pair aimg="bola1.jpg" asnd="bola1.aiff" bimg="bola2.jpg" bsnd="bola2.aiff" />
- <pair aimg="casa1.jpg" asnd="casa1.aiff" bimg="casa2.jpg" bsnd="casa2.aiff" />
- <pair aimg="ema1.jpg" asnd="ema1.aiff" bimg="ema2.jpg" bsnd="ema2.aiff" />
- <pair aimg="frutas1.jpg" asnd="frutas1.aiff" bimg="frutas2.jpg" bsnd="frutas2.aiff" />
- <pair aimg="homem1.jpg" asnd="homem1.aiff" bimg="homem2.jpg" bsnd="homem2.aiff" />
- <pair aimg="ioio1.jpg" asnd="ioio1.aiff" bimg="ioio2.jpg" bsnd="ioio2.aiff" />
- <pair aimg="kiwi1.jpg" asnd="kiwi1.aiff" bimg="kiwi2.jpg" bsnd="kiwi2.aiff" />
- <pair aimg="ovo1.jpg" asnd="ovo1.aiff" bimg="ovo2.jpg" bsnd="ovo2.aiff" />
- <pair aimg="peixe1.jpg" asnd="peixe1.aiff" bimg="peixe2.jpg" bsnd="peixe2.aiff" />
- <pair aimg="queijo1.jpg" asnd="queijo1.aiff" bimg="queijo2.jpg" bsnd="queijo2.aiff" />
- <pair aimg="roda1.jpg" asnd="roda1.aiff" bimg="roda2.jpg" bsnd="roda2.aiff" />
- <pair aimg="sapo1.jpg" asnd="sapo1.aiff" bimg="sapo2.jpg" bsnd="sapo2.aiff" />
- <pair aimg="uva1.jpg" asnd="uva1.aiff" bimg="uva2.jpg" bsnd="uva2.aiff" />
- <pair aimg="zebra1.jpg" asnd="zebra1.aiff" bimg="zebra2.jpg" bsnd="zebra2.aiff" />
+ <pair aimg="agua1.jpg" asnd="agua1.ogg" bimg="agua2.jpg" bsnd="agua2.ogg" />
+ <pair aimg="bola1.jpg" asnd="bola1.ogg" bimg="bola2.jpg" bsnd="bola2.ogg" />
+ <pair aimg="casa1.jpg" asnd="casa1.ogg" bimg="casa2.jpg" bsnd="casa2.ogg" />
+ <pair aimg="ema1.jpg" asnd="ema1.ogg" bimg="ema2.jpg" bsnd="ema2.ogg" />
+ <pair aimg="frutas1.jpg" asnd="frutas1.ogg" bimg="frutas2.jpg" bsnd="frutas2.ogg" />
+ <pair aimg="homem1.jpg" asnd="homem1.ogg" bimg="homem2.jpg" bsnd="homem2.ogg" />
+ <pair aimg="ioio1.jpg" asnd="ioio1.ogg" bimg="ioio2.jpg" bsnd="ioio2.ogg" />
+ <pair aimg="kiwi1.jpg" asnd="kiwi1.ogg" bimg="kiwi2.jpg" bsnd="kiwi2.ogg" />
+ <pair aimg="ovo1.jpg" asnd="ovo1.ogg" bimg="ovo2.jpg" bsnd="ovo2.ogg" />
+ <pair aimg="peixe1.jpg" asnd="peixe1.ogg" bimg="peixe2.jpg" bsnd="peixe2.ogg" />
+ <pair aimg="queijo1.jpg" asnd="queijo1.ogg" bimg="queijo2.jpg" bsnd="queijo2.ogg" />
+ <pair aimg="roda1.jpg" asnd="roda1.ogg" bimg="roda2.jpg" bsnd="roda2.ogg" />
+ <pair aimg="sapo1.jpg" asnd="sapo1.ogg" bimg="sapo2.jpg" bsnd="sapo2.ogg" />
+ <pair aimg="uva1.jpg" asnd="uva1.ogg" bimg="uva2.jpg" bsnd="uva2.ogg" />
+ <pair aimg="zebra1.jpg" asnd="zebra1.ogg" bimg="zebra2.jpg" bsnd="zebra2.ogg" />
 
 </memorize>
 
diff --git a/games/phonemes/sounds/agua1.aiff b/games/phonemes/sounds/agua1.aiff
deleted file mode 100644
index d4280d9..0000000
--- a/games/phonemes/sounds/agua1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/agua1.ogg b/games/phonemes/sounds/agua1.ogg
new file mode 100644
index 0000000..f9f73f1
--- /dev/null
+++ b/games/phonemes/sounds/agua1.ogg
diff --git a/games/phonemes/sounds/agua2.aiff b/games/phonemes/sounds/agua2.aiff
deleted file mode 100644
index 5f94070..0000000
--- a/games/phonemes/sounds/agua2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/agua2.ogg b/games/phonemes/sounds/agua2.ogg
new file mode 100644
index 0000000..a64f926
--- /dev/null
+++ b/games/phonemes/sounds/agua2.ogg
diff --git a/games/phonemes/sounds/bola1.aiff b/games/phonemes/sounds/bola1.aiff
deleted file mode 100644
index 5ca426b..0000000
--- a/games/phonemes/sounds/bola1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/bola1.ogg b/games/phonemes/sounds/bola1.ogg
new file mode 100644
index 0000000..f235d54
--- /dev/null
+++ b/games/phonemes/sounds/bola1.ogg
diff --git a/games/phonemes/sounds/bola2.aiff b/games/phonemes/sounds/bola2.aiff
deleted file mode 100644
index 07d7a16..0000000
--- a/games/phonemes/sounds/bola2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/bola2.ogg b/games/phonemes/sounds/bola2.ogg
new file mode 100644
index 0000000..390cf3e
--- /dev/null
+++ b/games/phonemes/sounds/bola2.ogg
diff --git a/games/phonemes/sounds/cama1.aiff b/games/phonemes/sounds/cama1.aiff
deleted file mode 100644
index fa3f7b1..0000000
--- a/games/phonemes/sounds/cama1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/cama1.ogg b/games/phonemes/sounds/cama1.ogg
new file mode 100644
index 0000000..cfce707
--- /dev/null
+++ b/games/phonemes/sounds/cama1.ogg
diff --git a/games/phonemes/sounds/cama2.aiff b/games/phonemes/sounds/cama2.aiff
deleted file mode 100644
index 100c02f..0000000
--- a/games/phonemes/sounds/cama2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/cama2.ogg b/games/phonemes/sounds/cama2.ogg
new file mode 100644
index 0000000..26e7bef
--- /dev/null
+++ b/games/phonemes/sounds/cama2.ogg
diff --git a/games/phonemes/sounds/casa1.aiff b/games/phonemes/sounds/casa1.aiff
deleted file mode 100644
index 7e4cbf4..0000000
--- a/games/phonemes/sounds/casa1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/casa1.ogg b/games/phonemes/sounds/casa1.ogg
new file mode 100644
index 0000000..1f448ef
--- /dev/null
+++ b/games/phonemes/sounds/casa1.ogg
diff --git a/games/phonemes/sounds/casa2.aiff b/games/phonemes/sounds/casa2.aiff
deleted file mode 100644
index 586158b..0000000
--- a/games/phonemes/sounds/casa2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/casa2.ogg b/games/phonemes/sounds/casa2.ogg
new file mode 100644
index 0000000..158588b
--- /dev/null
+++ b/games/phonemes/sounds/casa2.ogg
diff --git a/games/phonemes/sounds/ema1.aiff b/games/phonemes/sounds/ema1.aiff
deleted file mode 100644
index 287c529..0000000
--- a/games/phonemes/sounds/ema1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/ema1.ogg b/games/phonemes/sounds/ema1.ogg
new file mode 100644
index 0000000..27c4b1f
--- /dev/null
+++ b/games/phonemes/sounds/ema1.ogg
diff --git a/games/phonemes/sounds/ema2.aiff b/games/phonemes/sounds/ema2.aiff
deleted file mode 100644
index 5637c36..0000000
--- a/games/phonemes/sounds/ema2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/ema2.ogg b/games/phonemes/sounds/ema2.ogg
new file mode 100644
index 0000000..45ca492
--- /dev/null
+++ b/games/phonemes/sounds/ema2.ogg
diff --git a/games/phonemes/sounds/frutas1.aiff b/games/phonemes/sounds/frutas1.aiff
deleted file mode 100644
index 036d27b..0000000
--- a/games/phonemes/sounds/frutas1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/frutas1.ogg b/games/phonemes/sounds/frutas1.ogg
new file mode 100644
index 0000000..c91b58e
--- /dev/null
+++ b/games/phonemes/sounds/frutas1.ogg
diff --git a/games/phonemes/sounds/frutas2.aiff b/games/phonemes/sounds/frutas2.aiff
deleted file mode 100644
index f4571cb..0000000
--- a/games/phonemes/sounds/frutas2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/frutas2.ogg b/games/phonemes/sounds/frutas2.ogg
new file mode 100644
index 0000000..594fcc0
--- /dev/null
+++ b/games/phonemes/sounds/frutas2.ogg
diff --git a/games/phonemes/sounds/homem1.aiff b/games/phonemes/sounds/homem1.aiff
deleted file mode 100644
index f6b8be6..0000000
--- a/games/phonemes/sounds/homem1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/homem1.ogg b/games/phonemes/sounds/homem1.ogg
new file mode 100644
index 0000000..72da68d
--- /dev/null
+++ b/games/phonemes/sounds/homem1.ogg
diff --git a/games/phonemes/sounds/homem2.aiff b/games/phonemes/sounds/homem2.aiff
deleted file mode 100644
index 403b0f4..0000000
--- a/games/phonemes/sounds/homem2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/homem2.ogg b/games/phonemes/sounds/homem2.ogg
new file mode 100644
index 0000000..996ad95
--- /dev/null
+++ b/games/phonemes/sounds/homem2.ogg
diff --git a/games/phonemes/sounds/ioio1.aiff b/games/phonemes/sounds/ioio1.aiff
deleted file mode 100644
index 8579cf1..0000000
--- a/games/phonemes/sounds/ioio1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/ioio1.ogg b/games/phonemes/sounds/ioio1.ogg
new file mode 100644
index 0000000..e63a921
--- /dev/null
+++ b/games/phonemes/sounds/ioio1.ogg
diff --git a/games/phonemes/sounds/ioio2.aiff b/games/phonemes/sounds/ioio2.aiff
deleted file mode 100644
index 4c4c6cd..0000000
--- a/games/phonemes/sounds/ioio2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/ioio2.ogg b/games/phonemes/sounds/ioio2.ogg
new file mode 100644
index 0000000..5ae5f70
--- /dev/null
+++ b/games/phonemes/sounds/ioio2.ogg
diff --git a/games/phonemes/sounds/kiwi1.aiff b/games/phonemes/sounds/kiwi1.aiff
deleted file mode 100644
index cb82884..0000000
--- a/games/phonemes/sounds/kiwi1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/kiwi1.ogg b/games/phonemes/sounds/kiwi1.ogg
new file mode 100644
index 0000000..f8b9c4f
--- /dev/null
+++ b/games/phonemes/sounds/kiwi1.ogg
diff --git a/games/phonemes/sounds/kiwi2.aiff b/games/phonemes/sounds/kiwi2.aiff
deleted file mode 100644
index 9eb22f8..0000000
--- a/games/phonemes/sounds/kiwi2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/kiwi2.ogg b/games/phonemes/sounds/kiwi2.ogg
new file mode 100644
index 0000000..346463d
--- /dev/null
+++ b/games/phonemes/sounds/kiwi2.ogg
diff --git a/games/phonemes/sounds/ovo1.aiff b/games/phonemes/sounds/ovo1.aiff
deleted file mode 100644
index 9ab0c2f..0000000
--- a/games/phonemes/sounds/ovo1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/ovo1.ogg b/games/phonemes/sounds/ovo1.ogg
new file mode 100644
index 0000000..9039367
--- /dev/null
+++ b/games/phonemes/sounds/ovo1.ogg
diff --git a/games/phonemes/sounds/ovo2.aiff b/games/phonemes/sounds/ovo2.aiff
deleted file mode 100644
index 997f426..0000000
--- a/games/phonemes/sounds/ovo2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/ovo2.ogg b/games/phonemes/sounds/ovo2.ogg
new file mode 100644
index 0000000..211ebe8
--- /dev/null
+++ b/games/phonemes/sounds/ovo2.ogg
diff --git a/games/phonemes/sounds/peixe1.aiff b/games/phonemes/sounds/peixe1.aiff
deleted file mode 100644
index c59d9eb..0000000
--- a/games/phonemes/sounds/peixe1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/peixe1.ogg b/games/phonemes/sounds/peixe1.ogg
new file mode 100644
index 0000000..7db7e51
--- /dev/null
+++ b/games/phonemes/sounds/peixe1.ogg
diff --git a/games/phonemes/sounds/peixe2.aiff b/games/phonemes/sounds/peixe2.aiff
deleted file mode 100644
index 47834be..0000000
--- a/games/phonemes/sounds/peixe2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/peixe2.ogg b/games/phonemes/sounds/peixe2.ogg
new file mode 100644
index 0000000..84e97ae
--- /dev/null
+++ b/games/phonemes/sounds/peixe2.ogg
diff --git a/games/phonemes/sounds/queijo1.aiff b/games/phonemes/sounds/queijo1.aiff
deleted file mode 100644
index 27f7a59..0000000
--- a/games/phonemes/sounds/queijo1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/queijo1.ogg b/games/phonemes/sounds/queijo1.ogg
new file mode 100644
index 0000000..75b6766
--- /dev/null
+++ b/games/phonemes/sounds/queijo1.ogg
diff --git a/games/phonemes/sounds/queijo2.aiff b/games/phonemes/sounds/queijo2.aiff
deleted file mode 100644
index 3ad11d5..0000000
--- a/games/phonemes/sounds/queijo2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/queijo2.ogg b/games/phonemes/sounds/queijo2.ogg
new file mode 100644
index 0000000..3602724
--- /dev/null
+++ b/games/phonemes/sounds/queijo2.ogg
diff --git a/games/phonemes/sounds/roda1.aiff b/games/phonemes/sounds/roda1.aiff
deleted file mode 100644
index 28f29ab..0000000
--- a/games/phonemes/sounds/roda1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/roda1.ogg b/games/phonemes/sounds/roda1.ogg
new file mode 100644
index 0000000..54102b7
--- /dev/null
+++ b/games/phonemes/sounds/roda1.ogg
diff --git a/games/phonemes/sounds/roda2.aiff b/games/phonemes/sounds/roda2.aiff
deleted file mode 100644
index b0701b9..0000000
--- a/games/phonemes/sounds/roda2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/roda2.ogg b/games/phonemes/sounds/roda2.ogg
new file mode 100644
index 0000000..bdccabf
--- /dev/null
+++ b/games/phonemes/sounds/roda2.ogg
diff --git a/games/phonemes/sounds/sapo1.aiff b/games/phonemes/sounds/sapo1.aiff
deleted file mode 100644
index aca95d0..0000000
--- a/games/phonemes/sounds/sapo1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/sapo1.ogg b/games/phonemes/sounds/sapo1.ogg
new file mode 100644
index 0000000..a3579cb
--- /dev/null
+++ b/games/phonemes/sounds/sapo1.ogg
diff --git a/games/phonemes/sounds/sapo2.aiff b/games/phonemes/sounds/sapo2.aiff
deleted file mode 100644
index f2a078a..0000000
--- a/games/phonemes/sounds/sapo2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/sapo2.ogg b/games/phonemes/sounds/sapo2.ogg
new file mode 100644
index 0000000..743d67d
--- /dev/null
+++ b/games/phonemes/sounds/sapo2.ogg
diff --git a/games/phonemes/sounds/uva1.aiff b/games/phonemes/sounds/uva1.aiff
deleted file mode 100644
index c75e339..0000000
--- a/games/phonemes/sounds/uva1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/uva1.ogg b/games/phonemes/sounds/uva1.ogg
new file mode 100644
index 0000000..3863700
--- /dev/null
+++ b/games/phonemes/sounds/uva1.ogg
diff --git a/games/phonemes/sounds/uva2.aiff b/games/phonemes/sounds/uva2.aiff
deleted file mode 100644
index d6b7ac7..0000000
--- a/games/phonemes/sounds/uva2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/uva2.ogg b/games/phonemes/sounds/uva2.ogg
new file mode 100644
index 0000000..1e12c1c
--- /dev/null
+++ b/games/phonemes/sounds/uva2.ogg
diff --git a/games/phonemes/sounds/zebra1.aiff b/games/phonemes/sounds/zebra1.aiff
deleted file mode 100644
index 4f94ef4..0000000
--- a/games/phonemes/sounds/zebra1.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/zebra1.ogg b/games/phonemes/sounds/zebra1.ogg
new file mode 100644
index 0000000..9426ad8
--- /dev/null
+++ b/games/phonemes/sounds/zebra1.ogg
diff --git a/games/phonemes/sounds/zebra2.aiff b/games/phonemes/sounds/zebra2.aiff
deleted file mode 100644
index fa88c95..0000000
--- a/games/phonemes/sounds/zebra2.aiff
+++ /dev/null
diff --git a/games/phonemes/sounds/zebra2.ogg b/games/phonemes/sounds/zebra2.ogg
new file mode 100644
index 0000000..314990b
--- /dev/null
+++ b/games/phonemes/sounds/zebra2.ogg
diff --git a/images/black80.jpg b/images/black80.jpg
deleted file mode 100644
index 80339ed..0000000
--- a/images/black80.jpg
+++ /dev/null
diff --git a/images/player1_0.jpg b/images/player1_0.jpg
deleted file mode 100644
index dba9eea..0000000
--- a/images/player1_0.jpg
+++ /dev/null
diff --git a/images/player1_0b.jpg b/images/player1_0b.jpg
deleted file mode 100644
index c45e373..0000000
--- a/images/player1_0b.jpg
+++ /dev/null
diff --git a/images/player1_1.jpg b/images/player1_1.jpg
deleted file mode 100644
index e0dc86a..0000000
--- a/images/player1_1.jpg
+++ /dev/null
diff --git a/images/player1_10.jpg b/images/player1_10.jpg
deleted file mode 100644
index 4343898..0000000
--- a/images/player1_10.jpg
+++ /dev/null
diff --git a/images/player1_10_b.jpg b/images/player1_10_b.jpg
deleted file mode 100644
index a020954..0000000
--- a/images/player1_10_b.jpg
+++ /dev/null
diff --git a/images/player1_11.jpg b/images/player1_11.jpg
deleted file mode 100644
index df5b42e..0000000
--- a/images/player1_11.jpg
+++ /dev/null
diff --git a/images/player1_11b.jpg b/images/player1_11b.jpg
deleted file mode 100644
index cfe3735..0000000
--- a/images/player1_11b.jpg
+++ /dev/null
diff --git a/images/player1_12.jpg b/images/player1_12.jpg
deleted file mode 100644
index ad91a1d..0000000
--- a/images/player1_12.jpg
+++ /dev/null
diff --git a/images/player1_12b.jpg b/images/player1_12b.jpg
deleted file mode 100644
index 8ff81c1..0000000
--- a/images/player1_12b.jpg
+++ /dev/null
diff --git a/images/player1_13.jpg b/images/player1_13.jpg
deleted file mode 100644
index 835f9cd..0000000
--- a/images/player1_13.jpg
+++ /dev/null
diff --git a/images/player1_13b.jpg b/images/player1_13b.jpg
deleted file mode 100644
index 3748a93..0000000
--- a/images/player1_13b.jpg
+++ /dev/null
diff --git a/images/player1_14.jpg b/images/player1_14.jpg
deleted file mode 100644
index 8328b47..0000000
--- a/images/player1_14.jpg
+++ /dev/null
diff --git a/images/player1_14b.jpg b/images/player1_14b.jpg
deleted file mode 100644
index 0c1ca80..0000000
--- a/images/player1_14b.jpg
+++ /dev/null
diff --git a/images/player1_15.jpg b/images/player1_15.jpg
deleted file mode 100644
index 26d91d0..0000000
--- a/images/player1_15.jpg
+++ /dev/null
diff --git a/images/player1_15b.jpg b/images/player1_15b.jpg
deleted file mode 100644
index ca7bf4e..0000000
--- a/images/player1_15b.jpg
+++ /dev/null
diff --git a/images/player1_16.jpg b/images/player1_16.jpg
deleted file mode 100644
index f751723..0000000
--- a/images/player1_16.jpg
+++ /dev/null
diff --git a/images/player1_16b.jpg b/images/player1_16b.jpg
deleted file mode 100644
index 03e8042..0000000
--- a/images/player1_16b.jpg
+++ /dev/null
diff --git a/images/player1_17.jpg b/images/player1_17.jpg
deleted file mode 100644
index f8a56bc..0000000
--- a/images/player1_17.jpg
+++ /dev/null
diff --git a/images/player1_17b.jpg b/images/player1_17b.jpg
deleted file mode 100644
index a663f81..0000000
--- a/images/player1_17b.jpg
+++ /dev/null
diff --git a/images/player1_18.jpg b/images/player1_18.jpg
deleted file mode 100644
index 9e97e98..0000000
--- a/images/player1_18.jpg
+++ /dev/null
diff --git a/images/player1_18b.jpg b/images/player1_18b.jpg
deleted file mode 100644
index c36b23d..0000000
--- a/images/player1_18b.jpg
+++ /dev/null
diff --git a/images/player1_1b.jpg b/images/player1_1b.jpg
deleted file mode 100644
index 74e1f94..0000000
--- a/images/player1_1b.jpg
+++ /dev/null
diff --git a/images/player1_2.jpg b/images/player1_2.jpg
deleted file mode 100644
index fa23c0f..0000000
--- a/images/player1_2.jpg
+++ /dev/null
diff --git a/images/player1_2b.jpg b/images/player1_2b.jpg
deleted file mode 100644
index ec02cbf..0000000
--- a/images/player1_2b.jpg
+++ /dev/null
diff --git a/images/player1_3.jpg b/images/player1_3.jpg
deleted file mode 100644
index ba0e12f..0000000
--- a/images/player1_3.jpg
+++ /dev/null
diff --git a/images/player1_3b.jpg b/images/player1_3b.jpg
deleted file mode 100644
index 20b399f..0000000
--- a/images/player1_3b.jpg
+++ /dev/null
diff --git a/images/player1_4.jpg b/images/player1_4.jpg
deleted file mode 100644
index 205757d..0000000
--- a/images/player1_4.jpg
+++ /dev/null
diff --git a/images/player1_4b.jpg b/images/player1_4b.jpg
deleted file mode 100644
index f8fabb7..0000000
--- a/images/player1_4b.jpg
+++ /dev/null
diff --git a/images/player1_5.jpg b/images/player1_5.jpg
deleted file mode 100644
index 3eca2d0..0000000
--- a/images/player1_5.jpg
+++ /dev/null
diff --git a/images/player1_5b.jpg b/images/player1_5b.jpg
deleted file mode 100644
index efe3a91..0000000
--- a/images/player1_5b.jpg
+++ /dev/null
diff --git a/images/player1_6.jpg b/images/player1_6.jpg
deleted file mode 100644
index 655bf16..0000000
--- a/images/player1_6.jpg
+++ /dev/null
diff --git a/images/player1_6b.jpg b/images/player1_6b.jpg
deleted file mode 100644
index ff5299a..0000000
--- a/images/player1_6b.jpg
+++ /dev/null
diff --git a/images/player1_7.jpg b/images/player1_7.jpg
deleted file mode 100644
index 1eb63ac..0000000
--- a/images/player1_7.jpg
+++ /dev/null
diff --git a/images/player1_7b.jpg b/images/player1_7b.jpg
deleted file mode 100644
index 7b74076..0000000
--- a/images/player1_7b.jpg
+++ /dev/null
diff --git a/images/player1_8.jpg b/images/player1_8.jpg
deleted file mode 100644
index c4a5fd1..0000000
--- a/images/player1_8.jpg
+++ /dev/null
diff --git a/images/player1_8b.jpg b/images/player1_8b.jpg
deleted file mode 100644
index c1873fb..0000000
--- a/images/player1_8b.jpg
+++ /dev/null
diff --git a/images/player1_9.jpg b/images/player1_9.jpg
deleted file mode 100644
index 46ec9d3..0000000
--- a/images/player1_9.jpg
+++ /dev/null
diff --git a/images/player1_9b.jpg b/images/player1_9b.jpg
deleted file mode 100644
index bdb688b..0000000
--- a/images/player1_9b.jpg
+++ /dev/null
diff --git a/images/player2_0.jpg b/images/player2_0.jpg
deleted file mode 100644
index 677f2da..0000000
--- a/images/player2_0.jpg
+++ /dev/null
diff --git a/images/player2_0b.jpg b/images/player2_0b.jpg
deleted file mode 100644
index 9ea1223..0000000
--- a/images/player2_0b.jpg
+++ /dev/null
diff --git a/images/player2_1.jpg b/images/player2_1.jpg
deleted file mode 100644
index b52b708..0000000
--- a/images/player2_1.jpg
+++ /dev/null
diff --git a/images/player2_10.jpg b/images/player2_10.jpg
deleted file mode 100644
index f2f17b4..0000000
--- a/images/player2_10.jpg
+++ /dev/null
diff --git a/images/player2_10b.jpg b/images/player2_10b.jpg
deleted file mode 100644
index 0b7e722..0000000
--- a/images/player2_10b.jpg
+++ /dev/null
diff --git a/images/player2_11.jpg b/images/player2_11.jpg
deleted file mode 100644
index 7593a39..0000000
--- a/images/player2_11.jpg
+++ /dev/null
diff --git a/images/player2_11b.jpg b/images/player2_11b.jpg
deleted file mode 100644
index 759cd1a..0000000
--- a/images/player2_11b.jpg
+++ /dev/null
diff --git a/images/player2_12.jpg b/images/player2_12.jpg
deleted file mode 100644
index cd60538..0000000
--- a/images/player2_12.jpg
+++ /dev/null
diff --git a/images/player2_12b.jpg b/images/player2_12b.jpg
deleted file mode 100644
index d6c9524..0000000
--- a/images/player2_12b.jpg
+++ /dev/null
diff --git a/images/player2_13.jpg b/images/player2_13.jpg
deleted file mode 100644
index ae3e720..0000000
--- a/images/player2_13.jpg
+++ /dev/null
diff --git a/images/player2_13b.jpg b/images/player2_13b.jpg
deleted file mode 100644
index 73cdcd3..0000000
--- a/images/player2_13b.jpg
+++ /dev/null
diff --git a/images/player2_14.jpg b/images/player2_14.jpg
deleted file mode 100644
index 98f04a0..0000000
--- a/images/player2_14.jpg
+++ /dev/null
diff --git a/images/player2_14b.jpg b/images/player2_14b.jpg
deleted file mode 100644
index 28246e5..0000000
--- a/images/player2_14b.jpg
+++ /dev/null
diff --git a/images/player2_15.jpg b/images/player2_15.jpg
deleted file mode 100644
index 362ec90..0000000
--- a/images/player2_15.jpg
+++ /dev/null
diff --git a/images/player2_15b.jpg b/images/player2_15b.jpg
deleted file mode 100644
index 0c848f5..0000000
--- a/images/player2_15b.jpg
+++ /dev/null
diff --git a/images/player2_16.jpg b/images/player2_16.jpg
deleted file mode 100644
index bde5bfd..0000000
--- a/images/player2_16.jpg
+++ /dev/null
diff --git a/images/player2_16b.jpg b/images/player2_16b.jpg
deleted file mode 100644
index 8505b95..0000000
--- a/images/player2_16b.jpg
+++ /dev/null
diff --git a/images/player2_17.jpg b/images/player2_17.jpg
deleted file mode 100644
index 276d86f..0000000
--- a/images/player2_17.jpg
+++ /dev/null
diff --git a/images/player2_17b.jpg b/images/player2_17b.jpg
deleted file mode 100644
index 2cead9d..0000000
--- a/images/player2_17b.jpg
+++ /dev/null
diff --git a/images/player2_18.jpg b/images/player2_18.jpg
deleted file mode 100644
index 4d92c9a..0000000
--- a/images/player2_18.jpg
+++ /dev/null
diff --git a/images/player2_18b.jpg b/images/player2_18b.jpg
deleted file mode 100644
index af8ca7a..0000000
--- a/images/player2_18b.jpg
+++ /dev/null
diff --git a/images/player2_1b.jpg b/images/player2_1b.jpg
deleted file mode 100644
index a139128..0000000
--- a/images/player2_1b.jpg
+++ /dev/null
diff --git a/images/player2_2.jpg b/images/player2_2.jpg
deleted file mode 100644
index c365682..0000000
--- a/images/player2_2.jpg
+++ /dev/null
diff --git a/images/player2_2b.jpg b/images/player2_2b.jpg
deleted file mode 100644
index 95c649c..0000000
--- a/images/player2_2b.jpg
+++ /dev/null
diff --git a/images/player2_3.jpg b/images/player2_3.jpg
deleted file mode 100644
index 2fc2caa..0000000
--- a/images/player2_3.jpg
+++ /dev/null
diff --git a/images/player2_3b.jpg b/images/player2_3b.jpg
deleted file mode 100644
index 696c331..0000000
--- a/images/player2_3b.jpg
+++ /dev/null
diff --git a/images/player2_4.jpg b/images/player2_4.jpg
deleted file mode 100644
index 68615d8..0000000
--- a/images/player2_4.jpg
+++ /dev/null
diff --git a/images/player2_4b.jpg b/images/player2_4b.jpg
deleted file mode 100644
index e603354..0000000
--- a/images/player2_4b.jpg
+++ /dev/null
diff --git a/images/player2_5.jpg b/images/player2_5.jpg
deleted file mode 100644
index f7694cf..0000000
--- a/images/player2_5.jpg
+++ /dev/null
diff --git a/images/player2_5b.jpg b/images/player2_5b.jpg
deleted file mode 100644
index 8d1f4db..0000000
--- a/images/player2_5b.jpg
+++ /dev/null
diff --git a/images/player2_6.jpg b/images/player2_6.jpg
deleted file mode 100644
index 4d11675..0000000
--- a/images/player2_6.jpg
+++ /dev/null
diff --git a/images/player2_6b.jpg b/images/player2_6b.jpg
deleted file mode 100644
index a9084f8..0000000
--- a/images/player2_6b.jpg
+++ /dev/null
diff --git a/images/player2_7.jpg b/images/player2_7.jpg
deleted file mode 100644
index 1ae42a1..0000000
--- a/images/player2_7.jpg
+++ /dev/null
diff --git a/images/player2_7b.jpg b/images/player2_7b.jpg
deleted file mode 100644
index f221c17..0000000
--- a/images/player2_7b.jpg
+++ /dev/null
diff --git a/images/player2_8.jpg b/images/player2_8.jpg
deleted file mode 100644
index eab290a..0000000
--- a/images/player2_8.jpg
+++ /dev/null
diff --git a/images/player2_8b.jpg b/images/player2_8b.jpg
deleted file mode 100644
index 2918589..0000000
--- a/images/player2_8b.jpg
+++ /dev/null
diff --git a/images/player2_9.jpg b/images/player2_9.jpg
deleted file mode 100644
index 4b49d00..0000000
--- a/images/player2_9.jpg
+++ /dev/null
diff --git a/images/player2_9b.jpg b/images/player2_9b.jpg
deleted file mode 100644
index ca3ad37..0000000
--- a/images/player2_9b.jpg
+++ /dev/null