diff --git a/Content/UniversalEditor.Content.PlatformIndependent/Editors/Markup/Commands.uexml b/Content/UniversalEditor.Content.PlatformIndependent/Editors/Markup/Commands.uexml
new file mode 100644
index 00000000..f8290442
--- /dev/null
+++ b/Content/UniversalEditor.Content.PlatformIndependent/Editors/Markup/Commands.uexml
@@ -0,0 +1,26 @@
+<UniversalEditor Version="5.0">
+	<Editors>
+		<Editor ID="{4F56A826-32B4-4347-B2D5-379717EA57D4}" TypeName="UniversalEditor.Editors.Markup.MarkupEditor">
+			<Commands>
+				<Command ID="MarkupEditor_DocumentExplorer_ContextMenu_Add_Tag" Title="Tag" />
+				<Command ID="MarkupEditor_DocumentExplorer_ContextMenu_Add_Preprocessor" Title="Preprocessor" />
+				<Command ID="MarkupEditor_DocumentExplorer_ContextMenu_Add_Comment" Title="Comment" />
+				<Command ID="MarkupEditor_DocumentExplorer_ContextMenu_Add" Title="A_dd">
+					<Items>
+						<CommandReference CommandID="MarkupEditor_DocumentExplorer_ContextMenu_Add_Tag" />
+						<CommandReference CommandID="MarkupEditor_DocumentExplorer_ContextMenu_Add_Preprocessor" />
+						<CommandReference CommandID="MarkupEditor_DocumentExplorer_ContextMenu_Add_Comment" />
+					</Items>
+				</Command>
+				
+				<Command ID="MarkupEditor_DocumentExplorer_ContextMenu">
+					<Items>
+						<CommandReference CommandID="MarkupEditor_DocumentExplorer_ContextMenu_Add" />
+						<Separator />
+						<CommandReference CommandID="FileProperties" />
+					</Items>
+				</Command>
+			</Commands>
+		</Editor>
+	</Editors>
+</UniversalEditor>
\ No newline at end of file
diff --git a/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj b/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
index 4008219e..9ac40dd6 100644
--- a/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
+++ b/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
@@ -746,6 +746,7 @@
     <Content Include="Extensions\Office\Associations\Presentation\HyperCardDataFormat.uexml" />
     <Content Include="Editors\Markup\MarkupEditor.glade" />
     <Content Include="Extensions\GraphicDesigner\Associations\Picture\TIFF.uexml" />
+    <Content Include="Editors\Markup\Commands.uexml" />
     <Content Include="Extensions\Microsoft\Associations\OLE1.uexml" />
     <Content Include="Extensions\FileSystem\Associations\Microsoft\NTFS.uexml" />
   </ItemGroup>
diff --git a/Libraries/UniversalEditor.UserInterface/Editors/Markup/MarkupEditor.cs b/Libraries/UniversalEditor.UserInterface/Editors/Markup/MarkupEditor.cs
index aaa3343b..f6cde0cd 100644
--- a/Libraries/UniversalEditor.UserInterface/Editors/Markup/MarkupEditor.cs
+++ b/Libraries/UniversalEditor.UserInterface/Editors/Markup/MarkupEditor.cs
@@ -48,6 +48,22 @@ namespace UniversalEditor.Editors.Markup
 			return _er;
 		}
 
+		public MarkupEditor()
+		{
+			DocumentExplorer.BeforeContextMenu += DocumentExplorer_BeforeContextMenu;
+		}
+
+		private void DocumentExplorer_BeforeContextMenu(object sender, EditorDocumentExplorerBeforeContextMenuEventArgs e)
+		{
+			MarkupElement elParent = null;
+			if (e.Node != null)
+			{
+				elParent = e.Node.GetExtraData<MarkupElement>("el");
+			}
+			e.ContextMenuCommandID = "MarkupEditor_DocumentExplorer_ContextMenu";
+		}
+
+
 		public override void UpdateSelections()
 		{
 		}
@@ -61,6 +77,61 @@ namespace UniversalEditor.Editors.Markup
 		{
 			base.OnCreated(e);
 			OnObjectModelChanged(e);
+
+			Context.AttachCommandEventHandler("MarkupEditor_DocumentExplorer_ContextMenu_Add_Tag", MarkupEditor_DocumentExplorer_ContextMenu_Add_Tag);
+			Context.AttachCommandEventHandler("MarkupEditor_DocumentExplorer_ContextMenu_Add_Preprocessor", MarkupEditor_DocumentExplorer_ContextMenu_Add_Preprocessor);
+			Context.AttachCommandEventHandler("MarkupEditor_DocumentExplorer_ContextMenu_Add_Comment", MarkupEditor_DocumentExplorer_ContextMenu_Add_Comment);
+		}
+
+		private void MarkupEditor_DocumentExplorer_ContextMenu_Add_Tag(object sender, EventArgs e)
+		{
+			MarkupObjectModel mom = (ObjectModel as MarkupObjectModel);
+			if (mom == null) return;
+
+			MarkupTagElement tag = new MarkupTagElement();
+			tag.FullName = "untitled";
+
+			if (DocumentExplorer.SelectedNode != null)
+			{
+				MarkupElement el = DocumentExplorer.SelectedNode.GetExtraData<MarkupElement>("el");
+				RecursiveLoadDocumentExplorer(tag, DocumentExplorer.SelectedNode);
+			}
+			else
+			{
+				RecursiveLoadDocumentExplorer(tag, null);
+			}
+		}
+		private void MarkupEditor_DocumentExplorer_ContextMenu_Add_Preprocessor(object sender, EventArgs e)
+		{
+			MarkupObjectModel mom = (ObjectModel as MarkupObjectModel);
+			if (mom == null) return;
+
+			if (DocumentExplorer.SelectedNode != null)
+			{
+				MarkupElement el = DocumentExplorer.SelectedNode.GetExtraData<MarkupElement>("el");
+				if (el is MarkupTagElement)
+				{
+					MarkupPreprocessorElement tag = new MarkupPreprocessorElement();
+					(el as MarkupTagElement).Elements.Add(tag);
+					RecursiveLoadDocumentExplorer(tag, DocumentExplorer.SelectedNode);
+				}
+			}
+		}
+		private void MarkupEditor_DocumentExplorer_ContextMenu_Add_Comment(object sender, EventArgs e)
+		{
+			MarkupObjectModel mom = (ObjectModel as MarkupObjectModel);
+			if (mom == null) return;
+
+			if (DocumentExplorer.SelectedNode != null)
+			{
+				MarkupElement el = DocumentExplorer.SelectedNode.GetExtraData<MarkupElement>("el");
+				if (el is MarkupTagElement)
+				{
+					MarkupCommentElement tag = new MarkupCommentElement();
+					(el as MarkupTagElement).Elements.Add(tag);
+					RecursiveLoadDocumentExplorer(tag, DocumentExplorer.SelectedNode);
+				}
+			}
 		}
 
 		protected override void OnObjectModelChanged(EventArgs e)
@@ -207,5 +278,39 @@ namespace UniversalEditor.Editors.Markup
 				parent.Rows.Add(row);
 			}
 		}
+
+		private CustomSettingsProvider _spMarkupProvider = null;
+		protected override SettingsProvider[] GetDocumentPropertiesSettingsProviders()
+		{
+			if (_spMarkupProvider == null)
+			{
+				_spMarkupProvider = new CustomSettingsProvider();
+				_spMarkupProvider.SettingsLoaded += _spMarkupProvider_SettingsLoaded;
+				_spMarkupProvider.SettingsSaved += _spMarkupProvider_SettingsSaved;
+				_spMarkupProvider.SettingsGroups.Add(new SettingsGroup("General", new Setting[]
+				{
+					new ChoiceSetting("Version", null, new ChoiceSetting.ChoiceSettingValue[]
+					{
+						new ChoiceSetting.ChoiceSettingValue("1.0", 1.0)
+					}),
+					new ChoiceSetting("Encoding", null, new ChoiceSetting.ChoiceSettingValue[]
+					{
+						new ChoiceSetting.ChoiceSettingValue("UTF-8", "utf-8")
+					}),
+					new BooleanSetting("Standalone", false)
+				}));
+			}
+			return new SettingsProvider[] { _spMarkupProvider };
+		}
+
+		void _spMarkupProvider_SettingsLoaded(object sender, EventArgs e)
+		{
+		}
+
+
+		void _spMarkupProvider_SettingsSaved(object sender, EventArgs e)
+		{
+		}
+
 	}
 }