diff --git a/config/punctuation/default.conf b/config/punctuation/default.conf
index f99d0d6c..4e127f09 100644
--- a/config/punctuation/default.conf
+++ b/config/punctuation/default.conf
@@ -48,24 +48,23 @@ _:===:line
 
 [emoticonDict]
 # This dictionary uses regexp, so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
-<{-.-}>:===:Raves
-8-\):===:smile with sunglasses
-:-/:===:confused
--\.-:===:bugged
->\.<:===:laughing
-8-X:===:skull
->:\):===:evil smile
->:-\):===:evil smile
-\\o/:===:Hurray
-:/:===:confused
-8\):===:smile with sunglasses
-:D:===:laugh
-;\):===:wink
-XD:===:LOL
-:-\):===:smile
-:\):===:smile
-->:===:arrow right
-<-:===:arrow left
-oO:===:WTF?
-Oo:===:WTF?
-\^\^:===:enjoy smile
+[\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
+[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
+[\s*|'|"][\s*|'|"]:-/:===:confused
+[\s*|'|"][\s*|'|"]-\.-:===:bugged
+[\s*|'|"][\s*|'|"]>\.<:===:laughing
+[\s*|'|"][\s*|'|"]8-X:===:skull
+[\s*|'|"][\s*|'|"]>:\):===:evil smile
+[\s*|'|"][\s*|'|"]>:-\):===:evil smile
+[\s*|'|"][\s*|'|"]\\o/:===:Hurray
+[\s*|'|"][\s*|'|"]:/:===:confused
+[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
+[\s*|'|"][\s*|'|"]:D:===:laugh
+[\s*|'|"][\s*|'|"];\):===:wink
+[\s*|'|"]XD[\s*|'|"]:===:LOL
+[\s*|'|"]:-\)[\s*|'|"]:===:smile
+[\s*|'|"]:\)[\s*|'|"]:===:smile
+[\s*|'|"]->[\s*|'|"]:===:arrow right
+[\s*|'|"]<-[\s*|'|"]:===:arrow left
+[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
+[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile