diff --git a/modules/charybdis/charybdis.js b/modules/charybdis/charybdis.js
index 9985610..4e3f936 100644
--- a/modules/charybdis/charybdis.js
+++ b/modules/charybdis/charybdis.js
@@ -22,8 +22,8 @@ var charybdis = function(dbot) {
             }
         }
     };
-    this.commands['~chanserv'].regex = [/^~chanserv (\+.)/, 2]
-    this.commands['~chanmode'].regex = [/^~chanmode (\+.)/, 2]
+    this.commands['~chanserv'].regex = [/^chanserv (\+.)/, 2]
+    this.commands['~chanmode'].regex = [/^chanmode (\+.)/, 2]
 };
 
 exports.fetch = function(dbot) {
diff --git a/modules/crypto/crypto.js b/modules/crypto/crypto.js
index 47fb134..842b720 100644
--- a/modules/crypto/crypto.js
+++ b/modules/crypto/crypto.js
@@ -25,10 +25,10 @@ var crypto = function(dbot) {
         }
     };
 
-    this.commands['~md5'].regex = /^~md5 ([^ ]+)$/;
-    this.commands['~sha1'].regex = /^~sha1 ([^ ]+)$/;
-    this.commands['~sha256'].regex = /^~sha256 ([^ ]+)$/;
-    this.commands['~aes'].regex = /^~aes "(.*)" "(.*)"$/;
+    this.commands['~md5'].regex = /^md5 ([^ ]+)$/;
+    this.commands['~sha1'].regex = /^sha1 ([^ ]+)$/;
+    this.commands['~sha256'].regex = /^sha256 ([^ ]+)$/;
+    this.commands['~aes'].regex = /^aes "(.*)" "(.*)"$/;
 };
 
 exports.fetch = function(dbot) {
diff --git a/modules/dent/dent.js b/modules/dent/dent.js
index bf9bce3..b37f4af 100644
--- a/modules/dent/dent.js
+++ b/modules/dent/dent.js
@@ -53,11 +53,11 @@ var dent = function(dbot) {
             event.reply('Dent posted (probably).');
         }
     };
-    this.commands['~dent'].regex = [/^~dent (.+)$/, 2];
+    this.commands['~dent'].regex = [/^dent (.+)$/, 2];
 
     this.onLoad = function() {
         if(this.config.dentQuotes === true && _.has(dbot.modules, 'quotes')) {
-            dbot.api.event.addHook('~qadd', function(key, text) {
+            dbot.api.event.addHook('qadd', function(key, text) {
                 if(text.indexOf('~~') == -1) {
                     this.api.post(key + ': ' + text);
                 }
diff --git a/modules/flashy/flashy.js b/modules/flashy/flashy.js
index 4a8126b..2922fe4 100644
--- a/modules/flashy/flashy.js
+++ b/modules/flashy/flashy.js
@@ -37,7 +37,7 @@ var flashy = function(dbot) {
         }
     };
 
-    this.commands['~flashy'].regex = [/^~flashy ([^ ]+) (.+)$/, 3];
+    this.commands['~flashy'].regex = [/^flashy ([^ ]+) (.+)$/, 3];
 };
 
 exports.fetch = function(dbot) {
diff --git a/modules/ignore/ignore.js b/modules/ignore/ignore.js
index e87cf2a..25633b0 100644
--- a/modules/ignore/ignore.js
+++ b/modules/ignore/ignore.js
@@ -257,10 +257,10 @@ var ignore = function(dbot) {
         }
     };
 
-    commands['~ban'].regex = [/^~ban ([^ ]+) ([^ ]+)$/, 3];
-    commands['~unban'].regex = [/^~unban ([^ ]+) ([^ ]+)$/, 3];
-    commands['~ignorechannel'].regex = [/^~ignorechannel ([^ ]+) ([^ ]+)$/, 3];
-    commands['~unignorechannel'].regex = [/^~unignorechannel ([^ ]+) ([^ ]+)$/, 3];
+    commands['~ban'].regex = [/^ban ([^ ]+) ([^ ]+)$/, 3];
+    commands['~unban'].regex = [/^unban ([^ ]+) ([^ ]+)$/, 3];
+    commands['~ignorechannel'].regex = [/^ignorechannel ([^ ]+) ([^ ]+)$/, 3];
+    commands['~unignorechannel'].regex = [/^unignorechannel ([^ ]+) ([^ ]+)$/, 3];
 
     commands['~ban'].access = 'moderator';
     commands['~unban'].access = 'moderator';
diff --git a/modules/imdb/imdb.js b/modules/imdb/imdb.js
index 0d5af9d..0010f4b 100644
--- a/modules/imdb/imdb.js
+++ b/modules/imdb/imdb.js
@@ -47,7 +47,7 @@ var imdb = function(dbot) {
             }.bind(this));
         }
     };
-    this.commands['~imdb'].regex = [/^~imdb (.+)$/, 2];
+    this.commands['~imdb'].regex = [/^imdb (.+)$/, 2];
 
     this.onLoad = function() {
         dbot.api.link.addHandler('imdb', /https?:\/\/(www\.)?imdb\.com\/title\/([a-zA-Z0-9]+)/, function(matches, name, callback) {
diff --git a/modules/imgur/imgur.js b/modules/imgur/imgur.js
index a159178..35d28bc 100644
--- a/modules/imgur/imgur.js
+++ b/modules/imgur/imgur.js
@@ -271,7 +271,7 @@ var imgur = function(dbot) {
             }.bind(this));
         }
     }
-    this.commands['~imgur'].regex = [/^~imgur ([\d\w\s-]*)/, 2];
+    this.commands['~imgur'].regex = [/^imgur ([\d\w\s-]*)/, 2];
 
     this.onLoad = function() {
         var imgurHandler = function(matches, name, callback) {
diff --git a/modules/js/js.js b/modules/js/js.js
index 023db38..13e92d7 100644
--- a/modules/js/js.js
+++ b/modules/js/js.js
@@ -37,8 +37,8 @@ var js = function(dbot) {
             }
         }
     };
-    commands['~js'].regex = [/^~js (.*)/, 2];
-    commands['~ajs'].regex = [/^~ajs (.*)/, 2];
+    commands['~js'].regex = [/^js (.*)/, 2];
+    commands['~ajs'].regex = [/^ajs (.*)/, 2];
     commands['~ajs'].access = 'admin';
 
     this.name = 'js';
diff --git a/modules/kick/commands.js b/modules/kick/commands.js
index 91c607c..d015311 100644
--- a/modules/kick/commands.js
+++ b/modules/kick/commands.js
@@ -277,10 +277,10 @@ var commands = function(dbot) {
     commands['~quiet'].access = 'voice';
     commands['~unquiet'].access = 'voice';
 
-    commands['~ckick'].regex = /^~ckick (#[^ ]+ )?([^ ]+) ?(.*)?$/;
-    commands['~nban'].regex = /^~nban ([\d\.^ ]+)?([^ ]+) (.+)$/;
-    commands['~quiet'].regex = /^~quiet ([\d\.^ ]+)?(#[^ ]+ )?([^ ]+) ?(.*)?$/;
-    commands['~unquiet'].regex = /^~unquiet (#[^ ]+ )?([^ ]+) ?$/;
+    commands['~ckick'].regex = /^ckick (#[^ ]+ )?([^ ]+) ?(.*)?$/;
+    commands['~nban'].regex = /^nban ([\d\.^ ]+)?([^ ]+) (.+)$/;
+    commands['~quiet'].regex = /^quiet ([\d\.^ ]+)?(#[^ ]+ )?([^ ]+) ?(.*)?$/;
+    commands['~unquiet'].regex = /^unquiet (#[^ ]+ )?([^ ]+) ?$/;
 
     return commands;
 };
diff --git a/modules/lastfm/lastfm.js b/modules/lastfm/lastfm.js
index 8c7501a..f07f293 100644
--- a/modules/lastfm/lastfm.js
+++ b/modules/lastfm/lastfm.js
@@ -418,8 +418,8 @@ var lastfm = function(dbot) {
             });
         }
     };
-    this.commands['~taste'].regex = [/^~taste ([\d\w[\]{}^|\\`_-]+?)/, 2];
-    this.commands['~artists'].regex = [/^~artists ([\d\w[\]{}^|\\`_-]+?)/, 2];
+    this.commands['~taste'].regex = [/^taste ([\d\w[\]{}^|\\`_-]+?)/, 2];
+    this.commands['~artists'].regex = [/^artists ([\d\w[\]{}^|\\`_-]+?)/, 2];
 
     _.each(this.commands, function(command) {
         command.resolver = function(event, callback) {
diff --git a/modules/link/link.js b/modules/link/link.js
index 7051f05..84fea1a 100644
--- a/modules/link/link.js
+++ b/modules/link/link.js
@@ -141,7 +141,7 @@ var link = function(dbot) {
             });
         }
     };
-    commands['~ud'].regex = [/~ud (.+)/, 2];
+    commands['~ud'].regex = [/ud (.+)/, 2];
     this.commands = commands;
 
     this.listener = function(event) {
diff --git a/modules/poll/commands.js b/modules/poll/commands.js
index 455656f..4a611c7 100644
--- a/modules/poll/commands.js
+++ b/modules/poll/commands.js
@@ -193,12 +193,12 @@ var commands = function(dbot) {
             });
         }
     };
-    commands['~newpoll'].regex = [/~newpoll ([^ ]+) options=([^ ]+) (.+)/, 4];
-    commands['~addoption'].regex = [/~addoption ([^ ]+) ([^ ]+)/, 3];
-    commands['~rmoption'].regex = [/~rmoption ([^ ]+) ([^ ]+)/, 3];
-    commands['~vote'].regex = [/~vote ([^ ]+) ([^ ]+)/, 3];
-    commands['~pdesc'].regex = [/~pdesc ([^ ]+)/, 2];
-    commands['~count'].regex = [/~count ([^ ]+)/, 2];
+    commands['~newpoll'].regex = [/newpoll ([^ ]+) options=([^ ]+) (.+)/, 4];
+    commands['~addoption'].regex = [/addoption ([^ ]+) ([^ ]+)/, 3];
+    commands['~rmoption'].regex = [/rmoption ([^ ]+) ([^ ]+)/, 3];
+    commands['~vote'].regex = [/vote ([^ ]+) ([^ ]+)/, 3];
+    commands['~pdesc'].regex = [/pdesc ([^ ]+)/, 2];
+    commands['~count'].regex = [/count ([^ ]+)/, 2];
 
     return commands;
 };
diff --git a/modules/profile/commands.js b/modules/profile/commands.js
index e33d071..4abd685 100644
--- a/modules/profile/commands.js
+++ b/modules/profile/commands.js
@@ -31,7 +31,7 @@ var commands = function(dbot){
             event.reply(dbot.api.web.getUrl('profile/' + event.server + '/' + user));
         }
     };
