diff --git a/MacDown/Images.xcassets/TouchBar Icons/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/Contents.json
new file mode 100644
index 00000000..da4a164c
--- /dev/null
+++ b/MacDown/Images.xcassets/TouchBar Icons/Contents.json	
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/CopyHTML.imageset/CopyHTML@2x.png b/MacDown/Images.xcassets/TouchBar Icons/CopyHTML.imageset/CopyHTML@2x.png
deleted file mode 100644
index 59a6e969..00000000
Binary files a/MacDown/Images.xcassets/TouchBar Icons/CopyHTML.imageset/CopyHTML@2x.png and /dev/null differ
diff --git a/MacDown/Images.xcassets/TouchBar Icons/HideEditor.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/HideEditor.imageset/Contents.json
deleted file mode 100644
index 95fbdd75..00000000
--- a/MacDown/Images.xcassets/TouchBar Icons/HideEditor.imageset/Contents.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "mac",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "mac",
-      "filename" : "HideEditor@2x.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/HideEditor.imageset/HideEditor@2x.png b/MacDown/Images.xcassets/TouchBar Icons/HideEditor.imageset/HideEditor@2x.png
deleted file mode 100644
index a8b1a9b1..00000000
Binary files a/MacDown/Images.xcassets/TouchBar Icons/HideEditor.imageset/HideEditor@2x.png and /dev/null differ
diff --git a/MacDown/Images.xcassets/TouchBar Icons/HidePreview.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/HidePreview.imageset/Contents.json
deleted file mode 100644
index 4aee5eb8..00000000
--- a/MacDown/Images.xcassets/TouchBar Icons/HidePreview.imageset/Contents.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "mac",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "mac",
-      "filename" : "HidePreview@2x.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/HidePreview.imageset/HidePreview@2x.png b/MacDown/Images.xcassets/TouchBar Icons/HidePreview.imageset/HidePreview@2x.png
deleted file mode 100644
index d072aef8..00000000
Binary files a/MacDown/Images.xcassets/TouchBar Icons/HidePreview.imageset/HidePreview@2x.png and /dev/null differ
diff --git a/MacDown/Images.xcassets/TouchBar Icons/Highlight.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/Highlight.imageset/Contents.json
deleted file mode 100644
index a075af3f..00000000
--- a/MacDown/Images.xcassets/TouchBar Icons/Highlight.imageset/Contents.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "mac",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "mac",
-      "filename" : "Highlight@2x.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/Image.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/Image.imageset/Contents.json
deleted file mode 100644
index 5b3fdffd..00000000
--- a/MacDown/Images.xcassets/TouchBar Icons/Image.imageset/Contents.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "mac",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "mac",
-      "filename" : "Image@2x.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/Image.imageset/Image@2x.png b/MacDown/Images.xcassets/TouchBar Icons/Image.imageset/Image@2x.png
deleted file mode 100644
index 97c10c52..00000000
Binary files a/MacDown/Images.xcassets/TouchBar Icons/Image.imageset/Image@2x.png and /dev/null differ
diff --git a/MacDown/Images.xcassets/TouchBar Icons/InlineCode.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/InlineCode.imageset/Contents.json
deleted file mode 100644
index 72385e47..00000000
--- a/MacDown/Images.xcassets/TouchBar Icons/InlineCode.imageset/Contents.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "mac",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "mac",
-      "filename" : "InlineCode@2x.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/Link.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/Link.imageset/Contents.json
deleted file mode 100644
index e6e81595..00000000
--- a/MacDown/Images.xcassets/TouchBar Icons/Link.imageset/Contents.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "mac",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "mac",
-      "filename" : "Link@2x.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/OrderedList.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/OrderedList.imageset/Contents.json
deleted file mode 100644
index 88afe703..00000000
--- a/MacDown/Images.xcassets/TouchBar Icons/OrderedList.imageset/Contents.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "mac",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "mac",
-      "filename" : "OrderedList@2x.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/ShiftLeft.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/ShiftLeft.imageset/Contents.json
deleted file mode 100644
index e44affd8..00000000
--- a/MacDown/Images.xcassets/TouchBar Icons/ShiftLeft.imageset/Contents.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "mac",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "mac",
-      "filename" : "ShiftLeft@2x.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/ShiftRight.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/ShiftRight.imageset/Contents.json
deleted file mode 100644
index 061635c8..00000000
--- a/MacDown/Images.xcassets/TouchBar Icons/ShiftRight.imageset/Contents.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "mac",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "mac",
-      "filename" : "ShiftRight@2x.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/Strikethrough.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/Strikethrough.imageset/Contents.json
deleted file mode 100644
index 66c49911..00000000
--- a/MacDown/Images.xcassets/TouchBar Icons/Strikethrough.imageset/Contents.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "mac",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "mac",
-      "filename" : "Strikethrough@2x.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconBlockquote.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconBlockquote.imageset/Contents.json
new file mode 100644
index 00000000..c07ea731
--- /dev/null
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconBlockquote.imageset/Contents.json	
@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "TouchBarIconBlockquote@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/Blockquote.imageset/Blockquote@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconBlockquote.imageset/TouchBarIconBlockquote@2x.png
similarity index 100%
rename from MacDown/Images.xcassets/TouchBar Icons/Blockquote.imageset/Blockquote@2x.png
rename to MacDown/Images.xcassets/TouchBar Icons/TouchBarIconBlockquote.imageset/TouchBarIconBlockquote@2x.png
diff --git a/MacDown/Images.xcassets/TouchBar Icons/CopyHTML.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconComment.imageset/Contents.json
similarity index 61%
rename from MacDown/Images.xcassets/TouchBar Icons/CopyHTML.imageset/Contents.json
rename to MacDown/Images.xcassets/TouchBar Icons/TouchBarIconComment.imageset/Contents.json
index 6064e380..1433ea9b 100644
--- a/MacDown/Images.xcassets/TouchBar Icons/CopyHTML.imageset/Contents.json	
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconComment.imageset/Contents.json	
@@ -6,12 +6,15 @@
     },
     {
       "idiom" : "mac",
-      "filename" : "CopyHTML@2x.png",
+      "filename" : "TouchBarIconComment@2x.png",
       "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/Comment.imageset/Comment@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconComment.imageset/TouchBarIconComment@2x.png
similarity index 100%
rename from MacDown/Images.xcassets/TouchBar Icons/Comment.imageset/Comment@2x.png
rename to MacDown/Images.xcassets/TouchBar Icons/TouchBarIconComment.imageset/TouchBarIconComment@2x.png
diff --git a/MacDown/Images.xcassets/TouchBar Icons/Headings.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconCopyHTML.imageset/Contents.json
similarity index 61%
rename from MacDown/Images.xcassets/TouchBar Icons/Headings.imageset/Contents.json
rename to MacDown/Images.xcassets/TouchBar Icons/TouchBarIconCopyHTML.imageset/Contents.json
index 778d8319..f291fdb2 100644
--- a/MacDown/Images.xcassets/TouchBar Icons/Headings.imageset/Contents.json	
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconCopyHTML.imageset/Contents.json	
@@ -6,12 +6,15 @@
     },
     {
       "idiom" : "mac",
-      "filename" : "Headings@2x.png",
+      "filename" : "TouchBarIconCopyHTML@2x.png",
       "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconCopyHTML.imageset/TouchBarIconCopyHTML@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconCopyHTML.imageset/TouchBarIconCopyHTML@2x.png
new file mode 100644
index 00000000..1460a4a6
Binary files /dev/null and b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconCopyHTML.imageset/TouchBarIconCopyHTML@2x.png differ
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconEditorAndPreview.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconEditorAndPreview.imageset/Contents.json
new file mode 100644
index 00000000..1d90c190
--- /dev/null
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconEditorAndPreview.imageset/Contents.json	
@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "TouchBarIconEditorAndPreview@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconEditorAndPreview.imageset/TouchBarIconEditorAndPreview@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconEditorAndPreview.imageset/TouchBarIconEditorAndPreview@2x.png
new file mode 100644
index 00000000..c4c830b7
Binary files /dev/null and b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconEditorAndPreview.imageset/TouchBarIconEditorAndPreview@2x.png differ
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHeadings.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHeadings.imageset/Contents.json
new file mode 100644
index 00000000..56c181bb
--- /dev/null
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHeadings.imageset/Contents.json	
@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "TouchBarIconHeadings@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/Headings.imageset/Headings@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHeadings.imageset/TouchBarIconHeadings@2x.png
similarity index 100%
rename from MacDown/Images.xcassets/TouchBar Icons/Headings.imageset/Headings@2x.png
rename to MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHeadings.imageset/TouchBarIconHeadings@2x.png
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHideEditor.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHideEditor.imageset/Contents.json
new file mode 100644
index 00000000..98b4a3c3
--- /dev/null
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHideEditor.imageset/Contents.json	
@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "TouchBarIconHideEditor@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHideEditor.imageset/TouchBarIconHideEditor@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHideEditor.imageset/TouchBarIconHideEditor@2x.png
new file mode 100644
index 00000000..a866479f
Binary files /dev/null and b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHideEditor.imageset/TouchBarIconHideEditor@2x.png differ
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHidePreview.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHidePreview.imageset/Contents.json
new file mode 100644
index 00000000..ec6e5f1e
--- /dev/null
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHidePreview.imageset/Contents.json	
@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "TouchBarIconHidePreview@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHidePreview.imageset/TouchBarIconHidePreview@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHidePreview.imageset/TouchBarIconHidePreview@2x.png
new file mode 100644
index 00000000..f7d5fd52
Binary files /dev/null and b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHidePreview.imageset/TouchBarIconHidePreview@2x.png differ
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHighlight.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHighlight.imageset/Contents.json
new file mode 100644
index 00000000..1cf82823
--- /dev/null
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHighlight.imageset/Contents.json	
@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "TouchBarIconHighlight@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/Highlight.imageset/Highlight@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHighlight.imageset/TouchBarIconHighlight@2x.png
similarity index 100%
rename from MacDown/Images.xcassets/TouchBar Icons/Highlight.imageset/Highlight@2x.png
rename to MacDown/Images.xcassets/TouchBar Icons/TouchBarIconHighlight.imageset/TouchBarIconHighlight@2x.png
diff --git a/MacDown/Images.xcassets/TouchBar Icons/Comment.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconImage.imageset/Contents.json
similarity index 62%
rename from MacDown/Images.xcassets/TouchBar Icons/Comment.imageset/Contents.json
rename to MacDown/Images.xcassets/TouchBar Icons/TouchBarIconImage.imageset/Contents.json
index e1bc85f1..17a9e6bd 100644
--- a/MacDown/Images.xcassets/TouchBar Icons/Comment.imageset/Contents.json	
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconImage.imageset/Contents.json	
@@ -6,12 +6,15 @@
     },
     {
       "idiom" : "mac",
-      "filename" : "Comment@2x.png",
+      "filename" : "TouchBarIconImage@2x.png",
       "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconImage.imageset/TouchBarIconImage@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconImage.imageset/TouchBarIconImage@2x.png
new file mode 100644
index 00000000..0e0fc416
Binary files /dev/null and b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconImage.imageset/TouchBarIconImage@2x.png differ
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconInlineCode.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconInlineCode.imageset/Contents.json
new file mode 100644
index 00000000..a82328c4
--- /dev/null
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconInlineCode.imageset/Contents.json	
@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "TouchBarIconInlineCode@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/InlineCode.imageset/InlineCode@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconInlineCode.imageset/TouchBarIconInlineCode@2x.png
similarity index 100%
rename from MacDown/Images.xcassets/TouchBar Icons/InlineCode.imageset/InlineCode@2x.png
rename to MacDown/Images.xcassets/TouchBar Icons/TouchBarIconInlineCode.imageset/TouchBarIconInlineCode@2x.png
diff --git a/MacDown/Images.xcassets/TouchBar Icons/Blockquote.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconLink.imageset/Contents.json
similarity index 62%
rename from MacDown/Images.xcassets/TouchBar Icons/Blockquote.imageset/Contents.json
rename to MacDown/Images.xcassets/TouchBar Icons/TouchBarIconLink.imageset/Contents.json
index 5b877cb3..50f173b3 100644
--- a/MacDown/Images.xcassets/TouchBar Icons/Blockquote.imageset/Contents.json	
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconLink.imageset/Contents.json	
@@ -6,12 +6,15 @@
     },
     {
       "idiom" : "mac",
-      "filename" : "Blockquote@2x.png",
+      "filename" : "TouchBarIconLink@2x.png",
       "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/Link.imageset/Link@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconLink.imageset/TouchBarIconLink@2x.png
similarity index 100%
rename from MacDown/Images.xcassets/TouchBar Icons/Link.imageset/Link@2x.png
rename to MacDown/Images.xcassets/TouchBar Icons/TouchBarIconLink.imageset/TouchBarIconLink@2x.png
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconOrderedList.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconOrderedList.imageset/Contents.json
new file mode 100644
index 00000000..834907b4
--- /dev/null
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconOrderedList.imageset/Contents.json	
@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "TouchBarIconOrderedList@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/OrderedList.imageset/OrderedList@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconOrderedList.imageset/TouchBarIconOrderedList@2x.png
similarity index 100%
rename from MacDown/Images.xcassets/TouchBar Icons/OrderedList.imageset/OrderedList@2x.png
rename to MacDown/Images.xcassets/TouchBar Icons/TouchBarIconOrderedList.imageset/TouchBarIconOrderedList@2x.png
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconShiftLeft.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconShiftLeft.imageset/Contents.json
new file mode 100644
index 00000000..6bb3df3a
--- /dev/null
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconShiftLeft.imageset/Contents.json	
@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "TouchBarIconShiftLeft@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/ShiftLeft.imageset/ShiftLeft@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconShiftLeft.imageset/TouchBarIconShiftLeft@2x.png
similarity index 100%
rename from MacDown/Images.xcassets/TouchBar Icons/ShiftLeft.imageset/ShiftLeft@2x.png
rename to MacDown/Images.xcassets/TouchBar Icons/TouchBarIconShiftLeft.imageset/TouchBarIconShiftLeft@2x.png
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconShiftRight.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconShiftRight.imageset/Contents.json
new file mode 100644
index 00000000..60f85cc0
--- /dev/null
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconShiftRight.imageset/Contents.json	
@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "TouchBarIconShiftRight@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/ShiftRight.imageset/ShiftRight@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconShiftRight.imageset/TouchBarIconShiftRight@2x.png
similarity index 100%
rename from MacDown/Images.xcassets/TouchBar Icons/ShiftRight.imageset/ShiftRight@2x.png
rename to MacDown/Images.xcassets/TouchBar Icons/TouchBarIconShiftRight.imageset/TouchBarIconShiftRight@2x.png
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconStrikethrough.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconStrikethrough.imageset/Contents.json
new file mode 100644
index 00000000..40cbb3b5
--- /dev/null
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconStrikethrough.imageset/Contents.json	
@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "TouchBarIconStrikethrough@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/Strikethrough.imageset/Strikethrough@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconStrikethrough.imageset/TouchBarIconStrikethrough@2x.png
similarity index 100%
rename from MacDown/Images.xcassets/TouchBar Icons/Strikethrough.imageset/Strikethrough@2x.png
rename to MacDown/Images.xcassets/TouchBar Icons/TouchBarIconStrikethrough.imageset/TouchBarIconStrikethrough@2x.png
diff --git a/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconUnorderedList.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconUnorderedList.imageset/Contents.json
new file mode 100644
index 00000000..63471258
--- /dev/null
+++ b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconUnorderedList.imageset/Contents.json	
@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "TouchBarIconUnorderedList@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/MacDown/Images.xcassets/TouchBar Icons/UnorderedList.imageset/UnorderedList@2x.png b/MacDown/Images.xcassets/TouchBar Icons/TouchBarIconUnorderedList.imageset/TouchBarIconUnorderedList@2x.png
similarity index 100%
rename from MacDown/Images.xcassets/TouchBar Icons/UnorderedList.imageset/UnorderedList@2x.png
rename to MacDown/Images.xcassets/TouchBar Icons/TouchBarIconUnorderedList.imageset/TouchBarIconUnorderedList@2x.png
diff --git a/MacDown/Images.xcassets/TouchBar Icons/UnorderedList.imageset/Contents.json b/MacDown/Images.xcassets/TouchBar Icons/UnorderedList.imageset/Contents.json
deleted file mode 100644
index 2f491c9c..00000000
--- a/MacDown/Images.xcassets/TouchBar Icons/UnorderedList.imageset/Contents.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "mac",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "mac",
-      "filename" : "UnorderedList@2x.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/MacDown/Localization/Base.lproj/MPDocument.xib b/MacDown/Localization/Base.lproj/MPDocument.xib
index 037d5424..0cfe945f 100644
--- a/MacDown/Localization/Base.lproj/MPDocument.xib
+++ b/MacDown/Localization/Base.lproj/MPDocument.xib
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaDFRPlugin" version="13752"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
-        <plugIn identifier="com.apple.WebKitIBPlugin" version="13771"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaDFRPlugin" version="14019"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
+        <plugIn identifier="com.apple.WebKitIBPlugin" version="14109"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-        <capability name="the Touch Bar" message="Use a version of macOS with Touch Bar support." minToolsVersion="8.1" minSystemVersion="10.12.2" requiredIntegratedClassName="NSTouchBar"/>
+        <capability name="the Touch Bar" minToolsVersion="8.1" minSystemVersion="10.12.2" requiredIntegratedClassName="NSTouchBar"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MPDocument">
@@ -29,7 +29,7 @@
             <windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="0.0" y="0.0" width="1024" height="578"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1028"/>
             <value key="minSize" type="size" width="94" height="86"/>
             <view key="contentView" id="gIp-Ho-8D9">
                 <rect key="frame" x="0.0" y="0.0" width="1024" height="578"/>
@@ -56,11 +56,11 @@
                                                             <touchBarItem id="sSp-mh-ZwK">
                                                                 <viewController key="viewController" id="7Nv-tM-qQa">
                                                                     <button key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="et6-8d-LrM">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="30" height="30"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="40" height="30"/>
                                                                         <constraints>
-                                                                            <constraint firstAttribute="width" constant="30" id="NEW-bJ-2UP"/>
+                                                                            <constraint firstAttribute="width" constant="40" id="NEW-bJ-2UP"/>
                                                                         </constraints>
-                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="ToolbarIconShiftLeft" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="93m-iZ-Ulx">
+                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="TouchBarIconShiftLeft" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="93m-iZ-Ulx">
                                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                             <font key="font" usesAppearanceFont="YES"/>
                                                                         </buttonCell>
@@ -69,16 +69,16 @@
                                                                         </connections>
                                                                     </button>
                                                                 </viewController>
-                                                                <size key="designTimeSize" width="30" height="30"/>
+                                                                <size key="designTimeSize" width="40" height="30"/>
                                                             </touchBarItem>
                                                             <touchBarItem id="6wk-ES-1Z0">
                                                                 <viewController key="viewController" id="P5D-3L-eIr">
                                                                     <button key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7Xh-gY-7du">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="30" height="30"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="40" height="30"/>
                                                                         <constraints>
-                                                                            <constraint firstAttribute="width" constant="30" id="wM2-xs-mPM"/>
+                                                                            <constraint firstAttribute="width" constant="40" id="wM2-xs-mPM"/>
                                                                         </constraints>
-                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="ToolbarIconShiftRight" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Gnf-WK-UeS">
+                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="TouchBarIconShiftRight" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="Gnf-WK-UeS">
                                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                             <font key="font" usesAppearanceFont="YES"/>
                                                                         </buttonCell>
@@ -87,17 +87,17 @@
                                                                         </connections>
                                                                     </button>
                                                                 </viewController>
-                                                                <size key="designTimeSize" width="30" height="30"/>
+                                                                <size key="designTimeSize" width="40" height="30"/>
                                                             </touchBarItem>
-                                                            <touchBarSpacerItem identifier="NSTouchBarItemIdentifierFixedSpaceSmall" id="rlj-X5-hje"/>
+                                                            <touchBarSpacerItem identifier="NSTouchBarItemIdentifierFlexibleSpace" id="wD0-9r-N35"/>
                                                             <touchBarItem id="lrg-rQ-HD4">
                                                                 <viewController key="viewController" id="wcQ-yS-faM">
                                                                     <button key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gka-R1-jaA">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="31" height="30"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="40" height="30"/>
                                                                         <constraints>
-                                                                            <constraint firstAttribute="width" constant="31" id="voO-vs-6Zb"/>
+                                                                            <constraint firstAttribute="width" constant="40" id="voO-vs-6Zb"/>
                                                                         </constraints>
-                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="ToolbarIconBold" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="0ac-Th-vit">
+                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="NSTouchBarTextBoldTemplate" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="0ac-Th-vit">
                                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                             <font key="font" metaFont="systemBold" size="16"/>
                                                                         </buttonCell>
@@ -106,16 +106,16 @@
                                                                         </connections>
                                                                     </button>
                                                                 </viewController>
-                                                                <size key="designTimeSize" width="31" height="30"/>
+                                                                <size key="designTimeSize" width="40" height="30"/>
                                                             </touchBarItem>
                                                             <touchBarItem id="Dfc-T4-2vh">
                                                                 <viewController key="viewController" id="7Qy-D9-pML">
                                                                     <button key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XTG-XE-1bO">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="30" height="30"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="40" height="30"/>
                                                                         <constraints>
-                                                                            <constraint firstAttribute="width" constant="30" id="kRa-t7-DdC"/>
+                                                                            <constraint firstAttribute="width" constant="40" id="kRa-t7-DdC"/>
                                                                         </constraints>
-                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="ToolbarIconItalic" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ODh-am-O2n">
+                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="NSTouchBarTextItalicTemplate" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="ODh-am-O2n">
                                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                             <font key="font" size="17" name="Courier-Oblique"/>
                                                                         </buttonCell>
@@ -124,64 +124,128 @@
                                                                         </connections>
                                                                     </button>
                                                                 </viewController>
-                                                                <size key="designTimeSize" width="30" height="30"/>
-                                                            </touchBarItem>
-                                                            <touchBarSpacerItem identifier="NSTouchBarItemIdentifierFixedSpaceSmall" id="vov-Pb-MIi"/>
-                                                            <touchBarItem id="lch-mN-T6x">
-                                                                <viewController key="viewController" id="NkH-Q9-LLW">
-                                                                    <button key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JT9-Lg-ado">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="40" height="30"/>
-                                                                        <constraints>
-                                                                            <constraint firstAttribute="width" constant="40" id="4Ee-1j-cjG"/>
-                                                                        </constraints>
-                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="ToolbarIconHeading1" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="bXN-a6-jWR">
-                                                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                            <font key="font" usesAppearanceFont="YES"/>
-                                                                        </buttonCell>
-                                                                        <connections>
-                                                                            <action selector="convertToH1:" target="-2" id="5Lm-9e-YQk"/>
-                                                                        </connections>
-                                                                    </button>
-                                                                </viewController>
-                                                                <size key="designTimeSize" width="40" height="30"/>
-                                                            </touchBarItem>
-                                                            <touchBarItem id="2lw-KG-moJ">
-                                                                <viewController key="viewController" id="Cgf-Yd-IQL">
-                                                                    <button key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7dO-KS-sK6">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="40" height="30"/>
-                                                                        <constraints>
-                                                                            <constraint firstAttribute="width" constant="40" id="22c-QC-jQK"/>
-                                                                        </constraints>
-                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="ToolbarIconHeading2" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="gwE-c3-GUT">
-                                                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                            <font key="font" metaFont="system"/>
-                                                                        </buttonCell>
-                                                                        <connections>
-                                                                            <action selector="convertToH2:" target="-2" id="iNW-Uq-BzM"/>
-                                                                        </connections>
-                                                                    </button>
-                                                                </viewController>
-                                                                <size key="designTimeSize" width="40" height="30"/>
-                                                            </touchBarItem>
-                                                            <touchBarItem id="avZ-oE-kYw">
-                                                                <viewController key="viewController" id="5UE-zf-DSv">
-                                                                    <button key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eru-mN-db2">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="40" height="30"/>
-                                                                        <constraints>
-                                                                            <constraint firstAttribute="width" constant="40" id="woJ-13-Hip"/>
-                                                                        </constraints>
-                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="ToolbarIconHeading3" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="4Ma-Yl-FRx">
-                                                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                            <font key="font" metaFont="system"/>
-                                                                            <connections>
-                                                                                <action selector="convertToH3:" target="-2" id="mbx-fU-gsr"/>
-                                                                            </connections>
-                                                                        </buttonCell>
-                                                                    </button>
-                                                                </viewController>
                                                                 <size key="designTimeSize" width="40" height="30"/>
                                                             </touchBarItem>
-                                                            <touchBarSpacerItem identifier="NSTouchBarItemIdentifierFixedSpaceSmall" id="2XN-y5-qGP"/>
+                                                            <touchBarSpacerItem identifier="NSTouchBarItemIdentifierFlexibleSpace" id="oGI-TH-CU0"/>
+                                                            <touchBarPopoverItem collapsedRepresentationImage="TouchBarIconHeadings" collapsedRepresentationLabel="" supportsPressAndHold="YES" id="Mt7-aO-d6Z">
+                                                                <touchBar key="popoverTouchBar" id="hJE-QT-veQ">
+                                                                    <touchBarItems>
+                                                                        <touchBarItem id="TH0-ta-7E1">
+                                                                            <viewController key="viewController" id="oRY-8q-ycL">
+                                                                                <button key="view" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8ix-4P-UIB">
+                                                                                    <rect key="frame" x="6" y="-4" width="72" height="30"/>
+                                                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                                                    <buttonCell key="cell" type="push" title="Text" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="dPo-OZ-Hdz">
+                                                                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                                                    </buttonCell>
+                                                                                    <connections>
+                                                                                        <action selector="convertToParagraph:" target="-2" id="qYe-ZJ-j5Z"/>
+                                                                                    </connections>
+                                                                                </button>
+                                                                            </viewController>
+                                                                            <size key="designTimeSize" width="60" height="19"/>
+                                                                        </touchBarItem>
+                                                                        <touchBarItem id="bRQ-aq-aXo">
+                                                                            <viewController key="viewController" id="oqN-wb-Vly">
+                                                                                <button key="view" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2nX-cf-kFS">
+                                                                                    <rect key="frame" x="6" y="-4" width="72" height="30"/>
+                                                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                                                    <buttonCell key="cell" type="push" title="H1" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="H5W-Wu-gPZ">
+                                                                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                                                    </buttonCell>
+                                                                                    <connections>
+                                                                                        <action selector="convertToH1:" target="-2" id="hTa-6D-SZq"/>
+                                                                                    </connections>
+                                                                                </button>
+                                                                            </viewController>
+                                                                            <size key="designTimeSize" width="60" height="19"/>
+                                                                        </touchBarItem>
+                                                                        <touchBarItem id="DLu-ki-KXD">
+                                                                            <viewController key="viewController" id="2Uc-US-JCj">
+                                                                                <button key="view" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dxb-gK-8HI">
+                                                                                    <rect key="frame" x="6" y="-4" width="72" height="30"/>
+                                                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                                                    <buttonCell key="cell" type="push" title="H2" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="rdq-e7-ugg">
+                                                                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                                                    </buttonCell>
+                                                                                    <connections>
+                                                                                        <action selector="convertToH2:" target="-2" id="LBK-xp-KxR"/>
+                                                                                    </connections>
+                                                                                </button>
+                                                                            </viewController>
+                                                                            <size key="designTimeSize" width="60" height="19"/>
+                                                                        </touchBarItem>
+                                                                        <touchBarItem id="bxd-rh-vhR">
+                                                                            <viewController key="viewController" id="Peo-tt-YI5">
+                                                                                <button key="view" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZVw-1e-hfv">
+                                                                                    <rect key="frame" x="6" y="-4" width="72" height="30"/>
+                                                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                                                    <buttonCell key="cell" type="push" title="H3" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="xRF-se-t13">
+                                                                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                                                    </buttonCell>
+                                                                                    <connections>
+                                                                                        <action selector="convertToH3:" target="-2" id="fdI-Mu-4gk"/>
+                                                                                    </connections>
+                                                                                </button>
+                                                                            </viewController>
+                                                                            <size key="designTimeSize" width="60" height="19"/>
+                                                                        </touchBarItem>
+                                                                        <touchBarItem id="scE-vy-m0B">
+                                                                            <viewController key="viewController" id="V1U-4G-4gw">
+                                                                                <button key="view" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3n2-Kg-rF6">
+                                                                                    <rect key="frame" x="6" y="-4" width="72" height="30"/>
+                                                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                                                    <buttonCell key="cell" type="push" title="H4" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="QiC-vC-KbR">
+                                                                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                                                    </buttonCell>
+                                                                                    <connections>
+                                                                                        <action selector="convertToH4:" target="-2" id="Yif-pd-43d"/>
+                                                                                    </connections>
+                                                                                </button>
+                                                                            </viewController>
+                                                                            <size key="designTimeSize" width="60" height="19"/>
+                                                                        </touchBarItem>
+                                                                        <touchBarItem id="oZ5-T7-hLm">
+                                                                            <viewController key="viewController" id="a6r-1M-uoR">
+                                                                                <button key="view" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hVd-8e-I5V">
+                                                                                    <rect key="frame" x="6" y="-4" width="72" height="30"/>
+                                                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                                                    <buttonCell key="cell" type="push" title="H5" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="KTn-mr-UBa">
+                                                                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                                                    </buttonCell>
+                                                                                    <connections>
+                                                                                        <action selector="convertToH5:" target="-2" id="3me-hf-5Gy"/>
+                                                                                    </connections>
+                                                                                </button>
+                                                                            </viewController>
+                                                                            <size key="designTimeSize" width="60" height="19"/>
+                                                                        </touchBarItem>
+                                                                        <touchBarItem id="iaP-Q7-5qn">
+                                                                            <viewController key="viewController" id="LCs-in-t5U">
+                                                                                <button key="view" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FD4-Ba-qiT">
+                                                                                    <rect key="frame" x="6" y="-4" width="72" height="30"/>
+                                                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                                                    <buttonCell key="cell" type="push" title="H6" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="r5a-yJ-MY2">
+                                                                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                                                    </buttonCell>
+                                                                                    <connections>
+                                                                                        <action selector="convertToH6:" target="-2" id="Gpb-vJ-UaA"/>
+                                                                                    </connections>
+                                                                                </button>
+                                                                            </viewController>
+                                                                            <size key="designTimeSize" width="60" height="19"/>
+                                                                        </touchBarItem>
+                                                                    </touchBarItems>
+                                                                </touchBar>
+                                                            </touchBarPopoverItem>
+                                                            <touchBarSpacerItem identifier="NSTouchBarItemIdentifierFlexibleSpace" id="TE9-ne-Z4M"/>
                                                             <touchBarItem id="KyV-NE-0fD">
                                                                 <viewController key="viewController" id="Jeg-dU-NyD">
                                                                     <button key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="z2S-kp-7ZU">
@@ -189,7 +253,7 @@
                                                                         <constraints>
                                                                             <constraint firstAttribute="width" constant="40" id="2TX-4K-p7h"/>
                                                                         </constraints>
-                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="UnorderedList" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="9bU-HD-UoN">
+                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="TouchBarIconUnorderedList" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="9bU-HD-UoN">
                                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                             <font key="font" usesAppearanceFont="YES"/>
                                                                         </buttonCell>
@@ -207,7 +271,7 @@
                                                                         <constraints>
                                                                             <constraint firstAttribute="width" constant="40" id="Yum-ud-Np2"/>
                                                                         </constraints>
-                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="ToolbarIconOrderedList" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="boC-0J-uqF">
+                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="TouchBarIconOrderedList" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="boC-0J-uqF">
                                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                             <font key="font" usesAppearanceFont="YES"/>
                                                                         </buttonCell>
@@ -218,7 +282,7 @@
                                                                 </viewController>
                                                                 <size key="designTimeSize" width="40" height="30"/>
                                                             </touchBarItem>
-                                                            <touchBarSpacerItem identifier="NSTouchBarItemIdentifierFixedSpaceSmall" id="idU-E1-42P"/>
+                                                            <touchBarSpacerItem identifier="NSTouchBarItemIdentifierFlexibleSpace" id="ZkP-Bg-rhj"/>
                                                             <touchBarItem id="CAJ-9f-72R">
                                                                 <viewController key="viewController" id="VZ8-Fx-eeV">
                                                                     <button key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oyw-eD-Ws5">
@@ -226,7 +290,7 @@
                                                                         <constraints>
                                                                             <constraint firstAttribute="width" constant="40" id="CbV-hl-cOo"/>
                                                                         </constraints>
-                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="ToolbarIconBlockquote" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="j03-WB-tZz">
+                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="TouchBarIconBlockquote" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="j03-WB-tZz">
                                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                             <font key="font" usesAppearanceFont="YES"/>
                                                                         </buttonCell>
@@ -244,7 +308,7 @@
                                                                         <constraints>
                                                                             <constraint firstAttribute="width" constant="40" id="K7J-gG-gYt"/>
                                                                         </constraints>
-                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="ToolbarIconInlineCode" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Kcg-mK-vsR">
+                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="ToolbarIconInlineCode" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="Kcg-mK-vsR">
                                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                             <font key="font" usesAppearanceFont="YES"/>
                                                                         </buttonCell>
@@ -255,7 +319,7 @@
                                                                 </viewController>
                                                                 <size key="designTimeSize" width="40" height="30"/>
                                                             </touchBarItem>
-                                                            <touchBarSpacerItem identifier="NSTouchBarItemIdentifierFixedSpaceSmall" id="4Ff-nP-ZL4"/>
+                                                            <touchBarSpacerItem identifier="NSTouchBarItemIdentifierFlexibleSpace" id="B07-KD-Ocm"/>
                                                             <touchBarItem id="DEE-Qp-CSL">
                                                                 <viewController key="viewController" id="QUS-Ae-ifK">
                                                                     <button key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HCx-zg-Fi2">
@@ -263,7 +327,7 @@
                                                                         <constraints>
                                                                             <constraint firstAttribute="width" constant="40" id="F1u-O4-mHh"/>
                                                                         </constraints>
-                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="ToolbarIconLink" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="xsD-Zt-hym">
+                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="TouchBarIconLink" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="xsD-Zt-hym">
                                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                             <font key="font" usesAppearanceFont="YES"/>
                                                                         </buttonCell>
@@ -281,7 +345,7 @@
                                                                         <constraints>
                                                                             <constraint firstAttribute="width" constant="40" id="KXx-2Q-TcL"/>
                                                                         </constraints>
-                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="ToolbarIconImage" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="CPU-DI-yi3">
+                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="TouchBarIconImage" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="CPU-DI-yi3">
                                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                             <font key="font" usesAppearanceFont="YES"/>
                                                                         </buttonCell>
@@ -292,7 +356,7 @@
                                                                 </viewController>
                                                                 <size key="designTimeSize" width="40" height="30"/>
                                                             </touchBarItem>
-                                                            <touchBarSpacerItem identifier="NSTouchBarItemIdentifierFixedSpaceSmall" id="WZQ-iv-AuJ"/>
+                                                            <touchBarSpacerItem identifier="NSTouchBarItemIdentifierFlexibleSpace" id="yM1-Fp-nt2"/>
                                                             <touchBarItem id="Uk6-f6-1mf">
                                                                 <viewController key="viewController" id="jco-ad-7fY">
                                                                     <button key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kl9-Fg-i6T">
@@ -300,7 +364,7 @@
                                                                         <constraints>
                                                                             <constraint firstAttribute="width" constant="40" id="7iW-vj-tKb"/>
                                                                         </constraints>
-                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="ToolbarIconCopyHTML" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Aci-p5-Kna">
+                                                                        <buttonCell key="cell" type="push" bezelStyle="rounded" image="TouchBarIconCopyHTML" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="Aci-p5-Kna">
                                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                             <font key="font" usesAppearanceFont="YES"/>
                                                                         </buttonCell>
@@ -412,19 +476,17 @@
         </customObject>
     </objects>
     <resources>
-        <image name="ToolbarIconBlockquote" width="19" height="19"/>
-        <image name="ToolbarIconBold" width="19" height="19"/>
-        <image name="ToolbarIconCopyHTML" width="19" height="19"/>
-        <image name="ToolbarIconHeading1" width="19" height="19"/>
-        <image name="ToolbarIconHeading2" width="19" height="19"/>
-        <image name="ToolbarIconHeading3" width="19" height="19"/>
-        <image name="ToolbarIconImage" width="19" height="19"/>
+        <image name="NSTouchBarTextBoldTemplate" width="12" height="30"/>
+        <image name="NSTouchBarTextItalicTemplate" width="8" height="30"/>
         <image name="ToolbarIconInlineCode" width="19" height="19"/>
-        <image name="ToolbarIconItalic" width="19" height="19"/>
-        <image name="ToolbarIconLink" width="19" height="19"/>
-        <image name="ToolbarIconOrderedList" width="19" height="19"/>
-        <image name="ToolbarIconShiftLeft" width="19" height="19"/>
-        <image name="ToolbarIconShiftRight" width="19" height="19"/>
-        <image name="UnorderedList" width="30" height="30"/>
+        <image name="TouchBarIconBlockquote" width="30" height="30"/>
+        <image name="TouchBarIconCopyHTML" width="30" height="30"/>
+        <image name="TouchBarIconHeadings" width="30" height="30"/>
+        <image name="TouchBarIconImage" width="30" height="30"/>
+        <image name="TouchBarIconLink" width="30" height="30"/>
+        <image name="TouchBarIconOrderedList" width="30" height="30"/>
+        <image name="TouchBarIconShiftLeft" width="30" height="30"/>
+        <image name="TouchBarIconShiftRight" width="30" height="30"/>
+        <image name="TouchBarIconUnorderedList" width="30" height="30"/>
     </resources>
 </document>