diff --git a/README.md b/README.md
index fe0d5976..97cbbdb0 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,6 @@ Xiao is a Discord bot coded in JavaScript with
 	* [Meme Generators](#meme-generators)
 	* [Text Manipulation](#text-manipulation)
 	* [Number Manipulation](#number-manipulation)
-	* [NSFW](#nsfw)
 	* [Other](#other)
 	* [Roleplay](#roleplay)
 	* [README Generators](#readme-generators)
@@ -179,6 +178,7 @@ Total: 367
 * **joke:** Responds with a random joke.
 * **karen:** Responds with a random image of Karen.
 * **kiss-marry-kill:** Determines who to kiss, who to marry, and who to kill.
+* **light-novel-cover:** Responds with a randomly generated Light Novel cover. (NSFW)
 * **light-novel-title:** Responds with a randomly generated Light Novel title.
 * **magic-conch:** Asks your question to the Magic Conch.
 * **meme:** Responds with a random meme.
@@ -263,9 +263,11 @@ Total: 367
 * **bulbapedia:** Searches Bulbapedia for your query.
 * **character:** Searches AniList for your query, getting character results.
 * **company:** Responds with the name and logo of a company.
+* **danbooru:** Responds with an image from Danbooru, with optional query. (NSFW)
 * **define:** Defines a word.
 * **derpibooru:** Responds with an image from Derpibooru.
 * **deviantart:** Responds with an image from a DeviantArt section, with optional query.
+* **flickr:** Searches Flickr for your query... Maybe. (NSFW)
 * **frinkiac:** Input a line from the Simpsons to get the episode/season.
 * **giphy:** Searches Giphy for your query.
 * **github:** Responds with information on a GitHub repository.
@@ -325,6 +327,7 @@ Total: 367
 * **age:** Responds with how old someone born in a certain year is.
 * **character-count:** Responds with the character count of text.
 * **chinese-zodiac:** Responds with the Chinese Zodiac Sign for the given year.
+* **dick:** Determines your dick size. (NSFW)
 * **face:** Determines the race, gender, and age of a face.
 * **gender:** Determines the gender of a name.
 * **read-qr-code:** Reads a QR Code.
@@ -371,6 +374,7 @@ Total: 367
 
 * **achievement:** Sends a Minecraft achievement with the text of your choice.
 * **approved:** Draws an "approved" stamp over an image or a user's avatar.
+* **brazzers:** Draws an image with the Brazzers logo in the corner. (NSFW)
 * **circle:** Draws an image or a user's avatar as a circle.
 * **color:** Sends an image of the color you choose.
 * **contrast:** Draws an image or a user's avatar but with contrast.
@@ -505,14 +509,6 @@ Total: 367
 * **scientific-notation:** Converts a number to scientific notation.
 * **units:** Converts units to/from other units.
 
-### NSFW:
-
-* **brazzers:** Draws an image with the Brazzers logo in the corner.
-* **danbooru:** Responds with an image from Danbooru, with optional query.
-* **dick:** Determines your dick size.
-* **flickr:** Searches Flickr for your query... Maybe.
-* **light-novel-cover:** Responds with a randomly generated Light Novel cover.
-
 ### Other:
 
 * **cleverbot:** Talk to Cleverbot. (Owner-Only)
diff --git a/Xiao.js b/Xiao.js
index fe795a26..f0c903c2 100644
--- a/Xiao.js
+++ b/Xiao.js
@@ -32,7 +32,6 @@ client.registry
 		['meme-gen', 'Meme Generators'],
 		['text-edit', 'Text Manipulation'],
 		['number-edit', 'Number Manipulation'],
-		['nsfw', 'NSFW'],
 		['other', 'Other'],
 		['roleplay', 'Roleplay'],
 		['readme', 'README Generators']
diff --git a/commands/nsfw/dick.js b/commands/analyze/dick.js
similarity index 97%
rename from commands/nsfw/dick.js
rename to commands/analyze/dick.js
index 28fef0f7..99ca05a9 100644
--- a/commands/nsfw/dick.js
+++ b/commands/analyze/dick.js
@@ -6,7 +6,7 @@ module.exports = class DickCommand extends Command {
 		super(client, {
 			name: 'dick',
 			aliases: ['dick-size', 'penis', 'penis-size', 'pee-pee', 'pee-pee-size', 'cock', 'cock-size'],
-			group: 'nsfw',
+			group: 'analyze',
 			memberName: 'dick',
 			description: 'Determines your dick size.',
 			nsfw: true,
diff --git a/commands/nsfw/brazzers.js b/commands/image-edit/brazzers.js
similarity index 98%
rename from commands/nsfw/brazzers.js
rename to commands/image-edit/brazzers.js
index 9a20abe8..6c3a8a7d 100644
--- a/commands/nsfw/brazzers.js
+++ b/commands/image-edit/brazzers.js
@@ -7,7 +7,7 @@ module.exports = class BrazzersCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'brazzers',
-			group: 'nsfw',
+			group: 'image-edit',
 			memberName: 'brazzers',
 			description: 'Draws an image with the Brazzers logo in the corner.',
 			nsfw: true,
diff --git a/commands/nsfw/light-novel-cover.js b/commands/random/light-novel-cover.js
similarity index 98%
rename from commands/nsfw/light-novel-cover.js
rename to commands/random/light-novel-cover.js
index d8f3d0b4..6f70bea5 100644
--- a/commands/nsfw/light-novel-cover.js
+++ b/commands/random/light-novel-cover.js
@@ -7,7 +7,7 @@ module.exports = class LightNovelCoverCommand extends Command {
 		super(client, {
 			name: 'light-novel-cover',
 			aliases: ['ln-cover'],
-			group: 'nsfw',
+			group: 'random',
 			memberName: 'light-novel-cover',
 			description: 'Responds with a randomly generated Light Novel cover.',
 			nsfw: true,
diff --git a/commands/readme/generate-commands.js b/commands/readme/generate-commands.js
index 7842ff12..0678af58 100644
--- a/commands/readme/generate-commands.js
+++ b/commands/readme/generate-commands.js
@@ -25,7 +25,7 @@ module.exports = class GenerateCommandsCommand extends Command {
 	async run(msg) {
 		const list = this.client.registry.groups
 			.map(g => `\n### ${g.name}:\n\n${g.commands.filter(c => !c.hidden).map(
-				c => `* **${c.name}:** ${c.description}${c.ownerOnly ? ' (Owner-Only)' : ''}`
+				c => `* **${c.name}:** ${c.description}${c.ownerOnly ? ' (Owner-Only)' : ''}${c.nsfw ? ' (NSFW)' : ''}`
 			).join('\n')}`);
 		const { body } = await request
 			.post('https://hastebin.com/documents')
diff --git a/commands/nsfw/danbooru.js b/commands/search/danbooru.js
similarity index 98%
rename from commands/nsfw/danbooru.js
rename to commands/search/danbooru.js
index e3589328..76a7a7af 100644
--- a/commands/nsfw/danbooru.js
+++ b/commands/search/danbooru.js
@@ -6,7 +6,7 @@ module.exports = class DanbooruCommand extends Command {
 		super(client, {
 			name: 'danbooru',
 			aliases: ['hentai'],
-			group: 'nsfw',
+			group: 'search',
 			memberName: 'danbooru',
 			description: 'Responds with an image from Danbooru, with optional query.',
 			nsfw: true,
diff --git a/commands/nsfw/flickr.js b/commands/search/flickr.js
similarity index 98%
rename from commands/nsfw/flickr.js
rename to commands/search/flickr.js
index dd7ad9f6..ee8bffef 100644
--- a/commands/nsfw/flickr.js
+++ b/commands/search/flickr.js
@@ -6,7 +6,7 @@ module.exports = class FlickrCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'flickr',
-			group: 'nsfw',
+			group: 'search',
 			memberName: 'flickr',
 			description: 'Searches Flickr for your query... Maybe.',
 			nsfw: true,
diff --git a/package.json b/package.json
index 45728afa..8ae95a66 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "112.7.0",
+	"version": "112.7.1",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {