diff --git a/OneMore/Commands/Edit/ConvertMarkdownCommand.cs b/OneMore/Commands/Edit/ConvertMarkdownCommand.cs
index 6c481de5c3..65d71436fb 100644
--- a/OneMore/Commands/Edit/ConvertMarkdownCommand.cs
+++ b/OneMore/Commands/Edit/ConvertMarkdownCommand.cs
@@ -68,6 +68,8 @@ public override async Task Execute(params object[] args)
 
 				var text = reader.ReadTextFrom(paragraphs, allContent);
 				text = Regex.Replace(text, @"<br>([\n\r]+)", "$1");
+				text = Regex.Replace(text, @"\<*input\s+type*=*\""checkbox\""\s+unchecked\s+[a-zA-Z *]*\/\>", "[ ]");
+				text = Regex.Replace(text, @"\<*input\s+type*=*\""checkbox\""\s+checked\s+[a-zA-Z *]*\/\>", "[x]");
 
 				var body = OneMoreDig.ConvertMarkdownToHtml(filepath, text);
 
diff --git a/OneMore/Commands/File/ImportCommand.cs b/OneMore/Commands/File/ImportCommand.cs
index dbbd58b1e5..28b8de37b9 100644
--- a/OneMore/Commands/File/ImportCommand.cs
+++ b/OneMore/Commands/File/ImportCommand.cs
@@ -11,7 +11,8 @@ namespace River.OneMoreAddIn.Commands
 	using System;
 	using System.Drawing;
 	using System.IO;
-	using System.Threading;
+    using System.Text.RegularExpressions;
+    using System.Threading;
 	using System.Threading.Tasks;
 	using System.Windows.Forms;
 	using System.Xml.Linq;
@@ -653,6 +654,8 @@ private async Task<bool> ImportMarkdownFile(string filepath, CancellationToken t
 					page.Title = Path.GetFileNameWithoutExtension(filepath);
 
 					var container = page.EnsureContentContainer();
+					body = Regex.Replace(body, @"\<*input\s+type*=*\""checkbox\""\s+unchecked\s+[a-zA-Z *]*\/\>", "[ ]");
+					body = Regex.Replace(body, @"\<*input\s+type*=*\""checkbox\""\s+checked\s+[a-zA-Z *]*\/\>", "[x]");
 
 					container.Add(new XElement(ns + "HTMLBlock",
 						new XElement(ns + "Data",
@@ -675,6 +678,7 @@ private async Task<bool> ImportMarkdownFile(string filepath, CancellationToken t
 
 					converter = new MarkdownConverter(page);
 					converter.RewriteHeadings();
+					converter.RewriteTodo();
 
 					logger.WriteLine($"updating...");
 					logger.WriteLine(page.Root);
diff --git a/OneMore/Commands/File/Markdown/MarkdownConverter.cs b/OneMore/Commands/File/Markdown/MarkdownConverter.cs
index 3b5fc2bf1f..c05485ab0b 100644
--- a/OneMore/Commands/File/Markdown/MarkdownConverter.cs
+++ b/OneMore/Commands/File/Markdown/MarkdownConverter.cs
@@ -7,6 +7,7 @@ namespace River.OneMoreAddIn.Commands
 	using River.OneMoreAddIn.Models;
 	using River.OneMoreAddIn.Styles;
 	using System.Collections.Generic;
+	using System.Globalization;
 	using System.Linq;
 	using System.Text.RegularExpressions;
 	using System.Xml.Linq;
@@ -51,6 +52,28 @@ public void RewriteHeadings()
 			{
 				RewriteHeadings(outline.Descendants(ns + "OE"));
 			}
+
+			// added header spacing specific to markdown
+			var quickstyles = page.Root.Elements(ns + "QuickStyleDef");
+			foreach (var quickstyle in quickstyles)
+			{
+				var name = quickstyle.Attribute("name").Value;
+				if (name.Equals("h1") || name.Equals("h2"))
+				{
+					replaceAtributes(quickstyle, spaceBefore: 0.8, spaceAfter: 0.5);
+				}
+				else
+				if (name.Equals("h3") || name.Equals("h4"))
+				{
+					replaceAtributes(quickstyle, spaceBefore: 0.3, spaceAfter: 0.3);
+				}
+			}
+			void replaceAtributes(XElement quickstyle, double spaceBefore, double spaceAfter)
+			{
+				quickstyle.SetAttributeValue("spaceBefore", spaceBefore.ToString("####0.00", CultureInfo.InvariantCulture));
+				quickstyle.SetAttributeValue("spaceAfter", spaceAfter.ToString("####0.00", CultureInfo.InvariantCulture));
+			}
+
 		}
 
 
@@ -141,8 +164,22 @@ public MarkdownConverter RewriteHeadings(IEnumerable<XElement> paragraphs)
 		}
 
 
+		/// <summary>
+		/// Applies standard OneNote styling to all recognizable headings in all Outlines
+		/// on the page
+		/// </summary>
+		public void RewriteTodo()
+		{
+			foreach (var outline in page.BodyOutlines)
+			{
+				RewriteTodo(outline.Descendants(ns + "OE"));
+			}
+		}
+
+
 		/// <summary>
 		/// Tag current line with To Do tag if beginning with [ ] or [x]
+		/// Also :TAGS: will be handled here
 		/// All other :emojis: should be translated inline by Markdig
 		/// </summary>
 		/// <param name="paragraphs"></param>
@@ -158,21 +195,46 @@ public MarkdownConverter RewriteTodo(IEnumerable<XElement> paragraphs)
 				{
 					var cdata = run.GetCData();
 					var wrapper = cdata.GetWrapper();
+					if (wrapper.FirstNode is XText)
+					{
+						cdata.Value = wrapper.GetInnerXml();
+					}
+					while (wrapper.FirstNode is not XText && wrapper.FirstNode is not null)
+					{
+						wrapper = (XElement)wrapper.FirstNode;
+					}
 					if (wrapper.FirstNode is XText text)
 					{
 						var match = boxpattern.Match(text.Value);
+						// special treatment of todo tag 
 						if (match.Success)
 						{
 							text.Value = text.Value.Substring(match.Length);
 
+							var org = text.Value;
+							var completed = match.Groups["x"].Value == "x";
+							text.Value = text.Value.Replace((completed ? "[x]" : "[ ]"), "");
+							cdata.Value = cdata.Value.Replace(org, text.Value);
 							// ensure TagDef exists
-							var index = page.AddTagDef("3", "To Do", 4);
-
-							// inject tag prior to run
-							run.AddBeforeSelf(new Tag(index, match.Groups["x"].Value == "x"));
+							page.SetTag(paragraph, tagSymbol: "3", tagStatus:completed,tagName:"todo");
+						}
+						else
+						{
+							// look for all other tags
+							foreach (var t in MarkdownEmojis.taglist)
+							{
+								// check for other tags
+								if (text.Value.Contains(t.name))
+								{
+									var org = text.Value;
+									text.Value = text.Value.Replace(t.name, "");
+									cdata.Value = cdata.Value.Replace(org, text.Value);
+									// ensure TagDef exists
+									page.SetTag(paragraph, tagSymbol: t.id, tagStatus: false, tagName: t.topic, tagType: t.type);
+									break;
+								}
+							}
 
-							// update run text
-							cdata.Value = wrapper.GetInnerXml();
 						}
 					}
 				}
diff --git a/OneMore/Commands/File/Markdown/MarkdownEmojis.cs b/OneMore/Commands/File/Markdown/MarkdownEmojis.cs
new file mode 100644
index 0000000000..93f2eff2c3
--- /dev/null
+++ b/OneMore/Commands/File/Markdown/MarkdownEmojis.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+
+namespace River.OneMoreAddIn.Commands
+{
+	public static class MarkdownEmojis
+	{
+		public static List<(string name, string id, string topic, int type)> taglist = new List<(string name, string id, string topic, int type)>
+							{
+//								(":todo:",                  "3",   "todo"       , 0),
+								(":question:",              "6",    "question"  , 0),
+								(":star:",                  "13",   "important", 0 ),
+								(":exclamation:",           "17",   "critical", 0),
+								(":phone:",                 "18",   "phone", 0),
+								(":bulb:",                  "21",   "idea", 0),
+								(":house:",                 "23",   "address", 0),
+								(":three:",                 "33",   "three", 0),
+								(":zero:",                  "39",   "zero", 0),
+								(":two:",                   "51",   "two", 0),
+								(":arrow_right:",           "59",   "main agenda item", 0),
+								(":one:",                   "70",   "one", 0),
+								(":information_desk_person:","94",   "discuss person a/b", 21),
+								(":bellsymbol:",             "97",   "bellsymbol", 0),
+								(":busts_in_silhouette:",   "116",   "busts_in_silhouette", 0),
+								(":bell:",                  "117",   "bell", 0),
+								(":letter:",                "118",   "letter", 0),
+								(":musical_note:",          "121",   "musical_note", 0),
+								(":secret:",                "131",   "idea", 0),
+								(":book:",                  "132",   "book", 0),
+								(":movie_camera:",          "133",   "movie_camera", 0),
+								(":zap:",                   "140",   "lightning_bolt", 0),
+								(":o:",                     "1",    "default", 0)
+							};
+
+
+	}
+}
diff --git a/OneMore/Commands/File/Markdown/MarkdownWriter.cs b/OneMore/Commands/File/Markdown/MarkdownWriter.cs
index 7b0207107b..197cded54f 100644
--- a/OneMore/Commands/File/Markdown/MarkdownWriter.cs
+++ b/OneMore/Commands/File/Markdown/MarkdownWriter.cs
@@ -34,18 +34,32 @@ private sealed class Context
 			// accent enclosure char, asterisk* or backquote`
 			public string Accent;
 		}
+		// helper class to pass parameter
+		private sealed class PrefixClass
+		{
+			public string indents = string.Empty;
+			public string tags = string.Empty;
+			public string bullets = string.Empty;
+			public string tablelistid = string.Empty;
+			public bool justclosed = false;
+
+			public PrefixClass()
+			{
+			}
+		}
 
 		// Note that if pasting md text directly into OneNote, there's no good way to indent text
 		// and prevent OneNote from auto-formatting. Closest alt is to use a string of nbsp's
 		// but that conflicts with other directives like headings and list numbering. One way is
 		// to substitute indentations (e.g., OEChildren) with the blockquote directive instead.
-		private const string Indent = "    "; //">"; //&nbsp;&nbsp;&nbsp;&nbsp;";
+		private const string Indent = "  "; //">"; //&nbsp;&nbsp;&nbsp;&nbsp;";
 		private const string Quote = ">";
 
 		private readonly Page page;
 		private readonly XNamespace ns;
 		private readonly List<Style> quickStyles;
 		private readonly Stack<Context> contexts;
+		private readonly List<(XElement container, int index)> nestedtables;
 		private bool saveAttachments;
 		private int imageCounter;
 #if WriteToDisk
@@ -64,6 +78,7 @@ public MarkdownWriter(Page page, bool saveAttachments)
 
 			quickStyles = page.GetQuickStyles();
 			contexts = new Stack<Context>();
+			nestedtables = new List<(XElement, int)>();
 
 			this.saveAttachments = saveAttachments;
 		}
@@ -135,7 +150,8 @@ public void Save(string filename)
 
 				page.Root.Elements(ns + "Outline")
 					.Elements(ns + "OEChildren")
-					.Elements()
+// Removed as it absorbs leading elements like "OE"
+//					.Elements()
 					.ForEach(e => Write(e));
 
 				// page level Images outside of any Outline
@@ -150,15 +166,25 @@ public void Save(string filename)
 			}
 		}
 
+		/// <summary>
+		/// prepare for recursive processing
+		/// </summary>
+		/// <param name="container">typically an OEChildren with elements and OEChildren</param>
+		private void Write(XElement container)
+		{
+			var prefix = new PrefixClass();
+			Write(container, prefix);
+		}
+
 
 		/// <summary>
-		/// 
+		/// Save the page as markdown to a string
 		/// </summary>
 		/// <param name="container">typically an OEChildren with elements and OEChildren</param>
 		/// <param name="prefix">prefix used to indent markdown lines</param>
 		/// <param name="contained"></param>
 		private void Write(XElement container,
-			string prefix = "",
+			PrefixClass prefix,
 			int depth = 0,
 			bool contained = false)
 		{
@@ -166,26 +192,48 @@ private void Write(XElement container,
 			// Tag, List, and T, so startOfLine can be handled locally rather than recursively.
 			var startOfLine = true;
 
-			logger.Debug($"Write({container.Name.LocalName}, prefix:[{prefix}], depth:{depth}, contained:{contained})");
+			logger.Debug($"Write({container.Name.LocalName}, prefix:[{prefix.indents}], depth:{depth}, contained:{contained})");
 
 			foreach (var element in container.Elements())
 			{
 				var n = element.Name.LocalName;
-				var m = $"- [prefix:[{prefix}] depth:{depth} start:{startOfLine} contained:{contained} element {n}";
+				var m = $"- [prefix:[{prefix.indents}] depth:{depth} start:{startOfLine} contained:{contained} element {n}";
 				logger.Debug(n == "T" ? $"{m} [{element.Value}]" : m);
 
 				switch (element.Name.LocalName)
 				{
 					case "OEChildren":
-						Write(element, $"{Indent}{prefix}", depth + 1, contained);
-						break;
+						{
+							var currentindents = prefix.indents;
+							prefix.indents = $"{Indent}{prefix.indents}";
+							Write(element, prefix, depth + 1, contained);
+							prefix.indents = currentindents;
+							// start trigger that OEChildren is closed when not in table
+							prefix.justclosed = !contained? true : false;
+
+							// write closing id for listed items in tables
+							if (contained && !prefix.tablelistid.IsNullOrEmpty())
+							{
+								writer.Write(prefix.tablelistid);
+								prefix.tablelistid = "";
+							}
+							break;
+						}
 
 					case "OE":
 						{
-							if (!contained) // not in table cell
+							// Check for missing bullets in nested paragraphs
+							var listElementsFirst = element.Elements(ns + "List").FirstOrDefault();
+							var childrenFirst = element.Elements(ns + "OEChildren").FirstOrDefault();
+
+							if (prefix.justclosed					// is OEChildren just closed in previous paragraph?
+								&& childrenFirst != null			// is OEChildren existig in current paragraph
+								&& listElementsFirst == null)       // is no List element given?
 							{
-								writer.WriteLine("  ");
+								// add artificial bullets
+								prefix.bullets = "- ";
 							}
+							prefix.justclosed = false;				// reset just closed
 
 							var context = DetectQuickStyle(element);
 							Write(element, prefix, depth, contained);
@@ -204,45 +252,44 @@ private void Write(XElement container,
 						break;
 
 					case "Tag":
+						prefix.tags += WriteTag(element, contained);
+						break;
+
+					case "T":
 						{
-							// should always be startOfLine
 							var context = DetectQuickStyle(element);
-							if (context is not null)
+							if (contained) // in table cell
 							{
-								Stylize(depth > 0
-									? prefix /*new String(Quote[0], depth)*/
-									: string.Empty);
+								if (prefix.bullets.Contains("1."))
+								{
+									if (prefix.tablelistid.IsNullOrEmpty())
+									{
+										prefix.bullets = "<ol><li>";
+										prefix.tablelistid = "</ol>";
+									}
+									else
+									{
+										prefix.bullets = "<li>";
+									}
+								}
+								if (!startOfLine && prefix.tablelistid.IsNullOrEmpty())
+								{
+									writer.Write("<br>"); // do not write br in beginning of line
+								}
+								writer.Write(prefix.bullets + prefix.tags);  // no indents and styles in tables
 							}
 							else
 							{
-								writer.Write(prefix);
+								writer.WriteLine();
+								writer.Write(prefix.indents + prefix.bullets + Stylize() + prefix.tags);
 							}
 
-							WriteTag(element);
+							WriteText(element.GetCData(), startOfLine, contained);
 
-							if (context is not null)
+							if (contained && prefix.bullets.Contains("<li>"))
 							{
-								contexts.Pop();
+								writer.Write("</li>");
 							}
-
-							startOfLine = false;
-						}
-						break;
-
-					case "T":
-						{
-							var context = DetectQuickStyle(element);
-							if (context is not null)
-							{
-								Stylize(depth > 0 && startOfLine
-									? prefix /*new String(Quote[0], depth)*/
-									: string.Empty);
-
-								startOfLine = false;
-							}
-
-							WriteText(element.GetCData(), startOfLine);
-
 							if (context is not null)
 							{
 								if (!string.IsNullOrEmpty(context.Accent))
@@ -254,6 +301,8 @@ private void Write(XElement container,
 								contexts.Pop();
 							}
 
+							prefix.bullets = string.Empty;
+							prefix.tags = string.Empty;
 							startOfLine = false;
 						}
 						break;
@@ -264,15 +313,17 @@ private void Write(XElement container,
 						break;
 
 					case "Bullet":
-						writer.Write($"{prefix}- ");
+						// in md dash needs to be first in line
+						prefix.bullets = "- ";
 						break;
 
 					case "Number":
-						writer.Write($"{prefix}1. ");
+						// in md number needs to be first in line
+						prefix.bullets = "1. ";
 						break;
 
 					case "Image":
-						if (depth > 0)
+						if (depth > 0 && !contained)
 						{
 							writer.Write(new String(Quote[0], depth));
 						}
@@ -286,11 +337,39 @@ private void Write(XElement container,
 						break;
 
 					case "Table":
-						if (depth > 0)
+						if (element.GetAttributeValue("bordersVisible", out string bordersVisible)) 
 						{
-							writer.Write(new String(Quote[0], depth));
+							if (bordersVisible.Equals("true"))
+							{
+								writer.WriteLine();
+								writer.Write(prefix.indents + "<style> td, th { border: 1px solid black; } </style>");
+							}
 						}
-						WriteTable(element);
+						if (contained)
+						{
+							var tableindex = nestedtables.Count() + 1;
+							nestedtables.Add((element, tableindex));
+							writer.Write(prefix.indents + "[nested-table" + tableindex + "](#nested-table" + tableindex + ")");
+						}
+						else
+						{
+							WriteTable(element, prefix);
+							while (nestedtables.Count() != 0)
+							{
+								var nestedtable = nestedtables.First();
+								writer.WriteLine(prefix.indents + "<details id=\"nested-table" + nestedtable.index + "\" open>");
+								writer.WriteLine(prefix.indents + "<summary>" + "Nested Table " + nestedtable.index + "</summary>");
+								WriteTable(nestedtable.container, prefix);
+								writer.WriteLine(prefix.indents + "</details>");
+								nestedtables.RemoveAt(0);
+							}
+						}
+						if (bordersVisible.Equals("true"))
+						{
+							writer.Write(prefix.indents + "<style> td, th { border: none; } </style>");
+						}
+						// Write extra line
+						writer.WriteLine();
 						break;
 				}
 			}
@@ -301,17 +380,7 @@ private void Write(XElement container,
 
 		private Context DetectQuickStyle(XElement element)
 		{
-			// quickStyleIndex could be on T, OE, or OEChildren, Outline, Page
-			// so ascend until we find one...
-
-			int index = -1;
-			while (element is not null &&
-				!element.GetAttributeValue("quickStyleIndex", out index, -1))
-			{
-				element = element.Parent;
-			}
-
-			if (index >= 0)
+			if (element.GetAttributeValue("quickStyleIndex", out int index))
 			{
 				var context = new Context
 				{
@@ -337,40 +406,39 @@ private Context DetectQuickStyle(XElement element)
 		}
 
 
-		private void Stylize(string prefix)
+		private string Stylize()
 		{
-			writer.Write(prefix);
-			if (contexts.Count == 0) return;
+			var styleprefix = "";
+			if (contexts.Count == 0) return "";
 			var context = contexts.Peek();
 			var quick = quickStyles.First(q => q.Index == context.QuickStyleIndex);
 			switch (quick.Name)
 			{
 				case "PageTitle":
-				case "h1":
-					writer.Write("# ");
-					break;
-
-				case "h2": writer.Write("## "); break;
-				case "h3": writer.Write("### "); break;
-				case "h4": writer.Write("#### "); break;
-				case "h5": writer.Write("##### "); break;
-				case "h6": writer.Write("###### "); break;
-				case "blockquote": writer.Write("> "); break;
+				case "h1": styleprefix = ("# "); break;
+				case "h2": styleprefix = ("## "); break;
+				case "h3": styleprefix = ("### "); break;
+				case "h4": styleprefix = ("#### "); break;
+				case "h5": styleprefix = ("##### "); break;
+				case "h6": styleprefix = ("###### "); break;
+				case "blockquote": styleprefix = ("> "); break;
 				// cite and code are both block-scope style, on the OE
-				case "cite": writer.Write("*"); break;
-				case "code": writer.Write("`"); break;
-					//case "p": logger.Write(Environment.NewLine); break;
+				case "cite": styleprefix = ("*"); break;
+				case "code": styleprefix = ("`"); break;
+					//case "p": lstyleprefix = (Environment.NewLine); break;
 			}
+			return styleprefix;
 		}
 
 
-		private void WriteTag(XElement element)
+		private string WriteTag(XElement element, bool contained)
 		{
 			var symbol = page.Root.Elements(ns + "TagDef")
 				.Where(e => e.Attribute("index").Value == element.Attribute("index").Value)
 				.Select(e => int.Parse(e.Attribute("symbol").Value))
 				.FirstOrDefault();
-
+			var retValue = "";
+			var tagSymbol = MarkdownEmojis.taglist.Find(x => x.id == symbol.ToString());
 			switch (symbol)
 			{
 				case 3:     // to do
@@ -381,31 +449,19 @@ private void WriteTag(XElement element)
 				case 94:    // discuss person a/b
 				case 95:    // discuss manager
 					var check = element.Attribute("completed").Value == "true" ? "x" : " ";
-					writer.Write($"[{check}] ");
-					break;
+					retValue = contained
+					  ? @"<input type=""checkbox"" disabled " + (check == "x" ? "checked" : "unchecked") + @" />"
+					  : ($"[{check}] ");
 
-				case 6: writer.Write(":question: "); break;         // question
-				case 13: writer.Write(":star: "); break;            // important
-				case 17: writer.Write(":exclamation: "); break;     // critical
-				case 18: writer.Write(":phone: "); break;           // phone
-				case 21: writer.Write(":bulb: "); break;            // idea
-				case 23: writer.Write(":house: "); break;           // address
-				case 33: writer.Write(":three: "); break;           // three
-				case 39: writer.Write(":zero: "); break;            // zero
-				case 51: writer.Write(":two: "); break;             // two
-				case 70: writer.Write(":one: "); break;             // one
-				case 118: writer.Write(":mailbox: "); break;        // contact
-				case 121: writer.Write(":musical_note: "); break;   // music to listen to
-				case 131: writer.Write(":secret: "); break;         // password
-				case 133: writer.Write(":movie_camera: "); break;   // movie to see
-				case 132: writer.Write(":book: "); break;           // book to read
-				case 140: writer.Write(":zap: "); break;            // lightning bolt
-				default: writer.Write(":o: "); break;               // big red circle
+					break;
+				default: retValue = tagSymbol.name + " ";
+					break;
 			}
+			return retValue;
 		}
 
 
-		private void WriteText(XCData cdata, bool startOfLine)
+		private void WriteText(XCData cdata, bool startOfLine, bool contained)
 		{
 			cdata.Value = cdata.Value
 				.Replace("<br>", "  ") // usually followed by NL so leave it there
@@ -428,7 +484,15 @@ private void WriteText(XCData cdata, bool startOfLine)
 				span.ReplaceWith(new XText(text));
 			}
 
-			foreach (var anchor in wrapper.Elements("a"))
+			// escape directives
+			var raw = wrapper.GetInnerXml()
+				.Replace("&lt;", "\\<")
+				.Replace("|", "\\|")
+				.Replace("à", "&rarr; ")                    // right arrow
+				.Replace("\n", contained ? "<br>" : "\n");  // newlines in tables
+
+			// replace links with <> to allow special characters and hence place if after escape directives
+			foreach (var anchor in wrapper.Elements("a").ToList())
 			{
 				var href = anchor.Attribute("href")?.Value;
 				if (!string.IsNullOrEmpty(href))
@@ -440,21 +504,21 @@ private void WriteText(XCData cdata, bool startOfLine)
 					}
 					else
 					{
-						anchor.ReplaceWith(new XText($"[{anchor.Value}]({href})"));
+						anchor.ReplaceWith(new XText($"[{anchor.Value}](<{href}>)"));
 					}
 				}
 			}
 
-			// escape directives
-			var raw = wrapper.GetInnerXml()
-				.Replace("&lt;", "\\<")
-				.Replace("|", "\\|");
-
 			if (startOfLine && raw.Length > 0 && raw.StartsWith("#"))
 			{
 				writer.Write("\\");
 			}
 
+			if (startOfLine && raw.Length > 0)
+			{
+				raw += "  "; // add extra space to end of line
+			}
+
 			logger.Debug($"text [{raw}]");
 			writer.Write(raw);
 		}
@@ -480,7 +544,7 @@ private void WriteImage(XElement element)
 
 				image.Save(filename, ImageFormat.Png);
 #endif
-				var imgPath = Path.Combine(attachmentFolder, name);
+				var imgPath = Path.Combine(attachmentFolder, name).Replace("\\", "/").Replace(" ", "%20");
 				writer.Write($"![Image-{imageCounter}]({imgPath})");
 			}
 			else
@@ -545,19 +609,16 @@ private void WriteFile(XElement element)
 		}
 
 
-		private void WriteTable(XElement element)
+		private void WriteTable(XElement element, PrefixClass prefix)
 		{
 			#region WriteRow(TableRow row)
 			void WriteRow(TableRow row)
 			{
-				writer.Write("| ");
+				writer.Write(prefix.indents + "| ");
 				foreach (var cell in row.Cells)
 				{
-					cell.Root
-						.Element(ns + "OEChildren")
-						.Elements(ns + "OE")
-						.ForEach(e => Write(e, contained: true));
-
+					PrefixClass nestedprefix = new PrefixClass();
+					Write(cell.Root,  nestedprefix, contained: true);
 					writer.Write(" | ");
 				}
 				writer.WriteLine();
@@ -566,14 +627,15 @@ void WriteRow(TableRow row)
 
 			var table = new Table(element);
 
-			// table needs a blank line before it
+			// table needs a blank line before it, even 2nd one sometimes needed
+			writer.WriteLine();
 			writer.WriteLine();
 
 			var rows = table.Rows;
 
 			// header - - - - - - - - - - - - - - - - - - -
 
-			if (table.HasHeaderRow && rows.Any())
+			if ((table.HasHeaderRow && rows.Any()) || rows.Count() == 1)
 			{
 				// use first row data as header
 				WriteRow(rows.First());
@@ -593,7 +655,7 @@ void WriteRow(TableRow row)
 
 			// separator - - - - - - - - - - - - - - - - -
 
-			writer.Write("|");
+			writer.Write(prefix.indents + "| ");
 			for (int i = 0; i < table.ColumnCount; i++)
 			{
 				writer.Write(" :--- |");
diff --git a/OneMore/Commands/File/Markdown/OneMoreDigExtensions.cs b/OneMore/Commands/File/Markdown/OneMoreDigExtensions.cs
index 42ab906fd7..ce83ef85f9 100644
--- a/OneMore/Commands/File/Markdown/OneMoreDigExtensions.cs
+++ b/OneMore/Commands/File/Markdown/OneMoreDigExtensions.cs
@@ -5,13 +5,31 @@
 namespace River.OneMoreAddIn.Commands
 {
 	using Markdig;
-
+	using Markdig.Extensions.Emoji;
+	using System.Collections.Generic;
+	using System.Linq;
 
 	internal static class OneMoreDigExtensions
 	{
+
 		public static MarkdownPipelineBuilder UseOneMoreExtensions(
 			this MarkdownPipelineBuilder pipeline)
 		{
+			var emojiDic = EmojiMapping.GetDefaultEmojiShortcodeToUnicode();
+			var emojiDicNew = new Dictionary<string, string>();
+			foreach (var mappings in emojiDic)
+			{
+				var tagName = MarkdownEmojis.taglist.FirstOrDefault(x => x.name.Equals(mappings.Key)).name;
+				if (tagName.IsNullOrEmpty())
+				{
+					emojiDicNew.Add(mappings.Key,mappings.Value);
+				}
+			}
+			var DefaultEmojisAndSmileysMapping = new EmojiMapping(
+								emojiDicNew, EmojiMapping.GetDefaultSmileyToEmojiShortcode());
+			//			var emojiMapping = EmojiMapping.DefaultEmojisAndSmileysMapping;
+			pipeline.Extensions.Add(new EmojiExtension(DefaultEmojisAndSmileysMapping));
+
 			pipeline.Extensions.Add(new OneMoreDigExtension());
 			return pipeline;
 		}
diff --git a/OneMore/Models/Page.cs b/OneMore/Models/Page.cs
index 0c7b0102bc..b91584bda8 100644
--- a/OneMore/Models/Page.cs
+++ b/OneMore/Models/Page.cs
@@ -122,7 +122,6 @@ public void OptimizeForSave(bool keep)
 
 		public bool IsValid => Root is not null;
 
-
 		/// <summary>
 		/// Gets the namespace used to create new elements for the page
 		/// </summary>
@@ -277,6 +276,55 @@ public void AddTagDef(TagDef tagdef)
 			Root.AddFirst(tagdef);
 		}
 
+		/// <summary>
+		/// Extended version from RemindCommand to handle also non Todo Tags
+		/// </summary>
+		public string SetTag(XElement paragraph, string tagSymbol, string tagName, int tagType = 0, bool tagStatus = false)
+		{
+			var index = this.GetTagDefIndex(tagSymbol);
+			if (index == null)
+			{
+				index = this.AddTagDef(tagSymbol, tagName, tagType);
+			}
+
+			var tag = paragraph.Elements(Namespace + "Tag")
+				.FirstOrDefault(e => e.Attribute("index").Value == index);
+
+			if (tag == null)
+			{
+				// tags must be ordered by index even within their containing paragraph
+				// so take all, remove from paragraph, append, sort, re-add...
+
+				var tags = paragraph.Elements(Namespace + "Tag").ToList();
+				tags.ForEach(t => t.Remove());
+
+				// synchronize tag with reminder
+				var completed = tagStatus == true
+					? "true" : "false";
+
+				tag = new XElement(Namespace + "Tag",
+					new XAttribute("index", index),
+					new XAttribute("completed", completed),
+					new XAttribute("disabled", "false")
+					);
+
+				tags.Add(tag);
+
+				paragraph.AddFirst(tags.OrderBy(t => t.Attribute("index").Value));
+			}
+			else
+			{
+				// synchronize tag with reminder
+				var tcompleted = tag.Attribute("completed").Value == "true";
+				var rcompleted = tagStatus;
+				if (tcompleted != rcompleted)
+				{
+					tag.Attribute("completed").Value = rcompleted ? "true" : "false";
+				}
+			}
+			return index;
+		}
+
 
 		/// <summary>
 		/// Apply the given quick style mappings to all descendents of the specified outline.
diff --git a/OneMore/OneMore.csproj b/OneMore/OneMore.csproj
index de9e00477f..01138c4bec 100644
--- a/OneMore/OneMore.csproj
+++ b/OneMore/OneMore.csproj
@@ -181,6 +181,7 @@
     </Compile>
     <Compile Include="Commands\Edit\ConvertMarkdownCommand.cs" />
     <Compile Include="Commands\Edit\CopyAsTextCommand.cs" />
+    <Compile Include="Commands\File\Markdown\MarkdownEmojis.cs" />
     <Compile Include="Commands\File\OpenFolderDialog.cs">
       <SubType>Form</SubType>
     </Compile>