-    commands['~set'].regex = [/~set ([^ ]+) (.+)/, 3];
+    commands['~set'].regex = [/set ([^ ]+) (.+)/, 3];
 
     return commands;
 };
diff --git a/modules/quotes/commands.js b/modules/quotes/commands.js
index 0728426..83e596a 100644
--- a/modules/quotes/commands.js
+++ b/modules/quotes/commands.js
@@ -367,15 +367,14 @@ var commands = function(dbot) {
         }
     };
 
-    commands['~'].regex = [/^~([\d\w\s-]*)/, 2];
-    commands['~q'].regex = [/^~q ([\d\w\s-]*)/, 2];
-    commands['~qsearch'].regex = [/^~qsearch ([\d\w\s*-]+?)[ ]?=[ ]?(.+)$/, 3];
-    commands['~rm'].regex = [/^~rm ([\d\w\s-]+?)[ ]?=[ ]?(.+)$/, 3];
-    commands['~rmlast'].regex = [/^~rmlast ([\d\w\s-]*)/, 2];
-    commands['~qadd'].regex = [/^~qadd ([\d\w-]+[\d\w\s-]*)[ ]?=[ ]?(.+)$/, 3];
-    commands['~qrename'].regex = [/^~qrename ([\d\w\s-]+?)[ ]?=[ ]?(.+)$/, 3];
-    commands['~qmerge'].regex = [/^~qmerge ([\d\w\s-]+?)[ ]?=[ ]?(.+)$/, 3];
-    commands['~link'].regex = [/^~link ([\d\w\s-]*)/, 2];
+    commands['~q'].regex = [/^q ([\d\w\s-]*)/, 2];
+    commands['~qsearch'].regex = [/^qsearch ([\d\w\s*-]+?)[ ]?=[ ]?(.+)$/, 3];
+    commands['~rm'].regex = [/^rm ([\d\w\s-]+?)[ ]?=[ ]?(.+)$/, 3];
+    commands['~rmlast'].regex = [/^rmlast ([\d\w\s-]*)/, 2];
+    commands['~qadd'].regex = [/^qadd ([\d\w-]+[\d\w\s-]*)[ ]?=[ ]?(.+)$/, 3];
+    commands['~qrename'].regex = [/^qrename ([\d\w\s-]+?)[ ]?=[ ]?(.+)$/, 3];
+    commands['~qmerge'].regex = [/^qmerge ([\d\w\s-]+?)[ ]?=[ ]?(.+)$/, 3];
+    commands['~link'].regex = [/^link ([\d\w\s-]*)/, 2];
 
     commands['~rmconfirm'].access = 'moderator';
     commands['~rmdeny'].access = 'moderator';
