diff --git a/assets/json/soundboard.json b/assets/json/soundboard.json
index 1d090a71..0a998065 100644
--- a/assets/json/soundboard.json
+++ b/assets/json/soundboard.json
@@ -1,28 +1,15 @@
 [
-	"alarm",
-	"ayaya",
-	"call-of-the-witch",
-	"car-crash",
-	"cat",
-	"cow",
-	"dun-dun-dun",
-	"electric-zoo",
-	"error",
-	"fbi-open-up",
-	"hello-there",
-	"here-we-go-again",
-	"laugh-track",
-	"my-swamp",
-	"nipah",
-	"noot-noot",
-	"onee-chan",
-	"pikachu",
-	"rooster",
-	"sad-violin",
-	"slow-clap",
-	"steve-hurt",
-	"subaru-ringtone",
-	"windows-start-up",
-	"you-got-mail",
-	"you-what"
+	["soundboard", "alarm.mp3"],
+	["soundboard", "car-crash.mp3"],
+	["soundboard", "cat.mp3"],
+	["soundboard", "cow.mp3"],
+	["soundboard", "dun-dun-dun.mp3"],
+	["jeopardy.mp3"],
+	["soundboard", "laugh-track.mp3"],
+	["soundboard", "nipah.mp3"],
+	["soundboard", "rooster.mp3"],
+	["soundboard", "sad-violin.mp3"],
+	["soundboard", "slow-clap.mp3"],
+	["whos-that-pokemon.mp3"],
+	["soundboard", "windows-start-up.mp3"]
 ]
diff --git a/assets/sounds/soundboard/alarm.mp3 b/assets/sounds/soundboard/alarm.mp3
index 220b938b..fbb9462a 100644
Binary files a/assets/sounds/soundboard/alarm.mp3 and b/assets/sounds/soundboard/alarm.mp3 differ
diff --git a/assets/sounds/soundboard/ayaya.mp3 b/assets/sounds/soundboard/ayaya.mp3
deleted file mode 100644
index 4c866d53..00000000
Binary files a/assets/sounds/soundboard/ayaya.mp3 and /dev/null differ
diff --git a/assets/sounds/soundboard/call-of-the-witch.mp3 b/assets/sounds/soundboard/call-of-the-witch.mp3
deleted file mode 100644
index bcf14404..00000000
Binary files a/assets/sounds/soundboard/call-of-the-witch.mp3 and /dev/null differ
diff --git a/assets/sounds/soundboard/car-crash.mp3 b/assets/sounds/soundboard/car-crash.mp3
index 8d05ef42..637993ce 100644
Binary files a/assets/sounds/soundboard/car-crash.mp3 and b/assets/sounds/soundboard/car-crash.mp3 differ
diff --git a/assets/sounds/soundboard/cow.mp3 b/assets/sounds/soundboard/cow.mp3
index cc47634a..b4eb8cf2 100644
Binary files a/assets/sounds/soundboard/cow.mp3 and b/assets/sounds/soundboard/cow.mp3 differ
diff --git a/assets/sounds/soundboard/dun-dun-dun.mp3 b/assets/sounds/soundboard/dun-dun-dun.mp3
index c3037f8b..205f0e37 100644
Binary files a/assets/sounds/soundboard/dun-dun-dun.mp3 and b/assets/sounds/soundboard/dun-dun-dun.mp3 differ
diff --git a/assets/sounds/soundboard/electric-zoo.mp3 b/assets/sounds/soundboard/electric-zoo.mp3
deleted file mode 100644
index 0e47659f..00000000
Binary files a/assets/sounds/soundboard/electric-zoo.mp3 and /dev/null differ
diff --git a/assets/sounds/soundboard/error.mp3 b/assets/sounds/soundboard/error.mp3
deleted file mode 100644
index e2f8bd11..00000000
Binary files a/assets/sounds/soundboard/error.mp3 and /dev/null differ
diff --git a/assets/sounds/soundboard/fbi-open-up.mp3 b/assets/sounds/soundboard/fbi-open-up.mp3
deleted file mode 100644
index 13678080..00000000
Binary files a/assets/sounds/soundboard/fbi-open-up.mp3 and /dev/null differ
diff --git a/assets/sounds/soundboard/hello-there.mp3 b/assets/sounds/soundboard/hello-there.mp3
deleted file mode 100644
index 6e66fc4e..00000000
Binary files a/assets/sounds/soundboard/hello-there.mp3 and /dev/null differ
diff --git a/assets/sounds/soundboard/here-we-go-again.mp3 b/assets/sounds/soundboard/here-we-go-again.mp3
deleted file mode 100644
index aa766cef..00000000
Binary files a/assets/sounds/soundboard/here-we-go-again.mp3 and /dev/null differ
diff --git a/assets/sounds/soundboard/laugh-track.mp3 b/assets/sounds/soundboard/laugh-track.mp3
index 270fdf3f..d7be2564 100644
Binary files a/assets/sounds/soundboard/laugh-track.mp3 and b/assets/sounds/soundboard/laugh-track.mp3 differ
diff --git a/assets/sounds/soundboard/my-swamp.mp3 b/assets/sounds/soundboard/my-swamp.mp3
deleted file mode 100644
index d235a7cf..00000000
Binary files a/assets/sounds/soundboard/my-swamp.mp3 and /dev/null differ
diff --git a/assets/sounds/soundboard/noot-noot.mp3 b/assets/sounds/soundboard/noot-noot.mp3
deleted file mode 100644
index f28e922f..00000000
Binary files a/assets/sounds/soundboard/noot-noot.mp3 and /dev/null differ
diff --git a/assets/sounds/soundboard/onee-chan.mp3 b/assets/sounds/soundboard/onee-chan.mp3
deleted file mode 100644
index 30fddf02..00000000
Binary files a/assets/sounds/soundboard/onee-chan.mp3 and /dev/null differ
diff --git a/assets/sounds/soundboard/pikachu.mp3 b/assets/sounds/soundboard/pikachu.mp3
deleted file mode 100644
index a3f940cc..00000000
Binary files a/assets/sounds/soundboard/pikachu.mp3 and /dev/null differ
diff --git a/assets/sounds/soundboard/slow-clap.mp3 b/assets/sounds/soundboard/slow-clap.mp3
index 2ecc2531..4f6f3332 100644
Binary files a/assets/sounds/soundboard/slow-clap.mp3 and b/assets/sounds/soundboard/slow-clap.mp3 differ
diff --git a/assets/sounds/soundboard/steve-hurt.mp3 b/assets/sounds/soundboard/steve-hurt.mp3
deleted file mode 100644
index 38b346bd..00000000
Binary files a/assets/sounds/soundboard/steve-hurt.mp3 and /dev/null differ
diff --git a/assets/sounds/soundboard/subaru-ringtone.mp3 b/assets/sounds/soundboard/subaru-ringtone.mp3
deleted file mode 100644
index 34cf4d08..00000000
Binary files a/assets/sounds/soundboard/subaru-ringtone.mp3 and /dev/null differ
diff --git a/assets/sounds/soundboard/you-got-mail.mp3 b/assets/sounds/soundboard/you-got-mail.mp3
deleted file mode 100644
index eb7e686c..00000000
Binary files a/assets/sounds/soundboard/you-got-mail.mp3 and /dev/null differ
diff --git a/assets/sounds/soundboard/you-what.mp3 b/assets/sounds/soundboard/you-what.mp3
deleted file mode 100644
index 4cdfe771..00000000
Binary files a/assets/sounds/soundboard/you-what.mp3 and /dev/null differ
diff --git a/commands/games-sp/whos-that-pokemon.js b/commands/games-sp/whos-that-pokemon.js
index 491dd023..dbc06d8c 100644
--- a/commands/games-sp/whos-that-pokemon.js
+++ b/commands/games-sp/whos-that-pokemon.js
@@ -25,6 +25,11 @@ module.exports = class WhosThatPokemonCommand extends Command {
 					url: 'https://www.pokemon.com/us/',
 					reason: 'Images, Original Game'
 				},
