diff --git a/assets/images/xiao/2Kiz3Jq.jpg b/assets/images/xiao/2Kiz3Jq.jpg
deleted file mode 100644
index 65c952ba..00000000
Binary files a/assets/images/xiao/2Kiz3Jq.jpg and /dev/null differ
diff --git a/assets/images/xiao/DyW1DJ0.jpg b/assets/images/xiao/Akiyoshi Haru.jpg
similarity index 100%
rename from assets/images/xiao/DyW1DJ0.jpg
rename to assets/images/xiao/Akiyoshi Haru.jpg
diff --git a/assets/images/xiao/GlZZSsK.jpg b/assets/images/xiao/GlZZSsK.jpg
deleted file mode 100644
index a1d9c0f3..00000000
Binary files a/assets/images/xiao/GlZZSsK.jpg and /dev/null differ
diff --git a/assets/images/xiao/MNL5ieg.png b/assets/images/xiao/MNL5ieg.png
deleted file mode 100644
index f9c9e51f..00000000
Binary files a/assets/images/xiao/MNL5ieg.png and /dev/null differ
diff --git a/assets/images/xiao/IQIMmZV.jpg b/assets/images/xiao/deviant-innervalue.jpg
similarity index 100%
rename from assets/images/xiao/IQIMmZV.jpg
rename to assets/images/xiao/deviant-innervalue.jpg
diff --git a/assets/images/xiao/8WdAvPk.jpg b/assets/images/xiao/official-1.jpg
similarity index 100%
rename from assets/images/xiao/8WdAvPk.jpg
rename to assets/images/xiao/official-1.jpg
diff --git a/assets/images/xiao/guJ29wp.png b/assets/images/xiao/official-2.png
similarity index 100%
rename from assets/images/xiao/guJ29wp.png
rename to assets/images/xiao/official-2.png
diff --git a/assets/images/xiao/iPidJ1s.jpg b/assets/images/xiao/official-3.jpg
similarity index 100%
rename from assets/images/xiao/iPidJ1s.jpg
rename to assets/images/xiao/official-3.jpg
diff --git a/assets/images/xiao/kG6Qp9U.jpg b/assets/images/xiao/official-4.jpg
similarity index 100%
rename from assets/images/xiao/kG6Qp9U.jpg
rename to assets/images/xiao/official-4.jpg
diff --git a/assets/images/xiao/piu8UXR.jpg b/assets/images/xiao/official-5.jpg
similarity index 100%
rename from assets/images/xiao/piu8UXR.jpg
rename to assets/images/xiao/official-5.jpg
diff --git a/assets/images/xiao/qZYuM84.jpg b/assets/images/xiao/official-6.jpg
similarity index 100%
rename from assets/images/xiao/qZYuM84.jpg
rename to assets/images/xiao/official-6.jpg
diff --git a/assets/images/xiao/w2rmDfM.jpg b/assets/images/xiao/official-7.jpg
similarity index 100%
rename from assets/images/xiao/w2rmDfM.jpg
rename to assets/images/xiao/official-7.jpg
diff --git a/assets/images/xiao/yvBlxxP.png b/assets/images/xiao/official-8.png
similarity index 100%
rename from assets/images/xiao/yvBlxxP.png
rename to assets/images/xiao/official-8.png
diff --git a/assets/images/xiao/zqXl6TB.gif b/assets/images/xiao/official-9.gif
similarity index 100%
rename from assets/images/xiao/zqXl6TB.gif
rename to assets/images/xiao/official-9.gif
diff --git a/assets/images/xiao/DcTADmq.jpg b/assets/images/xiao/pixiv-25938045.jpg
similarity index 100%
rename from assets/images/xiao/DcTADmq.jpg
rename to assets/images/xiao/pixiv-25938045.jpg
diff --git a/assets/images/xiao/HLJXkQk.jpg b/assets/images/xiao/pixiv-25995271.jpg
similarity index 100%
rename from assets/images/xiao/HLJXkQk.jpg
rename to assets/images/xiao/pixiv-25995271.jpg
diff --git a/assets/images/xiao/YqZmeyA.jpg b/assets/images/xiao/pixiv-27510500.jpg
similarity index 100%
rename from assets/images/xiao/YqZmeyA.jpg
rename to assets/images/xiao/pixiv-27510500.jpg
diff --git a/assets/images/xiao/3.jpg b/assets/images/xiao/pixiv-28759018.jpg
similarity index 100%
rename from assets/images/xiao/3.jpg
rename to assets/images/xiao/pixiv-28759018.jpg
diff --git a/assets/images/xiao/wneFRY7.jpg b/assets/images/xiao/pixiv-29365843.jpg
similarity index 100%
rename from assets/images/xiao/wneFRY7.jpg
rename to assets/images/xiao/pixiv-29365843.jpg
diff --git a/assets/images/xiao/AXHAdsu.jpg b/assets/images/xiao/pixiv-29396158.jpg
similarity index 100%
rename from assets/images/xiao/AXHAdsu.jpg
rename to assets/images/xiao/pixiv-29396158.jpg
diff --git a/assets/images/xiao/oaC7wKG.jpg b/assets/images/xiao/pixiv-29843016.jpg
similarity index 100%
rename from assets/images/xiao/oaC7wKG.jpg
rename to assets/images/xiao/pixiv-29843016.jpg
diff --git a/assets/images/xiao/hstWdiN.jpg b/assets/images/xiao/pixiv-30089637.jpg
similarity index 100%
rename from assets/images/xiao/hstWdiN.jpg
rename to assets/images/xiao/pixiv-30089637.jpg
diff --git a/assets/images/xiao/a4TsRS1.jpg b/assets/images/xiao/pixiv-32640555.jpg
similarity index 100%
rename from assets/images/xiao/a4TsRS1.jpg
rename to assets/images/xiao/pixiv-32640555.jpg
diff --git a/assets/images/xiao/SzimCMB.jpg b/assets/images/xiao/pixiv-33874936.jpg
similarity index 100%
rename from assets/images/xiao/SzimCMB.jpg
rename to assets/images/xiao/pixiv-33874936.jpg
diff --git a/assets/images/xiao/RFSSvbE.jpg b/assets/images/xiao/pixiv-33966946.jpg
similarity index 100%
rename from assets/images/xiao/RFSSvbE.jpg
rename to assets/images/xiao/pixiv-33966946.jpg
diff --git a/assets/images/xiao/abNJ8FT.jpg b/assets/images/xiao/pixiv-34299275.jpg
similarity index 100%
rename from assets/images/xiao/abNJ8FT.jpg
rename to assets/images/xiao/pixiv-34299275.jpg
diff --git a/assets/images/xiao/otIT53z.jpg b/assets/images/xiao/pixiv-35201464.jpg
similarity index 100%
rename from assets/images/xiao/otIT53z.jpg
rename to assets/images/xiao/pixiv-35201464.jpg
diff --git a/assets/images/xiao/lV39HXw.jpg b/assets/images/xiao/pixiv-37350694.jpg
similarity index 100%
rename from assets/images/xiao/lV39HXw.jpg
rename to assets/images/xiao/pixiv-37350694.jpg
diff --git a/assets/images/xiao/JK66QjX.jpg b/assets/images/xiao/pixiv-39514561.jpg
similarity index 100%
rename from assets/images/xiao/JK66QjX.jpg
rename to assets/images/xiao/pixiv-39514561.jpg
diff --git a/assets/images/xiao/gKDJiyO.jpg b/assets/images/xiao/pixiv-40915996.jpg
similarity index 100%
rename from assets/images/xiao/gKDJiyO.jpg
rename to assets/images/xiao/pixiv-40915996.jpg
diff --git a/assets/images/xiao/Ih2Fbbh.png b/assets/images/xiao/pixiv-43432823.png
similarity index 100%
rename from assets/images/xiao/Ih2Fbbh.png
rename to assets/images/xiao/pixiv-43432823.png
diff --git a/assets/images/xiao/x8cA0Mw.jpg b/assets/images/xiao/pixiv-45449883-2.jpg
similarity index 100%
rename from assets/images/xiao/x8cA0Mw.jpg
rename to assets/images/xiao/pixiv-45449883-2.jpg
diff --git a/assets/images/xiao/fFsF6m7.jpg b/assets/images/xiao/pixiv-45449883.jpg
similarity index 100%
rename from assets/images/xiao/fFsF6m7.jpg
rename to assets/images/xiao/pixiv-45449883.jpg
diff --git a/assets/images/xiao/iB6durw.png b/assets/images/xiao/unknown-1.png
similarity index 100%
rename from assets/images/xiao/iB6durw.png
rename to assets/images/xiao/unknown-1.png
diff --git a/assets/images/xiao/CGUjwHS.jpg b/assets/images/xiao/unknown-2.jpg
similarity index 100%
rename from assets/images/xiao/CGUjwHS.jpg
rename to assets/images/xiao/unknown-2.jpg
diff --git a/assets/images/xiao/DC4dIf1.jpg b/assets/images/xiao/unknown-3.jpg
similarity index 100%
rename from assets/images/xiao/DC4dIf1.jpg
rename to assets/images/xiao/unknown-3.jpg
diff --git a/commands/random-img/xiao.js b/commands/random-img/xiao.js
index 385da40e..86cf979f 100644
--- a/commands/random-img/xiao.js
+++ b/commands/random-img/xiao.js
@@ -2,6 +2,7 @@ const Command = require('../../framework/Command');
 const fs = require('fs');
 const path = require('path');
 const images = fs.readdirSync(path.join(__dirname, '..', '..', 'assets', 'images', 'xiao'));
+const sourceRegex = /([A-Z ]+)-?([0-9A-Z]+)?(-[0-9]+)?(\.[A-Z])?/i;
 
 module.exports = class XiaoCommand extends Command {
 	constructor(client) {
@@ -25,6 +26,18 @@ module.exports = class XiaoCommand extends Command {
 
 	run(msg) {
 		const image = images[Math.floor(Math.random() * images.length)];
-		return msg.say({ files: [path.join(__dirname, '..', '..', 'assets', 'images', 'xiao', image)] });
+		return msg.say(this.getSource(image), {
+			files: [path.join(__dirname, '..', '..', 'assets', 'images', 'xiao', image)]
+		});
+	}
+
+	getSource(img) {
+		const source = img.match(sourceRegex);
+		const site = source[1];
+		if (site === 'unknown') return 'Artist Unknown';
+		if (site === 'official') return 'Official Art';
+		if (site === 'deviant') return `Art by <https://www.deviantart.com/${source[2]}>`;
+		if (site === 'pixiv') return `Art Source: <https://www.pixiv.net/en/artworks/${source[2]}>`;
+		return `Art by ${site}`;
 	}
 };