diff --git a/modules/rain/rain.js b/modules/rain/rain.js
index f04c381..96927f3 100644
--- a/modules/rain/rain.js
+++ b/modules/rain/rain.js
@@ -32,7 +32,7 @@ var rain = function(dbot) {
         }
     };
 
-    commands['~rain'].regex = [/~rain (.+)/, 2];
+    commands['~rain'].regex = [/rain (.+)/, 2];
     this.commands = commands;
     this.on = 'PRIVMSG';
 
diff --git a/modules/reddit/reddit.js b/modules/reddit/reddit.js
index 163f52a..5a8c14f 100644
--- a/modules/reddit/reddit.js
+++ b/modules/reddit/reddit.js
@@ -201,8 +201,8 @@ var reddit = function(dbot) {
             }.bind(this));
         }
     };
-    this.commands['~addredditfeed'].regex = [/^~addredditfeed ([^ ]+) ([^ ]+) ([^ ]+)$/, 4];
-    this.commands['~rmredditfeed'].regex = [/^~rmredditfeed ([^ ]+) ([^ ]+)$/, 3];
+    this.commands['~addredditfeed'].regex = [/^addredditfeed ([^ ]+) ([^ ]+) ([^ ]+)$/, 4];
+    this.commands['~rmredditfeed'].regex = [/^rmredditfeed ([^ ]+) ([^ ]+)$/, 3];
     this.commands['~addredditfeed'].access = 'moderator';
     this.commands['~rmredditfeed'].access = 'moderator';
 
diff --git a/modules/report/commands.js b/modules/report/commands.js
index 258e92b..ee45ebf 100644
--- a/modules/report/commands.js
+++ b/modules/report/commands.js
@@ -124,10 +124,10 @@ var commands = function(dbot) {
             }.bind(this));
         }
     };
