diff --git a/assets/images/esrb/AO.png b/assets/images/esrb/AO.png
deleted file mode 100644
index 174a753e..00000000
Binary files a/assets/images/esrb/AO.png and /dev/null differ
diff --git a/assets/images/esrb/E.png b/assets/images/esrb/E.png
deleted file mode 100644
index c541843a..00000000
Binary files a/assets/images/esrb/E.png and /dev/null differ
diff --git a/assets/images/esrb/E10plus.png b/assets/images/esrb/E10plus.png
deleted file mode 100644
index aa1dbeb5..00000000
Binary files a/assets/images/esrb/E10plus.png and /dev/null differ
diff --git a/assets/images/esrb/M.png b/assets/images/esrb/M.png
deleted file mode 100644
index 71ee8a6b..00000000
Binary files a/assets/images/esrb/M.png and /dev/null differ
diff --git a/assets/images/esrb/RP.png b/assets/images/esrb/RP.png
deleted file mode 100644
index a8063f97..00000000
Binary files a/assets/images/esrb/RP.png and /dev/null differ
diff --git a/assets/images/esrb/T.png b/assets/images/esrb/T.png
deleted file mode 100644
index 74e54bfa..00000000
Binary files a/assets/images/esrb/T.png and /dev/null differ
diff --git a/assets/images/fire/frame-0.gif b/assets/images/fire/frame-0.gif
new file mode 100644
index 00000000..d2b83413
Binary files /dev/null and b/assets/images/fire/frame-0.gif differ
diff --git a/assets/images/fire/frame-00.png b/assets/images/fire/frame-00.png
deleted file mode 100644
index f7504883..00000000
Binary files a/assets/images/fire/frame-00.png and /dev/null differ
diff --git a/assets/images/fire/frame-02.png b/assets/images/fire/frame-02.png
deleted file mode 100644
index 4b98e96f..00000000
Binary files a/assets/images/fire/frame-02.png and /dev/null differ
diff --git a/assets/images/fire/frame-04.png b/assets/images/fire/frame-04.png
deleted file mode 100644
index 6d696102..00000000
Binary files a/assets/images/fire/frame-04.png and /dev/null differ
diff --git a/assets/images/fire/frame-06.png b/assets/images/fire/frame-06.png
deleted file mode 100644
index 956a6c72..00000000
Binary files a/assets/images/fire/frame-06.png and /dev/null differ
diff --git a/assets/images/fire/frame-08.png b/assets/images/fire/frame-08.png
deleted file mode 100644
index 417e5f63..00000000
Binary files a/assets/images/fire/frame-08.png and /dev/null differ
diff --git a/assets/images/fire/frame-1.gif b/assets/images/fire/frame-1.gif
new file mode 100644
index 00000000..ebb0b1f5
Binary files /dev/null and b/assets/images/fire/frame-1.gif differ
diff --git a/assets/images/fire/frame-10.gif b/assets/images/fire/frame-10.gif
new file mode 100644
index 00000000..e3f433da
Binary files /dev/null and b/assets/images/fire/frame-10.gif differ
diff --git a/assets/images/fire/frame-10.png b/assets/images/fire/frame-10.png
deleted file mode 100644
index 281a602a..00000000
Binary files a/assets/images/fire/frame-10.png and /dev/null differ
diff --git a/assets/images/fire/frame-11.gif b/assets/images/fire/frame-11.gif
new file mode 100644
index 00000000..630e162d
Binary files /dev/null and b/assets/images/fire/frame-11.gif differ
diff --git a/assets/images/fire/frame-12.gif b/assets/images/fire/frame-12.gif
new file mode 100644
index 00000000..211f119d
Binary files /dev/null and b/assets/images/fire/frame-12.gif differ
diff --git a/assets/images/fire/frame-12.png b/assets/images/fire/frame-12.png
deleted file mode 100644
index 64b5035c..00000000
Binary files a/assets/images/fire/frame-12.png and /dev/null differ
diff --git a/assets/images/fire/frame-13.gif b/assets/images/fire/frame-13.gif
new file mode 100644
index 00000000..7849bdb9
Binary files /dev/null and b/assets/images/fire/frame-13.gif differ
diff --git a/assets/images/fire/frame-14.gif b/assets/images/fire/frame-14.gif
new file mode 100644
index 00000000..cf9631b5
Binary files /dev/null and b/assets/images/fire/frame-14.gif differ
diff --git a/assets/images/fire/frame-14.png b/assets/images/fire/frame-14.png
deleted file mode 100644
index 8ccb800f..00000000
Binary files a/assets/images/fire/frame-14.png and /dev/null differ
diff --git a/assets/images/fire/frame-15.gif b/assets/images/fire/frame-15.gif
new file mode 100644
index 00000000..f586dbee
Binary files /dev/null and b/assets/images/fire/frame-15.gif differ
diff --git a/assets/images/fire/frame-16.gif b/assets/images/fire/frame-16.gif
new file mode 100644
index 00000000..1bbab459
Binary files /dev/null and b/assets/images/fire/frame-16.gif differ
diff --git a/assets/images/fire/frame-16.png b/assets/images/fire/frame-16.png
deleted file mode 100644
index cd4681c9..00000000
Binary files a/assets/images/fire/frame-16.png and /dev/null differ
diff --git a/assets/images/fire/frame-17.gif b/assets/images/fire/frame-17.gif
new file mode 100644
index 00000000..2a822131
Binary files /dev/null and b/assets/images/fire/frame-17.gif differ
diff --git a/assets/images/fire/frame-18.gif b/assets/images/fire/frame-18.gif
new file mode 100644
index 00000000..4c699955
Binary files /dev/null and b/assets/images/fire/frame-18.gif differ
diff --git a/assets/images/fire/frame-18.png b/assets/images/fire/frame-18.png
deleted file mode 100644
index 07524462..00000000
Binary files a/assets/images/fire/frame-18.png and /dev/null differ
diff --git a/assets/images/fire/frame-19.gif b/assets/images/fire/frame-19.gif
new file mode 100644
index 00000000..cb3c51a1
Binary files /dev/null and b/assets/images/fire/frame-19.gif differ
diff --git a/assets/images/fire/frame-2.gif b/assets/images/fire/frame-2.gif
new file mode 100644
index 00000000..6ba5be76
Binary files /dev/null and b/assets/images/fire/frame-2.gif differ
diff --git a/assets/images/fire/frame-20.gif b/assets/images/fire/frame-20.gif
new file mode 100644
index 00000000..2b817508
Binary files /dev/null and b/assets/images/fire/frame-20.gif differ
diff --git a/assets/images/fire/frame-20.png b/assets/images/fire/frame-20.png
deleted file mode 100644
index 606d0bba..00000000
Binary files a/assets/images/fire/frame-20.png and /dev/null differ
diff --git a/assets/images/fire/frame-21.gif b/assets/images/fire/frame-21.gif
new file mode 100644
index 00000000..b921c600
Binary files /dev/null and b/assets/images/fire/frame-21.gif differ
diff --git a/assets/images/fire/frame-22.gif b/assets/images/fire/frame-22.gif
new file mode 100644
index 00000000..a1c5e7f9
Binary files /dev/null and b/assets/images/fire/frame-22.gif differ
diff --git a/assets/images/fire/frame-22.png b/assets/images/fire/frame-22.png
deleted file mode 100644
index 32ff7ba5..00000000
Binary files a/assets/images/fire/frame-22.png and /dev/null differ
diff --git a/assets/images/fire/frame-23.gif b/assets/images/fire/frame-23.gif
new file mode 100644
index 00000000..be983b7b
Binary files /dev/null and b/assets/images/fire/frame-23.gif differ
diff --git a/assets/images/fire/frame-24.gif b/assets/images/fire/frame-24.gif
new file mode 100644
index 00000000..21b62b7d
Binary files /dev/null and b/assets/images/fire/frame-24.gif differ
diff --git a/assets/images/fire/frame-24.png b/assets/images/fire/frame-24.png
deleted file mode 100644
index 4c4ce243..00000000
Binary files a/assets/images/fire/frame-24.png and /dev/null differ
diff --git a/assets/images/fire/frame-25.gif b/assets/images/fire/frame-25.gif
new file mode 100644
index 00000000..781b0da7
Binary files /dev/null and b/assets/images/fire/frame-25.gif differ
diff --git a/assets/images/fire/frame-26.gif b/assets/images/fire/frame-26.gif
new file mode 100644
index 00000000..d60c8d40
Binary files /dev/null and b/assets/images/fire/frame-26.gif differ
diff --git a/assets/images/fire/frame-26.png b/assets/images/fire/frame-26.png
deleted file mode 100644
index 237a15a1..00000000
Binary files a/assets/images/fire/frame-26.png and /dev/null differ
diff --git a/assets/images/fire/frame-27.gif b/assets/images/fire/frame-27.gif
new file mode 100644
index 00000000..34395d81
Binary files /dev/null and b/assets/images/fire/frame-27.gif differ
diff --git a/assets/images/fire/frame-28.gif b/assets/images/fire/frame-28.gif
new file mode 100644
index 00000000..14dddfb1
Binary files /dev/null and b/assets/images/fire/frame-28.gif differ
diff --git a/assets/images/fire/frame-28.png b/assets/images/fire/frame-28.png
deleted file mode 100644
index ab5d5ef0..00000000
Binary files a/assets/images/fire/frame-28.png and /dev/null differ
diff --git a/assets/images/fire/frame-29.gif b/assets/images/fire/frame-29.gif
new file mode 100644
index 00000000..84c9ca21
Binary files /dev/null and b/assets/images/fire/frame-29.gif differ
diff --git a/assets/images/fire/frame-3.gif b/assets/images/fire/frame-3.gif
new file mode 100644
index 00000000..fe0bb4cf
Binary files /dev/null and b/assets/images/fire/frame-3.gif differ
diff --git a/assets/images/fire/frame-30.gif b/assets/images/fire/frame-30.gif
new file mode 100644
index 00000000..3129a219
Binary files /dev/null and b/assets/images/fire/frame-30.gif differ
diff --git a/assets/images/fire/frame-30.png b/assets/images/fire/frame-30.png
deleted file mode 100644
index df8cc113..00000000
Binary files a/assets/images/fire/frame-30.png and /dev/null differ
diff --git a/assets/images/fire/frame-31.gif b/assets/images/fire/frame-31.gif
new file mode 100644
index 00000000..f73469bb
Binary files /dev/null and b/assets/images/fire/frame-31.gif differ
diff --git a/assets/images/fire/frame-32.gif b/assets/images/fire/frame-32.gif
new file mode 100644
index 00000000..d1594a71
Binary files /dev/null and b/assets/images/fire/frame-32.gif differ
diff --git a/assets/images/fire/frame-33.gif b/assets/images/fire/frame-33.gif
new file mode 100644
index 00000000..8ab4c0f0
Binary files /dev/null and b/assets/images/fire/frame-33.gif differ
diff --git a/assets/images/fire/frame-34.gif b/assets/images/fire/frame-34.gif
new file mode 100644
index 00000000..008ca0b8
Binary files /dev/null and b/assets/images/fire/frame-34.gif differ
diff --git a/assets/images/fire/frame-35.gif b/assets/images/fire/frame-35.gif
new file mode 100644
index 00000000..fd16b14f
Binary files /dev/null and b/assets/images/fire/frame-35.gif differ
diff --git a/assets/images/fire/frame-36.gif b/assets/images/fire/frame-36.gif
new file mode 100644
index 00000000..4c97d340
Binary files /dev/null and b/assets/images/fire/frame-36.gif differ
diff --git a/assets/images/fire/frame-37.gif b/assets/images/fire/frame-37.gif
new file mode 100644
index 00000000..42d3e206
Binary files /dev/null and b/assets/images/fire/frame-37.gif differ
diff --git a/assets/images/fire/frame-38.gif b/assets/images/fire/frame-38.gif
new file mode 100644
index 00000000..8f92c144
Binary files /dev/null and b/assets/images/fire/frame-38.gif differ
diff --git a/assets/images/fire/frame-39.gif b/assets/images/fire/frame-39.gif
new file mode 100644
index 00000000..f4a049fa
Binary files /dev/null and b/assets/images/fire/frame-39.gif differ
diff --git a/assets/images/fire/frame-4.gif b/assets/images/fire/frame-4.gif
new file mode 100644
index 00000000..a3a382f0
Binary files /dev/null and b/assets/images/fire/frame-4.gif differ
diff --git a/assets/images/fire/frame-40.gif b/assets/images/fire/frame-40.gif
new file mode 100644
index 00000000..b5c46ae1
Binary files /dev/null and b/assets/images/fire/frame-40.gif differ
diff --git a/assets/images/fire/frame-41.gif b/assets/images/fire/frame-41.gif
new file mode 100644
index 00000000..7bb025dc
Binary files /dev/null and b/assets/images/fire/frame-41.gif differ
diff --git a/assets/images/fire/frame-42.gif b/assets/images/fire/frame-42.gif
new file mode 100644
index 00000000..b05472d5
Binary files /dev/null and b/assets/images/fire/frame-42.gif differ
diff --git a/assets/images/fire/frame-43.gif b/assets/images/fire/frame-43.gif
new file mode 100644
index 00000000..ba7b469d
Binary files /dev/null and b/assets/images/fire/frame-43.gif differ
diff --git a/assets/images/fire/frame-44.gif b/assets/images/fire/frame-44.gif
new file mode 100644
index 00000000..e32aa0af
Binary files /dev/null and b/assets/images/fire/frame-44.gif differ
diff --git a/assets/images/fire/frame-45.gif b/assets/images/fire/frame-45.gif
new file mode 100644
index 00000000..70bb62d3
Binary files /dev/null and b/assets/images/fire/frame-45.gif differ
diff --git a/assets/images/fire/frame-5.gif b/assets/images/fire/frame-5.gif
new file mode 100644
index 00000000..626930a5
Binary files /dev/null and b/assets/images/fire/frame-5.gif differ
diff --git a/assets/images/fire/frame-6.gif b/assets/images/fire/frame-6.gif
new file mode 100644
index 00000000..364b7b0d
Binary files /dev/null and b/assets/images/fire/frame-6.gif differ
diff --git a/assets/images/fire/frame-7.gif b/assets/images/fire/frame-7.gif
new file mode 100644
index 00000000..873f006a
Binary files /dev/null and b/assets/images/fire/frame-7.gif differ
diff --git a/assets/images/fire/frame-8.gif b/assets/images/fire/frame-8.gif
new file mode 100644
index 00000000..7ca4a133
Binary files /dev/null and b/assets/images/fire/frame-8.gif differ
diff --git a/assets/images/fire/frame-9.gif b/assets/images/fire/frame-9.gif
new file mode 100644
index 00000000..f5574da7
Binary files /dev/null and b/assets/images/fire/frame-9.gif differ
diff --git a/assets/images/steam-now-playing-classic.png b/assets/images/steam-now-playing-classic.png
deleted file mode 100644
index db79b440..00000000
Binary files a/assets/images/steam-now-playing-classic.png and /dev/null differ
diff --git a/assets/json/trainer-card.json b/assets/json/trainer-card.json
deleted file mode 100644
index 7871e148..00000000
--- a/assets/json/trainer-card.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"styles": {
-		"default": 3,
-		"black": 50,
-		"collector": 96,
-		"dp": 5,
-		"purple": 43
-	},
-	"characters": {
-		"ash": 13,
-		"red": 922,
-		"ethan": 900,
-		"lyra": 901,
-		"brendan": 241,
-		"may": 255,
-		"lucas": 747,
-		"dawn": 856
-	},
-	"badges": {
-		"kanto": [2, 3, 4, 5, 6, 7, 8, 9],
-		"johto": [10, 11, 12, 13, 14, 15, 16, 17],
-		"hoenn": [18, 19, 20, 21, 22, 23, 24, 25],
-		"sinnoh": [26, 27, 28, 29, 30, 31, 32, 33],
-		"unova": [34, 35, 36, 37, 38, 39, 40, 41],
-		"kalos": [44, 45, 46, 47, 48, 49, 50, 51]
-	}
-}
diff --git a/commands/edit-avatar/fire.js b/commands/edit-avatar/fire.js
index 8ba68c49..04472880 100644
--- a/commands/edit-avatar/fire.js
+++ b/commands/edit-avatar/fire.js
@@ -5,7 +5,7 @@ const request = require('node-superfetch');
 const path = require('path');
 const { streamToArray } = require('../../util/Util');
 const { drawImageWithTint } = require('../../util/Canvas');
-const frameCount = 31;
+const frameCount = 46;
 
 module.exports = class FireCommand extends Command {
 	constructor(client) {
@@ -52,9 +52,8 @@ module.exports = class FireCommand extends Command {
 			encoder.setRepeat(0);
 			encoder.setDelay(100);
 			encoder.setQuality(200);
-			for (let i = 0; i < frameCount; i += 2) {
-				const frameID = `frame-${i.toString().padStart(2, '0')}.png`;
-				const frame = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'fire', frameID));
+			for (let i = 0; i < frameCount; i++) {
+				const frame = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'fire', `frame-${i}.png`));
 				const ratio = frame.width / frame.height;
 				const height = Math.round(avatar.width / ratio);
 				drawImageWithTint(ctx, avatar, '#fc671e', 0, 0, avatar.width, avatar.height);