diff --git a/data/sounds/camera.wav b/data/sounds/camera.wav
index 309598ab..7cf8c2e7 100644
Binary files a/data/sounds/camera.wav and b/data/sounds/camera.wav differ
diff --git a/data/sounds/click.wav b/data/sounds/click.wav
index b26f44cd..a86d62fa 100644
Binary files a/data/sounds/click.wav and b/data/sounds/click.wav differ
diff --git a/data/sounds/hover.wav b/data/sounds/hover.wav
index 1cc9a298..ddb0cba5 100644
Binary files a/data/sounds/hover.wav and b/data/sounds/hover.wav differ
diff --git a/source/music/gui_sound.cpp b/source/music/gui_sound.cpp
index d813ad46..e4ff33ef 100644
--- a/source/music/gui_sound.cpp
+++ b/source/music/gui_sound.cpp
@@ -31,45 +31,46 @@
 #include "WavDecoder.hpp"
 #include "loader/sys.h"
 
-#define MAX_SND_VOICES      16
+#define MAX_SND_VOICES		16
 
 using namespace std;
 
 static bool VoiceUsed[MAX_SND_VOICES] =
 {
-    true, false, false, false, false, false,
-    false, false, false, false, false, false,
-    false, false, false, false
+	true, false, false, false, false, false,
+	false, false, false, false, false, false,
+	false, false, false, false
 };
 
 static inline int GetFirstUnusedVoice()
 {
-    for(int i = 1; i < MAX_SND_VOICES; i++)
-    {
-        if(VoiceUsed[i] == false)
-            return i;
-    }
+	for(int i = 1; i < MAX_SND_VOICES; i++)
+	{
+		if(VoiceUsed[i] == false)
+			return i;
+	}
 	gprintf("ALL VOICES USED UP!!\n");
-    return -1;
+	return -1;
 }
 
 extern "C" void SoundCallback(s32 voice)
 {
-    SoundDecoder * decoder = SoundHandler::Instance()->Decoder(voice);
-    if(!decoder) return;
+	SoundDecoder * decoder = SoundHandler::Instance()->Decoder(voice);
+	if(!decoder) 
+		return;
 
-    if(decoder->IsBufferReady())
-    {
-        if(ASND_AddVoice(voice, decoder->GetBuffer(), decoder->GetBufferSize()) == SND_OK)
-        {
-            decoder->LoadNext();
-            SoundHandler::Instance()->ThreadSignal();
-        }
-    }
-    else if(decoder->IsEOF())
-        ASND_StopVoice(voice);
-    else
-        SoundHandler::Instance()->ThreadSignal();
+	if(decoder->IsBufferReady())
+	{
+		if(ASND_AddVoice(voice, decoder->GetBuffer(), decoder->GetBufferSize()) == SND_OK)
+		{
+			decoder->LoadNext();
+			SoundHandler::Instance()->ThreadSignal();
+		}
+	}
+	else if(decoder->IsEOF())
+		ASND_StopVoice(voice);
+	else
+	SoundHandler::Instance()->ThreadSignal();
 }
 
 GuiSound::GuiSound()
@@ -98,8 +99,9 @@ GuiSound::GuiSound(GuiSound *g)
 	voice = -1;
 
 	Init();
-	if (g == NULL) return;
-	
+	if (g == NULL) 
+		return;
+
 	if (g->sound != NULL)
 	{
 		u8 * snd = (u8 *) malloc(g->length);
@@ -123,9 +125,9 @@ void GuiSound::Init()
 
 	if (voice == -1)
 		voice = GetFirstUnusedVoice();
-    if(voice > 0)
-        VoiceUsed[voice] = true;
-	
+	if(voice > 0)
+		VoiceUsed[voice] = true;
+
 	volume = 255;
 	SoundEffectLength = 0;
 	loop = false;
@@ -140,94 +142,89 @@ void GuiSound::FreeMemory()
 	if (!Sys_Exiting())
 		SoundHandler::Instance()->RemoveDecoder(voice);
 
-    if(allocated)
-    {
-        SAFE_FREE(sound);
-        allocated = false;
-    }
+	if(allocated)
+	{
+		SAFE_FREE(sound);
+		allocated = false;
+	}
 	filepath = "";
 
-    SoundEffectLength = 0;
+	SoundEffectLength = 0;
 }
 
 bool GuiSound::Load(const char * filepath)
 {
-    FreeMemory();
+	FreeMemory();
 
 	if(!filepath || filepath[strlen(filepath)-1] == '/' || strlen(filepath) < 4)
 		return false;
 
-    FILE * f = fopen(filepath, "rb");
-    if(!f)
-	{	gprintf("Failed to load file %s!!\n", filepath);
-        return false;
-	}
-
-    u32 magic;
-    fread(&magic, 1, 4, f);
-    fclose(f);
-
-    SoundHandler::Instance()->AddDecoder(voice, filepath);
-	gprintf("Loading %s using voice %d\n", filepath, voice);
-    SoundDecoder * decoder = SoundHandler::Instance()->Decoder(voice);
-    if(!decoder)
-	{	gprintf("No Decoder!!!\n");
+	FILE * f = fopen(filepath, "rb");
+	if(!f)
+	{	
+		gprintf("Failed to load file %s!!\n", filepath);
+		return false;
+	}
+
+	u32 magic;
+	fread(&magic, 1, 4, f);
+	fclose(f);
+
+	SoundHandler::Instance()->AddDecoder(voice, filepath);
+	gprintf("Loading %s using voice %d\n", filepath, voice);
+	SoundDecoder * decoder = SoundHandler::Instance()->Decoder(voice);
+	if(!decoder)
+	{	
+		gprintf("No Decoder!!!\n");
+		return false;
+	}
+
+	if(!decoder->IsBufferReady())
+	{	
+		gprintf("Buffer not ready!!n");
+		SoundHandler::Instance()->RemoveDecoder(voice);
 		return false;
 	}
-	
-    if(!decoder->IsBufferReady())
-    {	gprintf("Buffer not ready!!n");
-        SoundHandler::Instance()->RemoveDecoder(voice);
-        return false;
-    }
 
 	this->filepath = filepath;
-    SetLoop(loop);
+	SetLoop(loop);
 
 	return true;
 }
 
 bool GuiSound::Load(const u8 * snd, u32 len, bool isallocated)
 {
-    FreeMemory();
+	FreeMemory();
 	this->voice = voice;
 
-    if(!snd)
+	if(!snd)
+		return false;
+
+	if(!isallocated && *((u32 *) snd) == 'RIFF')
+		return LoadSoundEffect(snd, len);
+
+	if(*((u32 *) snd) == 'IMD5')
+		UncompressSoundbin(snd, len, isallocated);
+	else
 	{
-        return false;
+		sound = (u8 *) snd;
+		length = len;
+		allocated = isallocated;
 	}
 
-    if(!isallocated && *((u32 *) snd) == 'RIFF')
-    {
-        return LoadSoundEffect(snd, len);
-    }
+	SoundHandler::Instance()->AddDecoder(this->voice, sound, length);
 
-    if(*((u32 *) snd) == 'IMD5')
-    {
-        UncompressSoundbin(snd, len, isallocated);
-    }
-    else
-    {
-        sound = (u8 *) snd;
-        length = len;
-        allocated = isallocated;
-    }
-	
-    SoundHandler::Instance()->AddDecoder(this->voice, sound, length);
+	SoundDecoder * decoder = SoundHandler::Instance()->Decoder(voice);
+	if(!decoder)
+		return false;
 
-    SoundDecoder * decoder = SoundHandler::Instance()->Decoder(voice);
-    if(!decoder)
+	if(!decoder->IsBufferReady())
 	{
-        return false;
+		SoundHandler::Instance()->RemoveDecoder(voice);
+		return false;
 	}
 
-    if(!decoder->IsBufferReady())
-    {
-        SoundHandler::Instance()->RemoveDecoder(voice);
-        return false;
-    }
-
-    SetLoop(loop);
+	SetLoop(loop);
 
 	return true;
 }
@@ -236,77 +233,71 @@ bool GuiSound::LoadSoundEffect(const u8 * snd, u32 len)
 {
 	FreeMemory();
 
-    WavDecoder decoder(snd, len);
-    decoder.Rewind();
+	WavDecoder decoder(snd, len);
+	decoder.Rewind();
 
-    u32 done = 0;
-    sound = (u8 *) malloc(4096);
-    memset(sound, 0, 4096);
+	u32 done = 0;
+	sound = (u8 *) malloc(4096);
+	memset(sound, 0, 4096);
 
-    while(1)
-    {
-        u8 * tmpsnd = (u8 *) realloc(sound, done+4096);
-        if(!tmpsnd)
-        {
-            SAFE_FREE(sound);
-            return false;
-        }
+	while(1)
+	{
+		u8 * tmpsnd = (u8 *) realloc(sound, done+4096);
+		if(!tmpsnd)
+		{
+			SAFE_FREE(sound);
+			return false;
+		}
 
-        sound = tmpsnd;
+		sound = tmpsnd;
 
-        int read = decoder.Read(sound+done, 4096, done);
-        if(read <= 0)
-            break;
+		int read = decoder.Read(sound+done, 4096, done);
+		if(read <= 0)
+		break;
 
-        done += read;
-    }
+		done += read;
+	}
 
-    sound = (u8 *) realloc(sound, done);
-    SoundEffectLength = done;
-    allocated = true;
+	sound = (u8 *) realloc(sound, done);
+	SoundEffectLength = done;
+	allocated = true;
 
-    return true;
+	return true;
 }
 
 void GuiSound::Play(int vol, bool restart)
 {
-    if(SoundEffectLength > 0)
-    {
-        ASND_StopVoice(voice);
-        ASND_SetVoice(voice, VOICE_STEREO_16BIT, 32000, 0, sound, SoundEffectLength, vol, vol, NULL);
-        return;
-    }
-
-    if(IsPlaying() && !restart)
+	if(SoundEffectLength > 0)
 	{
+		ASND_StopVoice(voice);
+		ASND_SetVoice(voice, VOICE_MONO_16BIT, 22050, 0, sound, SoundEffectLength, vol, vol, NULL);
 		return;
 	}
 
+	if(IsPlaying() && !restart)
+		return;
+
 	if(voice < 0 || voice >= 16)
-	{
 		return;
-	}
-	
-    SoundDecoder * decoder = SoundHandler::Instance()->Decoder(voice);
-    if(!decoder)
-	{
-        return;
-	}
+
+	SoundDecoder * decoder = SoundHandler::Instance()->Decoder(voice);
+	if(!decoder)
+		return;
 
 	ASND_StopVoice(voice);
-    if(decoder->IsEOF())
-    {
-        decoder->ClearBuffer();
-        decoder->Rewind();
-        decoder->Decode();
-    }
+	if(decoder->IsEOF())
+	{
+		decoder->ClearBuffer();
+		decoder->Rewind();
+		decoder->Decode();
+	}
 
-    u8 * curbuffer = decoder->GetBuffer();
-    int bufsize = decoder->GetBufferSize();
-    decoder->LoadNext();
-    SoundHandler::Instance()->ThreadSignal();
+	u8 * curbuffer = decoder->GetBuffer();
+	int bufsize = decoder->GetBufferSize();
+	decoder->LoadNext();
+	SoundHandler::Instance()->ThreadSignal();
 
-    ASND_SetVoice(voice, decoder->GetFormat(), decoder->GetSampleRate(), 0, curbuffer, bufsize, vol, vol, SoundCallback);
+	ASND_SetVoice(voice, decoder->GetFormat(), decoder->GetSampleRate(), 0, curbuffer, bufsize, vol, vol, SoundCallback);
 }
 
 void GuiSound::Play()
@@ -323,16 +314,14 @@ void GuiSound::Stop()
 
 	ASND_StopVoice(voice);
 
-    SoundDecoder * decoder = SoundHandler::Instance()->Decoder(voice);
-    if(!decoder)
-	{
-        return;
-	}
+	SoundDecoder * decoder = SoundHandler::Instance()->Decoder(voice);
+	if(!decoder)
+		return;
 
-    decoder->ClearBuffer();
+	decoder->ClearBuffer();
 	Rewind();
-	
-    SoundHandler::Instance()->ThreadSignal();
+
+	SoundHandler::Instance()->ThreadSignal();
 }
 
 void GuiSound::Pause()
@@ -340,12 +329,12 @@ void GuiSound::Pause()
 	if(voice < 0 || voice >= 16)
 		return;
 
-    ASND_StopVoice(voice);
+	ASND_StopVoice(voice);
 }
 
 void GuiSound::Resume()
 {
-    Play();
+	Play();
 }
 
 bool GuiSound::IsPlaying()
@@ -353,7 +342,7 @@ bool GuiSound::IsPlaying()
 	if(voice < 0 || voice >= 16)
 		return false;
 
-    int result = ASND_StatusVoice(voice);
+	int result = ASND_StatusVoice(voice);
 
 	if(result == SND_WORKING || result == SND_WAITING)
 		return true;
@@ -375,33 +364,33 @@ void GuiSound::SetVolume(int vol)
 		return;
 
 	volume = vol;
-    ASND_ChangeVolumeVoice(voice, volume, volume);
+	ASND_ChangeVolumeVoice(voice, volume, volume);
 }
 
 void GuiSound::SetLoop(u8 l)
 {
 	loop = l;
 
-    SoundDecoder * decoder = SoundHandler::Instance()->Decoder(voice);
-    if(!decoder)
-        return;
+	SoundDecoder * decoder = SoundHandler::Instance()->Decoder(voice);
+	if(!decoder)
+		return;
 
-    decoder->SetLoop(l == 1);
+	decoder->SetLoop(l == 1);
 }
 
 void GuiSound::Rewind()
 {
-    SoundDecoder * decoder = SoundHandler::Instance()->Decoder(voice);
-    if(!decoder)
-        return;
+	SoundDecoder * decoder = SoundHandler::Instance()->Decoder(voice);
+	if(!decoder)
+		return;
 
-    decoder->Rewind();
+	decoder->Rewind();
 }
 
 struct _LZ77Info
 {
-        u16 length : 4;
-        u16 offset : 12;
+	u16 length : 4;
+	u16 offset : 12;
 } __attribute__((packed));
 
 typedef struct _LZ77Info LZ77Info;
@@ -439,7 +428,7 @@ u8 * uncompressLZ77(const u8 *inBuf, u32 inLength, u32 * size)
 				inBuf += sizeof (LZ77Info);
 				int length = info->length + 3;
 				if (bufCur - info->offset - 1 < buffer || bufCur + length > bufEnd)
-					return buffer;
+				return buffer;
 				memcpy(bufCur, bufCur - info->offset - 1, length);
 				bufCur += length;
 			}
@@ -460,40 +449,41 @@ u8 * uncompressLZ77(const u8 *inBuf, u32 inLength, u32 * size)
 
 void GuiSound::UncompressSoundbin(const u8 * snd, u32 len, bool isallocated)
 {
-    const u8 * file = snd+32;
+	const u8 * file = snd+32;
 
 	length = len-32;
-	if (length <= 0) return;
+	if (length <= 0) 
+		return;
 
-    if(*((u32 *) file) == 'LZ77')
-    {
-        u32 size = 0;
-        sound = uncompressLZ77(file, length, &size);
-		if (!sound)
-		{
-			length = 0;
-			return;
-		}
-        length = size;
-    }
-    else
-    {
-        sound = (u8 *) malloc(length);
-		if (!sound)
-		{
-			length = 0;
-			return;
-		}
-        memcpy(sound, file, length);
-    }
-
-    if(isallocated)
+	if(*((u32 *) file) == 'LZ77')
 	{
-		void *p = (void *) snd;
-        SAFE_FREE(p);
+		u32 size = 0;
+		sound = uncompressLZ77(file, length, &size);
+		if (!sound)
+		{
+			length = 0;
+			return;
+		}
+		length = size;
+	}
+	else
+	{
+		sound = (u8 *) malloc(length);
+		if (!sound)
+		{
+			length = 0;
+			return;
+		}
+		memcpy(sound, file, length);
 	}
 
-    allocated = true;
+	if(isallocated)
+	{
+		void *p = (void *) snd;
+		SAFE_FREE(p);
+	}
+
+	allocated = true;
 }
 
 void soundInit(void)