-    commands['~report'].regex = [/^~report ([^ ]+) ([^ ]+) (.+)$/, 4];
-    commands['~notify'].regex = [/^~notify ([^ ]+) (.+)$/, 3];
-    commands['~nunsub'].regex = [/^~nunsub ([^ ]+)$/, 2];
-    commands['~ununsub'].regex = [/^~ununsub ([^ ]+)$/, 2];
+    commands['~report'].regex = [/^report ([^ ]+) ([^ ]+) (.+)$/, 4];
+    commands['~notify'].regex = [/^notify ([^ ]+) (.+)$/, 3];
+    commands['~nunsub'].regex = [/^nunsub ([^ ]+)$/, 2];
+    commands['~ununsub'].regex = [/^ununsub ([^ ]+)$/, 2];
 
     return commands;
 };
diff --git a/modules/soundcloud/soundcloud.js b/modules/soundcloud/soundcloud.js
index 4dc7192..7c3c84b 100644
--- a/modules/soundcloud/soundcloud.js
+++ b/modules/soundcloud/soundcloud.js
@@ -34,7 +34,7 @@ var soundcloud = function(dbot) {
             });
         }
     };
-    this.commands['~soundcloud'].regex = [/^~soundcloud (.+)$/, 2];
+    this.commands['~soundcloud'].regex = [/^soundcloud (.+)$/, 2];
 
     this.onLoad = function() {
         dbot.api.link.addHandler(this.name, 
diff --git a/modules/spotify/spotify.js b/modules/spotify/spotify.js
index 949af0d..921ad7f 100644
--- a/modules/spotify/spotify.js
+++ b/modules/spotify/spotify.js
@@ -115,7 +115,7 @@ var spotify = function(dbot) {
             }
         }
     };
-    commands['~spotify'].regex = [/^~spotify (.*)/, 2];
+    commands['~spotify'].regex = [/^spotify (.*)/, 2];
     this.commands = commands;
 
     this.onLoad = function() {
diff --git a/modules/sstats/commands.js b/modules/sstats/commands.js
index 8b2bf51..7176198 100644
--- a/modules/sstats/commands.js
+++ b/modules/sstats/commands.js
@@ -231,9 +231,9 @@ var commands = function(dbot) {
         }
     };
 
-    commands['~wordusers'].regex = [/^~wordusers ([\d\w[\]{}^|\\<>`_-]+?)/, 2];
-    commands['~word'].regex = [/^~word ([\d\w[\]{}^|\\<>`_-]+?)/, 2];
-    commands['~trackword'].regex = [/^~trackword ([\d\w[\]{}^|\\<>`_-]+?)/, 2];
+    commands['~wordusers'].regex = [/^wordusers ([\d\w[\]{}^|\\<>`_-]+?)/, 2];
+    commands['~word'].regex = [/^word ([\d\w[\]{}^|\\<>`_-]+?)/, 2];
+    commands['~trackword'].regex = [/^trackword ([\d\w[\]{}^|\\<>`_-]+?)/, 2];
     commands['~trackword'].access = 'power_user';
     return commands;
 };
diff --git a/modules/steam/steam.js b/modules/steam/steam.js
index 6692044..44a64cb 100644
--- a/modules/steam/steam.js
+++ b/modules/steam/steam.js
@@ -182,7 +182,7 @@ var steam = function(dbot) {
             }.bind(this));
         }
     };