+				{
+					name: '4Kids',
+					url: 'https://www.4kidsentertainmentinc.com/',
+					reason: '"Who\'s That Pokémon?" Sound'
+				},
 				{
 					name: 'PokéAPI',
 					url: 'https://pokeapi.co/',
diff --git a/commands/voice/soundboard.js b/commands/voice/soundboard.js
index d8e6cb19..555e4fc1 100644
--- a/commands/voice/soundboard.js
+++ b/commands/voice/soundboard.js
@@ -2,6 +2,7 @@ const Command = require('../../structures/Command');
 const path = require('path');
 const { list, reactIfAble } = require('../../util/Util');
 const sounds = require('../../assets/json/soundboard');
+const soundsChoice = sounds.map(sound => sound[sounds.length - 1].replace(/\.mp3$/, ''));
 
 module.exports = class SoundboardCommand extends Command {
 	constructor(client) {
@@ -18,45 +19,93 @@ module.exports = class SoundboardCommand extends Command {
 			},
 			userPermissions: ['CONNECT', 'SPEAK'],
 			credit: [
-				{
-					name: 'Pokémon',
-					url: 'https://www.pokemon.com/us/',
-					reason: 'Pikachu Sound'
-				},
 				{
 					name: '07th Expansion',
 					url: 'http://07th-expansion.net/',
 					reason: 'Nipah Sound'
 				},
 				{
-					name: 'KINMOZA!',
-					url: 'http://www.kinmosa.com/',
-					reason: 'Ayaya Sound'
+					name: 'UncleKornicob',
+					url: 'http://soundbible.com/',
+					reason: 'Alarm Sound',
+					reasonURL: 'http://soundbible.com/1787-Annoying-Alarm-Clock.html'
 				},
 				{
-					name: 'Robret Henc',
-					url: 'https://www.youtube.com/channel/UCYz0kLfJbdNHU9baJy6u68A',
-					reason: 'Subaru Ringtone Sound',
-					reasonURL: 'https://www.youtube.com/watch?v=PEyKDgOTQi8'
+					name: 'Mike Koenig',
+					url: 'http://soundbible.com/',
+					reason: 'Rooster Sound',
+					reasonURL: 'http://soundbible.com/1218-Rooster-Crow.html'
 				},
 				{
-					name: 'Myinstants',
-					url: 'https://www.myinstants.com/index/us/',
-					reason: 'Various Meme Sounds',
-					reasonURL: 'https://www.myinstants.com/search/?name=meme'
+					name: 'Mike Koenig',
+					url: 'http://soundbible.com/',
+					reason: 'Cow Sound',
+					reasonURL: 'http://soundbible.com/1778-Cow-Moo.html'
+				},
+				{
+					name: 'Cam Martinez',
+					url: 'http://soundbible.com/',
+					reason: 'Car Crash Sound',
+					reasonURL: 'http://soundbible.com/1757-Car-Brake-Crash.html'
+				},
+				{
+					name: 'Orange Free Sounds',
+					url: 'http://www.orangefreesounds.com/',
+					reason: 'Dun Dun Dun Sound',
+					reasonURL: 'http://www.orangefreesounds.com/dun-dun-dun-sound-effect-brass/'
+				},
+				{
+					name: 'Apple',
+					url: 'https://www.apple.com/',
+					reason: 'Cat Sound'
+				},
+				{
+					name: 'GRSites',
+					url: 'http://www.grsites.com/',
+					reason: 'Laugh Track Sound',
+					reasonURL: 'http://www.grsites.com/archive/sounds/category/8/'
+				},
+				{
+					name: 'Jeopardy',
+					url: 'https://www.jeopardy.com/',
+					reason: 'Jeopardy Sound'
+				},
+				{
+					name: '4Kids',
+					url: 'https://www.4kidsentertainmentinc.com/',
+					reason: 'Who\'s That Pokémon Sound'
+				},
+				{
+					name: 'Over the Green Fields',
+					url: 'https://asianwiki.com/Over_the_Green_Fields',
+					reason: 'Sad Violin Sound'
+				},
+				{
+					name: 'Valve',
+					url: 'https://www.valvesoftware.com/en/',
+					reasonURL: 'http://www.thinkwithportals.com/',
+					reason: 'Slow Clap Sound'
+				},
+				{
+					name: 'Microsoft',
+					url: 'https://www.microsoft.com/en-us',
+					reason: 'Windows Start Up Sound'
 				}
 			],
 			args: [
 				{
 					key: 'sound',
-					prompt: `What sound do you want to play? Either ${list(sounds, 'or')}.`,
+					prompt: `What sound do you want to play? Either ${list(soundsChoice, 'or')}.`,
 					type: 'string',
 					validate: sound => {
 						const choice = sound.toLowerCase().replaceAll(' ', '-');
-						if (sounds.includes(choice)) return true;
-						return `You provided an invalid sound. Please choose either ${list(sounds, 'or')}.`;
+						if (soundsChoice.includes(choice)) return true;
+						return `You provided an invalid sound. Please choose either ${list(soundsChoice, 'or')}.`;
 					},
-					parse: sound => `${sound.toLowerCase().replaceAll(' ', '-')}.mp3`
+					parse: sound => {
+						const choice = sound.toLowerCase().replaceAll(' ', '-');
+						return sounds.find(snd => snd.includes(`${choice}.mp3`));
+					}
 				}
 			]
 		});
@@ -68,7 +117,7 @@ module.exports = class SoundboardCommand extends Command {
 			const usage = this.client.registry.commands.get('join').usage();
 			return msg.reply(`I am not in a voice channel. Use ${usage} to fix that!`);
 		}
-		connection.play(path.join(__dirname, '..', '..', 'assets', 'sounds', 'soundboard', sound));
+		connection.play(path.join(__dirname, '..', '..', 'assets', 'sounds', ...sound));
 		await reactIfAble(msg, this.client.user, '🔉');
 		return null;
 	}
diff --git a/package.json b/package.json
index d16f495f..e07bc0f2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "122.1.0",
+	"version": "123.0.0",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {