diff --git a/xml/Includes_Variables.xml b/xml/Includes_Variables.xml
index 89b3829..f286fdd 100644
--- a/xml/Includes_Variables.xml
+++ b/xml/Includes_Variables.xml
@@ -409,46 +409,44 @@
 		<value>FF888888</value>
 	</variable>
 	<variable name="AudioCodec">
-		<!--value condition="String.Contains(ListItem.FileName,ATMOS)">ATMOS</value-->
-		<value condition="String.IsEqual(ListItem.AudioCodec,AIF)">AIFF</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,AIFF)">AIFF</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,MP1)">MP1</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,APE)">APE</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,DCA)">DTS</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,DTS)">DTS</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,AAC)">AAC</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,AAC_LATM)">AAC</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,ALAC)">APPLE</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,AIFC)">AIFC</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,OGG)">OGG</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,MP2)">MP2</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,FLAC)">FLAC</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,MP3)">MP3</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,MP3FLOAT)">MP3</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,AVC)">AVC</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,PCM)">PCM</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,PCM_BLURAY)">PCM</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,PCM_S16LE)">PCM</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,PCM_S24LE)">PCM</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,CDDA)">CDDA</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,WAV)">WAV</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,OPUS)">OPUS</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,WMA)">WMA</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,WMAPRO)">WMA</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,WMAV2)">WMA</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,AC3)">DD</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,DOLBLYDIGITAL)">DD</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,EAC3)">DD+</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,WAVPACK)">WAVP</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,DTSHD_MA)">DTS-MA</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,DTSHDMA)">DTS-MA</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,DTSHD_HRA)">DTS-HRA</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,TRUEHD)">TRUE-HD</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,VORBIS)">VORBIS</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,DTSHD_MA_X)">DTS:X</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,DTSHD_MA_X_IMAX)">DTS:X IMAX</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,EAC3_DDP_ATMOS)">DD+ ATMOS</value>
-		<value condition="String.IsEqual(ListItem.AudioCodec,TRUEHD_ATMOS)">TRUE-HD ATMOS</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,aac)">AAC</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,aac_latm)">AAC</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,ac3)">DD</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,aif)">AIFF</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,aifc)">AIFF</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,aiff)">AIFF</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,alac)">ALAC</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,ape)">APE</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,cdda)">CDDA</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,dca)">DTS</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,dolbydigital)">DD</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,dts)">DTS</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,dtshd_hra)">DTS-HD HRA</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,dtshd_ma)">DTS-HD MA</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,dtshd_ma_x)">DTS-HD MA + DTS:X</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,dtshd_ma_x_imax)">DTS-HD MA + DTS:X IMAX</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,dtsma)">DTS-HD MA</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,eac3)">DD+</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,eac3_ddp_atmos)">DD+ ATMOS</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,flac)">FLAC</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,mp1)">MP1</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,mp2)">MP2</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,mp3)">MP3</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,mp3float)">MP3</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,ogg)">OGG</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,opus)">OPUS</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,pcm)">PCM</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,pcm_bluray)">PCM</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,pcm_s16le)">PCM</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,pcm_s24le)">PCM</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,truehd)">TRUE-HD</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,truehd_atmos)">TRUE-HD ATMOS</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,vorbis)">VORBIS</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,wav)">WAV</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,wavpack)">">WAVP</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,wma)">WMA</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,wmapro)">WMA-PRO</value>
+		<value condition="String.IsEqual(ListItem.AudioCodec,wmav2)">WMA</value>
 		<value>$INFO[ListItem.AudioCodec]</value>
 	</variable>
 	<variable name="AudioChannels">