diff --git a/resources/templates/conf/autoload_configs/modules.conf.xml b/resources/templates/conf/autoload_configs/modules.conf.xml
index e9fb9d445a..48f96c9ced 100644
--- a/resources/templates/conf/autoload_configs/modules.conf.xml
+++ b/resources/templates/conf/autoload_configs/modules.conf.xml
@@ -1,127 +1,82 @@
 <configuration name="modules.conf" description="Modules">
-  <modules>
+	<modules>
 
-    <!-- Loggers (I'd load these first) -->
-    <load module="mod_console"/>
-    <load module="mod_logfile"/>
-    <!-- <load module="mod_syslog"/> -->
+		<!-- Applications -->
+		<load module="mod_commands"/>
+		<load module="mod_memcache"/>
 
-    <!--<load module="mod_yaml"/>-->
+		<!-- Languages -->
+		<load module="mod_lua"/>
 
-    <!-- Multi-Faceted -->
-    <!-- mod_enum is a dialplan interface, an application interface and an api command interface -->
-    <load module="mod_enum"/>
+		<!-- Endpoints -->
+		<load module="mod_sofia"/>
 
-    <!-- XML Interfaces -->
-    <!-- <load module="mod_xml_rpc"/> -->
-    <!-- <load module="mod_xml_curl"/> -->
-    <!-- <load module="mod_xml_cdr"/> -->
+		<!-- Loggers -->
+		<load module="mod_logfile"/>
+		<load module="mod_console"/>
 
-    <!-- Event Handlers -->
-    <load module="mod_cdr_csv"/>
-    <load module="mod_cdr_pg_csv"/>
-    <!-- <load module="mod_cdr_sqlite"/> -->
-    <!-- <load module="mod_event_multicast"/> -->
-    <load module="mod_event_socket"/>
-    <!-- <load module="mod_event_zmq"/> -->
-    <!-- <load module="mod_zeroconf"/> -->
-    <!-- <load module="mod_erlang_event"/> -->
-    <!-- <load module="mod_snmp"/> -->
+		<!-- Applications -->
+		<load module="mod_callcenter"/>
+		<load module="mod_fifo"/>
+		<load module="mod_sms"/>
+		<load module="mod_fsv"/>
+		<load module="mod_esf"/>
+		<load module="mod_expr"/>
+		<load module="mod_dptools"/>
+		<load module="mod_enum"/>
+		<load module="mod_valet_parking"/>
+		<load module="mod_spandsp"/>
+		<load module="mod_db"/>
+		<load module="mod_hash"/>
+		<load module="mod_conference"/>
 
-    <!-- Directory Interfaces -->
-    <!-- <load module="mod_ldap"/> -->
+		<!-- Auto -->
 
-    <!-- Endpoints -->
-    <!-- <load module="mod_dingaling"/> -->
-    <!-- <load module="mod_portaudio"/> -->
-    <!-- <load module="mod_alsa"/> -->
-    <load module="mod_sofia"/>
-    <load module="mod_loopback"/>
-    <!-- <load module="mod_woomera"/> -->
-    <!-- <load module="mod_freetdm"/> -->
-    <!-- <load module="mod_openzap"/> -->
-    <!-- <load module="mod_unicall"/> -->
-    <!-- <load module="mod_skinny"/> -->
-    <!-- <load module="mod_khomp"/>   -->
-    <!-- <load module="mod_rtmp"/>   -->
+		<!-- Codecs -->
+		<load module="mod_g729"/>
+		<load module="mod_g723_1"/>
+		<load module="mod_bv"/>
+		<load module="mod_amr"/>
+		<load module="mod_h26x"/>
 
-    <!-- Applications -->
-    <load module="mod_commands"/>
-    <load module="mod_conference"/>
-    <load module="mod_db"/>
-    <load module="mod_dptools"/>
-    <load module="mod_expr"/>
-    <load module="mod_fifo"/>
-    <load module="mod_hash"/>
-    <load module="mod_voicemail"/>
-    <!--<load module="mod_directory"/>-->
-    <!--<load module="mod_distributor"/>-->
-    <!--<load module="mod_lcr"/>-->
-    <load module="mod_esf"/>
-    <load module="mod_fsv"/>
-    <load module="mod_cluechoo"/>
-    <load module="mod_valet_parking"/>
-    <!--<load module="mod_fsk"/>-->
-    <!--<load module="mod_spy"/>-->
+		<!-- Dialplan Interfaces -->
+		<load module="mod_dialplan_xml"/>
 
-    <!-- SNOM Module -->
-    <!--<load module="mod_snom"/>-->
+		<!-- Endpoints -->
+		<load module="mod_loopback"/>
 
-    <!-- This one only works on Linux for now -->
-    <!--<load module="mod_ladspa"/>-->
+		<!-- Event Handlers -->
+		<load module="mod_event_socket"/>
 
-    <!-- Dialplan Interfaces -->
-    <!-- <load module="mod_dialplan_directory"/> -->
-    <load module="mod_dialplan_xml"/>
-    <load module="mod_dialplan_asterisk"/>
+		<!-- File Format Interfaces -->
+		<load module="mod_sndfile"/>
+		<load module="mod_native_file"/>
 
-    <!-- Codec Interfaces -->
-    <load module="mod_spandsp"/>
-    <load module="mod_g723_1"/>
-    <load module="mod_g729"/>
-    <load module="mod_amr"/>
-    <load module="mod_ilbc"/>
-    <load module="mod_speex"/>
-    <load module="mod_h26x"/>
-    <load module="mod_siren"/>
-    <!--<load module="mod_celt"/>-->
-    <!--<load module="mod_opus"/>-->
+		<!-- Say -->
+		<load module="mod_say_en"/>
+		<load module="mod_say_zh"/>
+		<load module="mod_say_ru"/>
+		<load module="mod_say_fr"/>
+		<load module="mod_say_th"/>
+		<load module="mod_say_he"/>
+		<load module="mod_say_pt"/>
+		<load module="mod_say_de"/>
+		<load module="mod_say_it"/>
+		<load module="mod_say_nl"/>
+		<load module="mod_say_es"/>
+		<load module="mod_say_hu"/>
 
-    <!-- File Format Interfaces -->
-    <load module="mod_sndfile"/>
-    <load module="mod_native_file"/>
-    <!--For icecast/mp3 streams/files-->
-    <!--<load module="mod_shout"/>-->
-    <!--For local streams (play all the files in a directory)-->
-    <load module="mod_local_stream"/>
-    <load module="mod_tone_stream"/>
+		<!-- Speech Recognition / Text to Speech -->
+		<load module="mod_flite"/>
+		<load module="mod_tts_commandline"/>
 
-    <!-- Timers -->
-    <!-- <load module="mod_timerfd"/> -->
-    <!-- <load module="mod_posix_timer"/> -->
+		<!-- Streams / Files -->
+		<load module="mod_local_stream"/>
+		<load module="mod_tone_stream"/>
+		<load module="mod_shout"/>
 
-    <!-- Languages -->
-    <load module="mod_spidermonkey"/>
-    <!-- <load module="mod_perl"/> -->
-    <!-- <load module="mod_python"/> -->
-    <!-- <load module="mod_java"/> -->
-    <load module="mod_lua"/>
+		<!-- XML Interfaces -->
+		<load module="mod_xml_cdr"/>
 
-    <!-- ASR /TTS -->
-    <!-- <load module="mod_flite"/> -->
-    <!-- <load module="mod_pocketsphinx"/> -->
-    <!-- <load module="mod_cepstral"/> -->
-    <!-- <load module="mod_tts_commandline"/> -->
-    <!-- <load module="mod_rss"/> -->
-
-    <!-- Say -->
-    <load module="mod_say_en"/>
-    <!-- <load module="mod_say_ru"/> -->
-    <!-- <load module="mod_say_zh"/> -->
-
-    <!-- Third party modules -->
-    <!--<load module="mod_nibblebill"/>-->
-    <!--<load module="mod_callcenter"/>-->
-
-  </modules>
+	</modules>
 </configuration>