diff --git a/macros/Commit Critic Addition.sublime-macro b/macros/Commit Critic Addition.sublime-macro
index 1e67d7d6..0fc6aad6 100644
--- a/macros/Commit Critic Addition.sublime-macro	
+++ b/macros/Commit Critic Addition.sublime-macro	
@@ -1,5 +1,5 @@
 [
 	{"command": "expand_selection", "args": {"to": "brackets"}},
 	{"command": "expand_selection", "args": {"to": "brackets"}},
-	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{\\+\\+\\s?(.*?)\\s*\\+\\+\\}$/\\1/g}"}}
+	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{\\+\\+(.*?)\\+\\+\\}/\\1/g}"}}
 ]
diff --git a/macros/Commit Critic Deletion.sublime-macro b/macros/Commit Critic Deletion.sublime-macro
index 2d272bbc..b0927d5a 100644
--- a/macros/Commit Critic Deletion.sublime-macro	
+++ b/macros/Commit Critic Deletion.sublime-macro	
@@ -1,6 +1,5 @@
 [
 	{"command": "expand_selection", "args": {"to": "brackets"}},
 	{"command": "expand_selection", "args": {"to": "brackets"}},
-	{"command": "move", "args": {"by": "words", "extend": true, "forward": true}},
-	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{--.*--\\}[ \\t]*//g}"}}
+	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{--.*?--\\}//g}"}}
 ]
diff --git a/macros/Commit Critic Substitution.sublime-macro b/macros/Commit Critic Substitution.sublime-macro
index aab203f2..5c9ceca1 100644
--- a/macros/Commit Critic Substitution.sublime-macro	
+++ b/macros/Commit Critic Substitution.sublime-macro	
@@ -1,5 +1,5 @@
 [
 	{"command": "expand_selection", "args": {"to": "brackets"}},
 	{"command": "expand_selection", "args": {"to": "brackets"}},
-	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{~~\\s?(.*?)\\s?~>\\s?(.*?)\\s?~~\\}$/\\2/g}"}}
+	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{~~(.*?)~>(.*?)~~\\}/\\2/g}"}}
 ]
diff --git a/macros/Discard Critic Addition.sublime-macro b/macros/Discard Critic Addition.sublime-macro
index a6d1124d..839ac573 100644
--- a/macros/Discard Critic Addition.sublime-macro	
+++ b/macros/Discard Critic Addition.sublime-macro	
@@ -1,6 +1,5 @@
 [
 	{"command": "expand_selection", "args": {"to": "brackets"}},
 	{"command": "expand_selection", "args": {"to": "brackets"}},
-	{"command": "move", "args": {"by": "words", "extend": true, "forward": true}},
-	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{\\+\\+.*\\+\\+\\}[ \\t]*//g}"}}
+	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{\\+\\+.*?\\+\\+\\}//g}"}}
 ]
diff --git a/macros/Discard Critic Comment.sublime-macro b/macros/Discard Critic Comment.sublime-macro
index 258cae16..3682d01c 100644
--- a/macros/Discard Critic Comment.sublime-macro	
+++ b/macros/Discard Critic Comment.sublime-macro	
@@ -1,6 +1,5 @@
 [
 	{"command": "expand_selection", "args": {"to": "brackets"}},
 	{"command": "expand_selection", "args": {"to": "brackets"}},
-	{"command": "move", "args": {"by": "words", "extend": true, "forward": true}},
-	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{>>.*<<\\}[ \\t]*//g}"}}
+	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{>>.*?<<\\}//g}"}}
 ]
diff --git a/macros/Discard Critic Deletion.sublime-macro b/macros/Discard Critic Deletion.sublime-macro
index 52cc6a5d..e491d57f 100644
--- a/macros/Discard Critic Deletion.sublime-macro	
+++ b/macros/Discard Critic Deletion.sublime-macro	
@@ -1,5 +1,5 @@
 [
 	{"command": "expand_selection", "args": {"to": "brackets"}},
 	{"command": "expand_selection", "args": {"to": "brackets"}},
-	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{--\\s?(.*?)\\s*--\\}$/\\1/g}"}}
+	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{--(.*?)--\\}/\\1/g}"}}
 ]
diff --git a/macros/Discard Critic Highlight.sublime-macro b/macros/Discard Critic Highlight.sublime-macro
index a49ed4e4..bc045029 100644
--- a/macros/Discard Critic Highlight.sublime-macro	
+++ b/macros/Discard Critic Highlight.sublime-macro	
@@ -1,6 +1,5 @@
 [
 	{"command": "expand_selection", "args": {"to": "brackets"}},
 	{"command": "expand_selection", "args": {"to": "brackets"}},
-	{"command": "move", "args": {"by": "words", "extend": true, "forward": true}},
-	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{==\\s?(.*?)\\s*==\\}[ \\t]*(.*)$/\\1\\2/g}"}}
+	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{==(.*?)==\\}/\\1/g}"}}
 ]
diff --git a/macros/Discard Critic Substitution.sublime-macro b/macros/Discard Critic Substitution.sublime-macro
index 654fba54..4d5a832d 100644
--- a/macros/Discard Critic Substitution.sublime-macro	
+++ b/macros/Discard Critic Substitution.sublime-macro	
@@ -1,5 +1,5 @@
 [
 	{"command": "expand_selection", "args": {"to": "brackets"}},
 	{"command": "expand_selection", "args": {"to": "brackets"}},
-	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{~~\\s?(.*?)\\s?~>\\s?(.*?)\\s?~~\\}$/\\1/g}"}}
+	{"command": "insert_snippet", "args": {"contents": "${SELECTION/\\{~~(.*?)~>(.*?)~~\\}/\\1/g}"}}
 ]