-    this.commands['~games'].regex = [/^~games ([\d\w[\]{}^|\\`_-]+?)/, 2];
+    this.commands['~games'].regex = [/^games ([\d\w[\]{}^|\\`_-]+?)/, 2];
 
     _.each(this.commands, function(command) {
         command.resolver = function(event, callback) {
diff --git a/modules/users/commands.js b/modules/users/commands.js
index 05a04c2..329726c 100644
--- a/modules/users/commands.js
+++ b/modules/users/commands.js
@@ -199,11 +199,11 @@ var commands = function(dbot) {
         }
     };
     
-    commands['~alias'].regex = [/^~alias ([\d\w[\]{}^|\\`_-]+?)/, 2];
-    commands['~time'].regex = [/^~time ([\d\w[\]{}^|\\`_-]+?)/, 2];
-    commands['~setaliasparent'].regex = [/^~setaliasparent ([\d\w[\]{}^|\\`_-]+?)/, 2];
-    commands['~mergeusers'].regex = [/^~mergeusers ([\d\w[\]{}^|\\`_-]+?)\s*?([\d\w[\]{}^|\\`_-]+?)/, 3];
-    commands['~addalias'].regex = [/^~addalias ([\d\w[\]{}^|\\`_-]+?) ([\d\w[\]{}^|\\`_-]+?)$/, 3];
+    commands['~alias'].regex = [/^alias ([\d\w[\]{}^|\\`_-]+?)/, 2];
+    commands['~time'].regex = [/^time ([\d\w[\]{}^|\\`_-]+?)/, 2];
+    commands['~setaliasparent'].regex = [/^setaliasparent ([\d\w[\]{}^|\\`_-]+?)/, 2];
+    commands['~mergeusers'].regex = [/^mergeusers ([\d\w[\]{}^|\\`_-]+?)\s*?([\d\w[\]{}^|\\`_-]+?)/, 3];
+    commands['~addalias'].regex = [/^addalias ([\d\w[\]{}^|\\`_-]+?) ([\d\w[\]{}^|\\`_-]+?)$/, 3];
     
     commands['~setaliasparent'].access = 'moderator';
     commands['~mergeusers'].access = 'moderator';
diff --git a/modules/warning/warning.js b/modules/warning/warning.js
index f0f7da4..ba4ed45 100644
--- a/modules/warning/warning.js
+++ b/modules/warning/warning.js
@@ -65,7 +65,7 @@ var warning = function(dbot) {
         }
     };
 
-    this.commands['~warn'].regex = [/~warn ([^ ]+) (.+)/, 3];
+    this.commands['~warn'].regex = [/warn ([^ ]+) (.+)/, 3];
     this.commands['~warn'].access = 'power_user';
 };
 
diff --git a/modules/web/web.js b/modules/web/web.js
index f0c150f..7888f89 100644
--- a/modules/web/web.js
+++ b/modules/web/web.js
@@ -166,7 +166,7 @@ var webInterface = function(dbot) {
             }.bind(this));
         }
     };
-    this.commands['~setwebpass'].regex = [/^~setwebpass ([^ ]+)$/, 2]
+    this.commands['~setwebpass'].regex = [/^setwebpass ([^ ]+)$/, 2]
 };
 
 exports.fetch = function(dbot) {
diff --git a/modules/words/words.js b/modules/words/words.js
index 3b434a1..d870549 100644
--- a/modules/words/words.js
+++ b/modules/words/words.js
@@ -32,7 +32,7 @@ var words = function(dbot) {
             }).join(''));  
         } 
     };
-    this.commands['~jimble'].regex = [/^~jimble (.+)$/, 2];
+    this.commands['~jimble'].regex = [/^jimble (.+)$/, 2];
 
     this.onLoad = function() {
         this.wn = new Wordnik({
diff --git a/modules/youtube/youtube.js b/modules/youtube/youtube.js
index 60c1812..0c79b79 100644
--- a/modules/youtube/youtube.js
+++ b/modules/youtube/youtube.js
@@ -74,7 +74,7 @@ var youtube = function(dbot) {
             }.bind(this));
         }
     };
-    this.commands['~youtube'].regex = [/^~youtube (.+)$/, 2];
+    this.commands['~youtube'].regex = [/^youtube (.+)$/, 2];
 
     this.onLoad = function() {
         dbot.api.link.addHandler(this.name, this.LinkRegex,