diff --git a/About/About.xml b/About/About.xml
index d474a89..da16e43 100644
--- a/About/About.xml
+++ b/About/About.xml
@@ -7,7 +7,6 @@
 		<li>1.1</li>
 		<li>1.2</li>
 		<li>1.3</li>
-		<li>1.4</li>
 	</supportedVersions>
 	<packageId>Tory187.RJWAnimAddons.VoicePatch</packageId>
 	<modDependencies>
diff --git a/About/Manifest.xml b/About/Manifest.xml
index 59aecb9..2399596 100644
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
-	<version>1.4.0</version>
+	<identifier>RJW-AA-VoicePatch</identifier>
+	<version>1.3.0</version>
 	<manifestUri>https://gitgud.io/Tory/animaddons-voicepatch/-/raw/master/About/Manifest.xml</manifestUri>
     <downloadUri>https://gitgud.io/Tory/animaddons-voicepatch/</downloadUri>
 </Manifest>
diff --git a/Changelog.txt b/Changelog.txt
index eb2bdb7..4c2a86c 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,7 +1,5 @@
 RJWAnimAddons-Voicepatch:
 
-10/25/2022: 1.4.0 Added 1.4 tag, Updated soundDefs they use AudioGrain_Clip instead of folder now, shouldnt throw errors in 1.4
-
 8/19/2022: 1.3.0 Restructured for better compatibility for AC's animation patch (currently 99% of anims are not voice supported while using AC's patch. Will update all anims in AC's patch later)
 
 7/22/2021: 1.2.8 Added 1.3 tag. Added URI to manifest to keep track of future versions in mod manager
diff --git a/Common/Defs/SoundDefs/Sounds_Sex_FVoice - OLD.xml b/Common/Defs/SoundDefs/Sounds_Sex_FVoice - OLD.xml
index 186bc5b..c69d0c1 100644
--- a/Common/Defs/SoundDefs/Sounds_Sex_FVoice - OLD.xml	
+++ b/Common/Defs/SoundDefs/Sounds_Sex_FVoice - OLD.xml	
@@ -9,59 +9,59 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Grunt1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Grunt1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Grunt2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Grunt2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Grunt3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Grunt3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Grunt4</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Grunt4</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Grunt5</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Grunt5</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Grunt6</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Grunt6</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
@@ -89,29 +89,29 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Scream1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Scream1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Scream2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Scream2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Scream3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Scream3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Scream4</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Scream4</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
@@ -139,41 +139,41 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Moan1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Moan1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Moan2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Moan2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Moan3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Moan3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Moan4</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Moan4</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
@@ -201,23 +201,23 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/MoanShort1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/MoanShort1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/MoanShort2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/MoanShort2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/MoanShort3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/MoanShort3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
diff --git a/Common/Defs/SoundDefs/Sounds_Sex_FVoice.xml b/Common/Defs/SoundDefs/Sounds_Sex_FVoice.xml
index 05421c6..ef40b8c 100644
--- a/Common/Defs/SoundDefs/Sounds_Sex_FVoice.xml
+++ b/Common/Defs/SoundDefs/Sounds_Sex_FVoice.xml
@@ -9,59 +9,59 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Grunt1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Grunt1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Grunt2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Grunt2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Grunt3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Grunt3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Grunt4</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Grunt4</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Grunt5</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Grunt5</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Grunt6</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Grunt6</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
@@ -89,29 +89,29 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Scream1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Scream1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Scream2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Scream2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Scream3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Scream3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Scream4</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Scream4</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
@@ -139,41 +139,41 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Moan1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Moan1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Moan2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Moan2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Moan3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Moan3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/Moan4</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/Moan4</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
@@ -201,23 +201,23 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/MoanShort1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/MoanShort1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/MoanShort2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/MoanShort2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/FVoice/MoanShort3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/FVoice/MoanShort3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
diff --git a/Common/Defs/SoundDefs/Sounds_Sex_MVoice - OLD.xml b/Common/Defs/SoundDefs/Sounds_Sex_MVoice - OLD.xml
index 9c0a913..522c503 100644
--- a/Common/Defs/SoundDefs/Sounds_Sex_MVoice - OLD.xml	
+++ b/Common/Defs/SoundDefs/Sounds_Sex_MVoice - OLD.xml	
@@ -9,41 +9,41 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Grunt1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Grunt1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Grunt2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Grunt2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Grunt3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Grunt3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Grunt4</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Grunt4</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
@@ -71,23 +71,23 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Scream1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Scream1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Scream2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Scream2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Scream3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Scream3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
@@ -115,41 +115,41 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Moan1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Moan1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Moan2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Moan2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Moan3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Moan3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Moan4</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Moan4</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
@@ -177,23 +177,23 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/MoanShort1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/MoanShort1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/MoanShort2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/MoanShort2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/MoanShort3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/MoanShort3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
diff --git a/Common/Defs/SoundDefs/Sounds_Sex_MVoice.xml b/Common/Defs/SoundDefs/Sounds_Sex_MVoice.xml
index 6f83790..44327b9 100644
--- a/Common/Defs/SoundDefs/Sounds_Sex_MVoice.xml
+++ b/Common/Defs/SoundDefs/Sounds_Sex_MVoice.xml
@@ -9,41 +9,41 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Grunt1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Grunt1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Grunt2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Grunt2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Grunt3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Grunt3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Grunt4</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Grunt4</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
@@ -71,23 +71,23 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Scream1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Scream1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Scream2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Scream2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Scream3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Scream3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
@@ -115,41 +115,41 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Moan1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Moan1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Moan2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Moan2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Moan3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Moan3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/Moan4</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/Moan4</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
@@ -177,23 +177,23 @@
 		<subSounds>
 		  <li>
 			<grains>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/MoanShort1</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/MoanShort1</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/MoanShort2</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/MoanShort2</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/MVoice/MoanShort3</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/MVoice/MoanShort3</clipFolderPath>
 			  </li>
-			  <li Class="AudioGrain_Clip">
-				<clipPath>Sex/Silent/Silent</clipPath>
+			  <li Class="AudioGrain_Folder">
+				<clipFolderPath>Sex/Silent/Silent</clipFolderPath>
 			  </li>
 			</grains>
 			<volumeRange>
diff --git a/LoadFolders.xml b/LoadFolders.xml
index 9e72ba8..3c53768 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -13,9 +13,4 @@
 		<!--<li IfModActive="abscon.rimworld.animations.patch">Extra/Abstract Concept</li>--><!--AC patch with voice DISABLED, WIP-->
 		<li>Common</li><!--Sounds and sound defs-->
 	</v1.3>
-	<v1.4>
-		<li IfModNotActive="abscon.rimworld.animations.patch">Common/1.2 and 1.3</li><!--Load 1.3 defs and patches-->
-		<!--<li IfModActive="abscon.rimworld.animations.patch">Extra/Abstract Concept</li>--><!--AC patch with voice DISABLED, WIP-->
-		<li>Common</li><!--Sounds and sound defs-->
-	</v1.4>
 </loadFolders>
\ No newline at end of file