diff --git a/src/services/markdownGrammarSvc.js b/src/services/markdownGrammarSvc.js
index 4fd23940..217e7cd4 100644
--- a/src/services/markdownGrammarSvc.js
+++ b/src/services/markdownGrammarSvc.js
@@ -307,7 +307,7 @@ export default {
     rest.url = urlPattern;
     rest.email = emailPattern;
     rest['strong cn-strong'] = {
-      pattern: /(^|[^\w*])(__|\*\*)(?![_*])[\s\S]*?\2(?=([^\w*]|$))/gm,
+      pattern: /(^|[^.*])(__|\*\*)(?![_*])[\s\S]*?\2(?=([^.*]|$))/gm,
       lookbehind: true,
       inside: {
         'cl cl-strong cl-start': /^(__|\*\*)/,
@@ -315,7 +315,7 @@ export default {
       },
     };
     rest.em = {
-      pattern: /(^|[^\w*])(_|\*)(?![_*])[\s\S]*?\2(?=([^\w*]|$))/gm,
+      pattern: /(^|[^.*])(_|\*)(?![_*])[\s\S]*?\2(?=([^.*]|$))/gm,
       lookbehind: true,
       inside: {
         'cl cl-em cl-start': /^(_|\*)/,
@@ -323,7 +323,7 @@ export default {
       },
     };
     rest['strong em'] = {
-      pattern: /(^|[^\w*])(__|\*\*)(_|\*)(?![_*])[\s\S]*?\3\2(?=([^\w*]|$))/gm,
+      pattern: /(^|[^.*])(__|\*\*)(_|\*)(?![_*])[\s\S]*?\3\2(?=([^.*]|$))/gm,
       lookbehind: true,
       inside: {
         'cl cl-strong cl-start': /^(__|\*\*)(_|\*)/,
@@ -331,7 +331,7 @@ export default {
       },
     };
     rest['strong em inv'] = {
-      pattern: /(^|[^\w*])(_|\*)(__|\*\*)(?![_*])[\s\S]*?\3\2(?=([^\w*]|$))/gm,
+      pattern: /(^|[^.*])(_|\*)(__|\*\*)(?![_*])[\s\S]*?\3\2(?=([^.*]|$))/gm,
       lookbehind: true,
       inside: {
         'cl cl-strong cl-start': /^(_|\*)(__|\*\*)/,
@@ -340,7 +340,7 @@ export default {
     };
     if (options.del) {
       rest.del = {
-        pattern: /(^|[^\w*])(~~)[\s\S]*?\2(?=([^\w*]|$))/gm,
+        pattern: /(^|[^.*])(~~)[\s\S]*?\2(?=([^.*]|$))/gm,
         lookbehind: true,
         inside: {
           cl: /~~/,
@@ -350,7 +350,7 @@ export default {
     }
     if (options.mark) {
       rest.mark = {
-        pattern: /(^|[^\w*])(==)[\s\S]*?\2(?=([^\w*]|$))/gm,
+        pattern: /(^|[^.*])(==)[\s\S]*?\2(?=([^.*]|$))/gm,
         lookbehind: true,
         inside: {
           cl: /==/,
diff --git a/src/styles/base.scss b/src/styles/base.scss
index ee4a1c2c..7e128d4a 100644
--- a/src/styles/base.scss
+++ b/src/styles/base.scss
@@ -62,7 +62,7 @@ ol ul,
 ul ol,
 ul ul,
 ol ol {
-  margin: 0;
+  margin: 0 0 1.1em;
 }
 
 dt {