diff --git a/commands/admin/ban.js b/commands/admin/ban.js
index 0eadb577..46a170e2 100644
--- a/commands/admin/ban.js
+++ b/commands/admin/ban.js
@@ -5,7 +5,6 @@ class BanCommand extends Command {
 		super('ban', {
 			aliases: ['ban'],
 			category: 'admin',
-			split: 'quote',
 			args: [
 				{
 					id: 'member',
@@ -13,7 +12,8 @@ class BanCommand extends Command {
 				},
 				{
 					id: 'reasons',
-					type: 'string'
+					type: 'string',
+					match: 'rest'
 				}
 			],
 			clientPermissions: ['BAN_MEMBERS'],
diff --git a/commands/admin/kick.js b/commands/admin/kick.js
index a0d940a1..1831da20 100644
--- a/commands/admin/kick.js
+++ b/commands/admin/kick.js
@@ -5,7 +5,6 @@ class KickCommand extends Command {
 		super('kick', {
 			aliases: ['kick'],
 			category: 'admin',
-			split: 'quoted',
 			args: [
 				{
 					id: 'member',
@@ -13,7 +12,8 @@ class KickCommand extends Command {
 				},
 				{
 					id: 'reasons',
-					type: 'string'
+					type: 'string',
+					match: 'rest'
 				}
 			],
 			clientPermissions: ['KICK_MEMBERS'],
diff --git a/commands/owner/botAvatar.js b/commands/owner/botAvatar.js
index 6549c73d..f2f75c68 100644
--- a/commands/owner/botAvatar.js
+++ b/commands/owner/botAvatar.js
@@ -4,14 +4,14 @@ class BotAvatarCommand extends Command {
 	constructor() {
 		super('botavatar', {
 			aliases: ['botavatar', 'bavatar'],
-			split: 'none',
 			category: 'owner',
 			ownerOnly: 'true',
 			args: [
 				{
 					id: 'image',
 					type:'string',
-					optional: true
+					optional: true,
+					match: 'rest'
 				}
 			],
 			description: {
diff --git a/commands/owner/emit.js b/commands/owner/emit.js
index 16ab68e7..af825635 100644
--- a/commands/owner/emit.js
+++ b/commands/owner/emit.js
@@ -4,14 +4,14 @@ class emitCommand extends Command {
 	constructor() {
 		super('emit', {
 			aliases: ['emit'],
-			split: 'none',
 			category: 'owner',
 			ownerOnly: 'true',
 			args: [
 				{
 					id: 'event',
 					prompt: 'Wich event should i trigger?',
-					type: 'string'
+					type: 'string',
+					match: 'rest'
 				}
 			],
 			description: {
diff --git a/commands/owner/eval.js b/commands/owner/eval.js
index 1e8a6a29..f646d16b 100644
--- a/commands/owner/eval.js
+++ b/commands/owner/eval.js
@@ -4,12 +4,12 @@ class EvalCommand extends Command {
 	constructor() {
 		super('eval', {
 			aliases: ['eval'],
-			split: 'none',
 			category: 'owner',
 			args: [
 				{
 					id: 'eval',
-					type: 'string'
+					type: 'string',
+					match: 'rest'
 				}
 			],
 			ownerOnly: 'true',