diff --git a/P25Gateway/Audio/de_DE.imbe b/P25Gateway/Audio/de_DE.imbe
new file mode 100644
index 0000000..4674d90
Binary files /dev/null and b/P25Gateway/Audio/de_DE.imbe differ
diff --git a/P25Gateway/Audio/de_DE.p25 b/P25Gateway/Audio/de_DE.p25
deleted file mode 100644
index 0b716ed..0000000
Binary files a/P25Gateway/Audio/de_DE.p25 and /dev/null differ
diff --git a/P25Gateway/Audio/dk_DK.imbe b/P25Gateway/Audio/dk_DK.imbe
new file mode 100644
index 0000000..b1e5264
Binary files /dev/null and b/P25Gateway/Audio/dk_DK.imbe differ
diff --git a/P25Gateway/Audio/dk_DK.p25 b/P25Gateway/Audio/dk_DK.p25
deleted file mode 100644
index 41ce342..0000000
Binary files a/P25Gateway/Audio/dk_DK.p25 and /dev/null differ
diff --git a/P25Gateway/Audio/en_GB.imbe b/P25Gateway/Audio/en_GB.imbe
new file mode 100644
index 0000000..4e1bc01
Binary files /dev/null and b/P25Gateway/Audio/en_GB.imbe differ
diff --git a/P25Gateway/Audio/en_GB.p25 b/P25Gateway/Audio/en_GB.p25
deleted file mode 100644
index 40f71b0..0000000
Binary files a/P25Gateway/Audio/en_GB.p25 and /dev/null differ
diff --git a/P25Gateway/Audio/en_US.imbe b/P25Gateway/Audio/en_US.imbe
new file mode 100644
index 0000000..6c682f4
Binary files /dev/null and b/P25Gateway/Audio/en_US.imbe differ
diff --git a/P25Gateway/Audio/en_US.p25 b/P25Gateway/Audio/en_US.p25
deleted file mode 100644
index 0fa6e2e..0000000
Binary files a/P25Gateway/Audio/en_US.p25 and /dev/null differ
diff --git a/P25Gateway/Audio/es_ES.imbe b/P25Gateway/Audio/es_ES.imbe
new file mode 100644
index 0000000..df35683
Binary files /dev/null and b/P25Gateway/Audio/es_ES.imbe differ
diff --git a/P25Gateway/Audio/es_ES.p25 b/P25Gateway/Audio/es_ES.p25
deleted file mode 100644
index 91d014e..0000000
Binary files a/P25Gateway/Audio/es_ES.p25 and /dev/null differ
diff --git a/P25Gateway/Audio/fr_FR.imbe b/P25Gateway/Audio/fr_FR.imbe
new file mode 100644
index 0000000..8fe6b07
Binary files /dev/null and b/P25Gateway/Audio/fr_FR.imbe differ
diff --git a/P25Gateway/Audio/fr_FR.p25 b/P25Gateway/Audio/fr_FR.p25
deleted file mode 100644
index 194f85e..0000000
Binary files a/P25Gateway/Audio/fr_FR.p25 and /dev/null differ
diff --git a/P25Gateway/Audio/it_IT.imbe b/P25Gateway/Audio/it_IT.imbe
new file mode 100644
index 0000000..d1e04c2
Binary files /dev/null and b/P25Gateway/Audio/it_IT.imbe differ
diff --git a/P25Gateway/Audio/it_IT.p25 b/P25Gateway/Audio/it_IT.p25
deleted file mode 100644
index fb24b33..0000000
Binary files a/P25Gateway/Audio/it_IT.p25 and /dev/null differ
diff --git a/P25Gateway/Audio/no_NO.imbe b/P25Gateway/Audio/no_NO.imbe
new file mode 100644
index 0000000..bd8b3fa
Binary files /dev/null and b/P25Gateway/Audio/no_NO.imbe differ
diff --git a/P25Gateway/Audio/no_NO.p25 b/P25Gateway/Audio/no_NO.p25
deleted file mode 100644
index 28a3e71..0000000
Binary files a/P25Gateway/Audio/no_NO.p25 and /dev/null differ
diff --git a/P25Gateway/Audio/pl_PL.imbe b/P25Gateway/Audio/pl_PL.imbe
new file mode 100644
index 0000000..895a1cc
Binary files /dev/null and b/P25Gateway/Audio/pl_PL.imbe differ
diff --git a/P25Gateway/Audio/pl_PL.p25 b/P25Gateway/Audio/pl_PL.p25
deleted file mode 100644
index cd4d097..0000000
Binary files a/P25Gateway/Audio/pl_PL.p25 and /dev/null differ
diff --git a/P25Gateway/Audio/se_SE.imbe b/P25Gateway/Audio/se_SE.imbe
new file mode 100644
index 0000000..b6f980b
Binary files /dev/null and b/P25Gateway/Audio/se_SE.imbe differ
diff --git a/P25Gateway/Audio/se_SE.p25 b/P25Gateway/Audio/se_SE.p25
deleted file mode 100644
index 0518ff0..0000000
Binary files a/P25Gateway/Audio/se_SE.p25 and /dev/null differ
diff --git a/P25Gateway/Voice.cpp b/P25Gateway/Voice.cpp
index a44ee8d..0f77903 100644
--- a/P25Gateway/Voice.cpp
+++ b/P25Gateway/Voice.cpp
@@ -115,10 +115,10 @@ m_positions()
 
 #if defined(_WIN32) || defined(_WIN64)
 	m_indxFile = directory + "\\" + language + ".indx";
-	m_imbeFile = directory + "\\" + language + ".p25";
+	m_imbeFile = directory + "\\" + language + ".imbe";
 #else
 	m_indxFile = directory + "/" + language + ".indx";
-	m_imbeFile = directory + "/" + language + ".p25";
+	m_imbeFile = directory + "/" + language + ".imbe";
 #endif
 
 	// Approximately 10 seconds worth