From ea8e52848558cb30aa9d5b5ade0ea514cfaa7bfc Mon Sep 17 00:00:00 2001
From: Steven <stevencohn@users.noreply.github.com>
Date: Wed, 25 Aug 2021 18:13:34 -0400
Subject: [PATCH] Bgcolor (#257)

---
 OneMore.sln                                   |  11 +-
 OneMore/AddInCommands.cs                      |   3 +
 OneMore/AddInStyleGallery.cs                  |  12 +-
 .../Commands/Clean/ClearBackgroundCommand.cs  |   1 +
 OneMore/Commands/Clean/RemoveEmptyCommand.cs  |   3 +-
 .../Commands/Clean/RemoveSpacingCommand.cs    |   3 +-
 OneMore/Commands/Edit/AlterSizeCommand.cs     |   1 +
 OneMore/Commands/Extras/StrikeoutCommand.cs   |   1 +
 OneMore/Commands/Images/AddCaptionCommand.cs  |   5 +-
 OneMore/Commands/Images/GetImagesCommand.cs   |   1 +
 OneMore/Commands/Styles/ApplyStyleCommand.cs  |   7 +-
 OneMore/Commands/Styles/ApplyStylesCommand.cs |  53 +-
 .../Commands/Styles/ChangePageColorCommand.cs |  83 +-
 .../Styles/ChangePageColorDialog.Designer.cs  | 197 ++--
 .../Commands/Styles/ChangePageColorDialog.cs  | 133 ++-
 OneMore/Commands/Styles/EditStylesCommand.cs  |  16 +-
 OneMore/Commands/Styles/LoadStylesCommand.cs  |  70 ++
 OneMore/Commands/Styles/NewStyleCommand.cs    |   7 +-
 OneMore/Commands/Styles/ReorderDialog.cs      |   1 +
 .../Commands/Styles/StyleDialog.Designer.cs   |   6 +-
 OneMore/Commands/Styles/StyleDialog.cs        | 103 +-
 OneMore/Commands/Styles/StyleDialog.resx      | 942 +++++++++---------
 OneMore/Helpers/Extensions/ColorExtensions.cs |  18 +
 OneMore/Models/Heading.cs                     |   1 +
 OneMore/Models/PageHeadings.cs                |   3 +-
 OneMore/Models/QuickStyleMapping.cs           |   1 +
 OneMore/Models/SelectionRange.cs              |   1 +
 OneMore/OneMore.csproj                        |  11 +-
 OneMore/Properties/AssemblyInfo.cs            |   2 +-
 .../{CustomStyles.xml => DefaultStyles.xml}   |   4 +-
 OneMore/Properties/Resources.Designer.cs      | 104 +-
 OneMore/Properties/Resources.ar-SA.resx       |  59 +-
 OneMore/Properties/Resources.de-DE.resx       | 127 ++-
 OneMore/Properties/Resources.es-ES.resx       |  59 +-
 OneMore/Properties/Resources.fr-FR.resx       | 127 ++-
 OneMore/Properties/Resources.nl-NL.resx       | 127 ++-
 OneMore/Properties/Resources.pt-BR.resx       |  59 +-
 OneMore/Properties/Resources.resx             |  58 +-
 OneMore/Properties/Resources.zh-CN.resx       |  59 +-
 OneMore/Properties/Ribbon.xml                 |   5 +
 OneMore/Styles/GraphicStyle.cs                |   2 +-
 OneMore/Styles/QuickStyleDef.cs               |   2 +-
 OneMore/Styles/Style.cs                       |   2 +-
 OneMore/Styles/StyleAnalyzer.cs               |   2 +-
 OneMore/Styles/StyleBase.cs                   |   2 +-
 OneMore/Styles/StyleProvider.cs               | 174 ----
 OneMore/Styles/StyleRecord.cs                 |   2 +-
 OneMore/Styles/StyleType.cs                   |   2 +-
 OneMore/Styles/Stylizer.cs                    |   2 +-
 OneMore/Styles/Theme.cs                       | 189 ++++
 OneMore/Styles/ThemeProvider.cs               | 197 ++++
 OneMore/Styles/XmlStyleBase.cs                |   2 +-
 OneMore/UI/BasicColors.cs                     |   9 +-
 OneMore/UI/ColorsComboBox.cs                  | 295 ++++++
 .../TileFactory.cs}                           |  13 +-
 OneMoreSetup/OneMoreSetup.vdproj              | Bin 644282 -> 660460 bytes
 ...{ConfluenceStyles6.xml => Confluence6.xml} |   4 +-
 ...{ConfluenceStyles7.xml => Confluence7.xml} |   4 +-
 Themes/{DarkStyles.xml => DarkBlue.xml}       |  22 +-
 Themes/{BlackStyles.xml => DarkGreen.xml}     |  28 +-
 Themes/DarkOrange.xml                         |  18 +
 Themes/{OrangeStyles.xml => Orange.xml}       |   4 +-
 Themes/Standard.xml                           |  18 +
 63 files changed, 2267 insertions(+), 1210 deletions(-)
 create mode 100644 OneMore/Commands/Styles/LoadStylesCommand.cs
 rename OneMore/Properties/{CustomStyles.xml => DefaultStyles.xml} (98%)
 delete mode 100644 OneMore/Styles/StyleProvider.cs
 create mode 100644 OneMore/Styles/Theme.cs
 create mode 100644 OneMore/Styles/ThemeProvider.cs
 create mode 100644 OneMore/UI/ColorsComboBox.cs
 rename OneMore/{Helpers/GalleryTileFactory.cs => UI/TileFactory.cs} (93%)
 rename Themes/{ConfluenceStyles6.xml => Confluence6.xml} (98%)
 rename Themes/{ConfluenceStyles7.xml => Confluence7.xml} (98%)
 rename Themes/{DarkStyles.xml => DarkBlue.xml} (69%)
 rename Themes/{BlackStyles.xml => DarkGreen.xml} (59%)
 create mode 100644 Themes/DarkOrange.xml
 rename Themes/{OrangeStyles.xml => Orange.xml} (98%)
 create mode 100644 Themes/Standard.xml

diff --git a/OneMore.sln b/OneMore.sln
index c4ee1b1ad0..5b810607a7 100644
--- a/OneMore.sln
+++ b/OneMore.sln
@@ -20,10 +20,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Themes", "Themes", "{B33891C1-D812-4C1D-B6DC-2175A68C4ADC}"
 	ProjectSection(SolutionItems) = preProject
-		Themes\ConfluenceStyles6.xml = Themes\ConfluenceStyles6.xml
-		Themes\ConfluenceStyles7.xml = Themes\ConfluenceStyles7.xml
-		Themes\DarkStyles.xml = Themes\DarkStyles.xml
-		Themes\OrangeStyles.xml = Themes\OrangeStyles.xml
+		Themes\Confluence6.xml = Themes\Confluence6.xml
+		Themes\Confluence7.xml = Themes\Confluence7.xml
+		Themes\DarkBlue.xml = Themes\DarkBlue.xml
+		Themes\DarkGreen.xml = Themes\DarkGreen.xml
+		Themes\DarkOrange.xml = Themes\DarkOrange.xml
+		Themes\Orange.xml = Themes\Orange.xml
+		Themes\Standard.xml = Themes\Standard.xml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{9D56ACB1-3CDF-48EB-B786-4F924E899CE2}"
diff --git a/OneMore/AddInCommands.cs b/OneMore/AddInCommands.cs
index f441610acb..80e0d23cff 100644
--- a/OneMore/AddInCommands.cs
+++ b/OneMore/AddInCommands.cs
@@ -177,6 +177,9 @@ public async Task InvertSelectionCmd(IRibbonControl control)
 		public async Task LinkReferencesCmd(IRibbonControl control)
 			=> await factory.Run<LinkReferencesCommand>();
 
+		public async Task LoadStylesCmd(IRibbonControl control)
+			=> await factory.Run<LoadStylesCommand>();
+
 		public async Task JoinParagraphCmd(IRibbonControl control)
 			=> await factory.Run<JoinParagraphCommand>();
 
diff --git a/OneMore/AddInStyleGallery.cs b/OneMore/AddInStyleGallery.cs
index 855a0ee6aa..18f0557a56 100644
--- a/OneMore/AddInStyleGallery.cs
+++ b/OneMore/AddInStyleGallery.cs
@@ -9,6 +9,7 @@
 namespace River.OneMoreAddIn
 {
 	using Microsoft.Office.Core;
+	using River.OneMoreAddIn.Styles;
 	using System.Drawing;
 	using System.Runtime.InteropServices.ComTypes;
 
@@ -16,6 +17,7 @@ namespace River.OneMoreAddIn
 	public partial class AddIn
 	{
 		private static Color pageColor;
+		private static Theme theme;
 
 
 		/*
@@ -41,11 +43,15 @@ public int GetStyleGalleryItemCount(IRibbonControl control)
 				pageColor = page.GetPageColor(out _, out var black);
 				if (black)
 				{
+					// translate Black into a custom black smoke
 					pageColor = ColorTranslator.FromHtml("#201F1E");
 				}
 			}
 
-			var count = new StyleProvider().Count;
+			// load/reload cached theme
+			theme = new ThemeProvider().Theme;
+
+			var count = theme.GetCount();
 			//logger.WriteLine($"GetStyleGalleryItemCount() count:{count}");
 			return count;
 		}
@@ -73,7 +79,7 @@ public string GetStyleGalleryItemId(IRibbonControl control, int itemIndex)
 		public IStream GetStyleGalleryItemImage(IRibbonControl control, int itemIndex)
 		{
 			//logger.WriteLine($"GetStyleGalleryItemImage({control.Id}, {itemIndex})");
-			return new GalleryTileFactory().MakeTile(itemIndex, pageColor);
+			return new TileFactory().MakeTile(theme.GetStyle(itemIndex), pageColor);
 		}
 
 
@@ -85,7 +91,7 @@ public IStream GetStyleGalleryItemImage(IRibbonControl control, int itemIndex)
 		/// <returns></returns>
 		public string GetStyleGalleryItemScreentip(IRibbonControl control, int itemIndex)
 		{
-			var tip = new StyleProvider().GetName(itemIndex);
+			var tip = theme.GetName(itemIndex);
 
 			if (itemIndex < 9)
 			{
diff --git a/OneMore/Commands/Clean/ClearBackgroundCommand.cs b/OneMore/Commands/Clean/ClearBackgroundCommand.cs
index 5462079d07..f74364a3ba 100644
--- a/OneMore/Commands/Clean/ClearBackgroundCommand.cs
+++ b/OneMore/Commands/Clean/ClearBackgroundCommand.cs
@@ -5,6 +5,7 @@
 namespace River.OneMoreAddIn.Commands
 {
 	using River.OneMoreAddIn.Models;
+	using River.OneMoreAddIn.Styles;
 	using System.Collections.Generic;
 	using System.Drawing;
 	using System.Linq;
diff --git a/OneMore/Commands/Clean/RemoveEmptyCommand.cs b/OneMore/Commands/Clean/RemoveEmptyCommand.cs
index 1c842d4ed5..99ef70c956 100644
--- a/OneMore/Commands/Clean/RemoveEmptyCommand.cs
+++ b/OneMore/Commands/Clean/RemoveEmptyCommand.cs
@@ -5,6 +5,7 @@
 namespace River.OneMoreAddIn.Commands
 {
 	using River.OneMoreAddIn.Models;
+	using River.OneMoreAddIn.Styles;
 	using System.Collections.Generic;
 	using System.Globalization;
 	using System.Linq;
@@ -125,7 +126,7 @@ public bool CollapseEmptyLines(Page page, XNamespace ns)
 			var quickStyles = page.GetQuickStyles()
 				.Where(s => s.StyleType == StyleType.Heading);
 
-			var customStyles = new StyleProvider().GetStyles()
+			var customStyles = new ThemeProvider().Theme.GetStyles()
 				.Where(e => e.StyleType == StyleType.Heading)
 				.ToList();
 
diff --git a/OneMore/Commands/Clean/RemoveSpacingCommand.cs b/OneMore/Commands/Clean/RemoveSpacingCommand.cs
index 8a1ab05a98..90452f5e73 100644
--- a/OneMore/Commands/Clean/RemoveSpacingCommand.cs
+++ b/OneMore/Commands/Clean/RemoveSpacingCommand.cs
@@ -4,6 +4,7 @@
 
 namespace River.OneMoreAddIn.Commands
 {
+	using River.OneMoreAddIn.Styles;
 	using System.Globalization;
 	using System.Linq;
 	using System.Threading.Tasks;
@@ -65,7 +66,7 @@ private async Task RemoveSpacing()
 				var quickStyles = page.GetQuickStyles()
 					.Where(s => s.StyleType == StyleType.Heading);
 
-				var customStyles = new StyleProvider().GetStyles()
+				var customStyles = new ThemeProvider().Theme.GetStyles()
 					.Where(e => e.StyleType == StyleType.Heading)
 					.ToList();
 
diff --git a/OneMore/Commands/Edit/AlterSizeCommand.cs b/OneMore/Commands/Edit/AlterSizeCommand.cs
index f41461b533..2bc376a0a7 100644
--- a/OneMore/Commands/Edit/AlterSizeCommand.cs
+++ b/OneMore/Commands/Edit/AlterSizeCommand.cs
@@ -5,6 +5,7 @@
 namespace River.OneMoreAddIn.Commands
 {
 	using River.OneMoreAddIn.Models;
+	using River.OneMoreAddIn.Styles;
 	using System.Collections.Generic;
 	using System.Globalization;
 	using System.Linq;
diff --git a/OneMore/Commands/Extras/StrikeoutCommand.cs b/OneMore/Commands/Extras/StrikeoutCommand.cs
index 8ea03a63d1..5385d1812a 100644
--- a/OneMore/Commands/Extras/StrikeoutCommand.cs
+++ b/OneMore/Commands/Extras/StrikeoutCommand.cs
@@ -4,6 +4,7 @@
 
 namespace River.OneMoreAddIn.Commands
 {
+	using River.OneMoreAddIn.Styles;
 	using System.Collections.Generic;
 	using System.Linq;
 	using System.Threading.Tasks;
diff --git a/OneMore/Commands/Images/AddCaptionCommand.cs b/OneMore/Commands/Images/AddCaptionCommand.cs
index 1f16556881..f1fc64b7b6 100644
--- a/OneMore/Commands/Images/AddCaptionCommand.cs
+++ b/OneMore/Commands/Images/AddCaptionCommand.cs
@@ -4,10 +4,11 @@
 
 namespace River.OneMoreAddIn.Commands
 {
+	using River.OneMoreAddIn.Models;
+	using River.OneMoreAddIn.Styles;
 	using System.Linq;
 	using System.Threading.Tasks;
 	using System.Xml.Linq;
-	using River.OneMoreAddIn.Models;
 	using Resx = River.OneMoreAddIn.Properties.Resources;
 
 
@@ -93,7 +94,7 @@ private static Style GetStyle()
 
 			// use custom Caption style if it exists
 
-			var styles = new StyleProvider().GetStyles();
+			var styles = new ThemeProvider().Theme.GetStyles();
 			if (styles?.Count > 0)
 			{
 				style = styles.FirstOrDefault(s => s.Name.Equals("Caption"));
diff --git a/OneMore/Commands/Images/GetImagesCommand.cs b/OneMore/Commands/Images/GetImagesCommand.cs
index fcb632a42b..475083dbae 100644
--- a/OneMore/Commands/Images/GetImagesCommand.cs
+++ b/OneMore/Commands/Images/GetImagesCommand.cs
@@ -5,6 +5,7 @@
 namespace River.OneMoreAddIn.Commands
 {
 	using River.OneMoreAddIn.Models;
+	using River.OneMoreAddIn.Styles;
 	using System;
 	using System.Collections.Concurrent;
 	using System.Collections.Generic;
diff --git a/OneMore/Commands/Styles/ApplyStyleCommand.cs b/OneMore/Commands/Styles/ApplyStyleCommand.cs
index 6f561695c4..2275149a26 100644
--- a/OneMore/Commands/Styles/ApplyStyleCommand.cs
+++ b/OneMore/Commands/Styles/ApplyStyleCommand.cs
@@ -7,6 +7,7 @@
 namespace River.OneMoreAddIn.Commands
 {
 	using River.OneMoreAddIn.Models;
+	using River.OneMoreAddIn.Styles;
 	using System.Linq;
 	using System.Text;
 	using System.Threading.Tasks;
@@ -32,7 +33,7 @@ public override async Task Execute(params object[] args)
 		{
 			var selectedIndex = (int)args[0];
 
-			style = new StyleProvider().GetStyle(selectedIndex);
+			style = new ThemeProvider().Theme.GetStyle(selectedIndex);
 			if (style == null)
 			{
 				// could be from a CtrlAltShift+# but that indexed style doesn't exist
@@ -118,7 +119,7 @@ private bool StylizeWords()
 
 							if (prev != null)
 							{
-								logger.WriteLine("prev:" + prev.ToString(SaveOptions.None));
+								//logger.WriteLine("prev:" + prev.ToString(SaveOptions.None));
 
 								if (!prev.GetCData().EndsWithWhitespace())
 								{
@@ -137,7 +138,7 @@ private bool StylizeWords()
 
 							if (next != null)
 							{
-								logger.WriteLine("next:" + next.ToString(SaveOptions.None));
+								//logger.WriteLine("next:" + next.ToString(SaveOptions.None));
 
 								if (!next.GetCData().StartsWithWhitespace())
 								{
diff --git a/OneMore/Commands/Styles/ApplyStylesCommand.cs b/OneMore/Commands/Styles/ApplyStylesCommand.cs
index 36a2401a70..1b3817fa9d 100644
--- a/OneMore/Commands/Styles/ApplyStylesCommand.cs
+++ b/OneMore/Commands/Styles/ApplyStylesCommand.cs
@@ -5,6 +5,7 @@
 namespace River.OneMoreAddIn.Commands
 {
 	using River.OneMoreAddIn.Models;
+	using River.OneMoreAddIn.Styles;
 	using System.Collections.Generic;
 	using System.Linq;
 	using System.Text.RegularExpressions;
@@ -20,6 +21,7 @@ internal class ApplyStylesCommand : Command
 	{
 
 		private Page page;
+		private XNamespace ns;
 		private readonly Stylizer stylizer;
 
 
@@ -32,9 +34,9 @@ public ApplyStylesCommand()
 
 		public override async Task Execute(params object[] args)
 		{
-			using (var one = new OneNote(out page, out _))
+			using (var one = new OneNote(out page, out ns))
 			{
-				var styles = new StyleProvider().GetStyles();
+				var styles = new ThemeProvider().Theme.GetStyles();
 				if (ApplyStyles(styles))
 				{
 					ApplyToLists(styles);
@@ -50,12 +52,28 @@ public override async Task Execute(params object[] args)
 		}
 
 
+		public void Apply(Page page)
+		{
+			this.page = page;
+			ns = page.Namespace;
+
+			var styles = new ThemeProvider().Theme.GetStyles();
+			if (ApplyStyles(styles))
+			{
+				ApplyToLists(styles);
+
+				if (page.GetPageColor(out _, out _).GetBrightness() < 0.5)
+				{
+					ApplyToHyperlinks();
+				}
+			}
+		}
+
+
 		private bool ApplyStyles(List<Style> styles)
 		{
 			var applied = false;
 
-			var ns = page.Namespace;
-
 			var quickStyles = page.Root.Elements(ns + "QuickStyleDef");
 			if (quickStyles?.Any() == true)
 			{
@@ -75,17 +93,22 @@ private bool ApplyStyles(List<Style> styles)
 							//	$"~ name:{quick.Attribute("name").Value} style:{style.Name}");
 
 							// could use QuickStyleDef class here but this is faster
-							// that replacing the element...
+							// than replacing the element...
 
 							quick.Attribute("font").Value = style.FontFamily;
 
-							// Why does OneNote screw these up?
-							//quick.Attribute("spaceBefore").Value = style.SpaceBefore;
-							//quick.Attribute("spaceAfter").Value = style.SpaceAfter;
+							quick.Attribute("spaceBefore").Value = style.SpaceBefore;
+							quick.Attribute("spaceAfter").Value = style.SpaceAfter;
+							// must also apply to paragraphs otherwise OneNote applies x10 values!
+							SetSpacing(quick.Attribute("index").Value, style.SpaceBefore, style.SpaceAfter);
 
 							quick.Attribute("fontColor").Value = style.Color;
 							quick.Attribute("highlightColor").Value = style.Highlight;
 
+							quick.SetAttributeValue("italic", style.IsItalic.ToString().ToLower());
+							quick.SetAttributeValue("bold", style.IsBold.ToString().ToLower());
+							quick.SetAttributeValue("underline", style.IsUnderline.ToString().ToLower());
+
 							if (name == "p")
 							{
 								if (!foundP)
@@ -162,6 +185,19 @@ private static Style FindStyle(List<Style> styles, string name)
 		}
 
 
+		private void SetSpacing(string index, string spaceBefore, string spaceAfter)
+		{
+			var paragraphs = page.Root.Descendants(ns + "OE")
+				.Where(e => e.Attribute("quickStyleIndex")?.Value == index);
+
+			foreach (var paragraph in paragraphs)
+			{
+				paragraph.SetAttributeValue("spaceBefore", spaceBefore);
+				paragraph.SetAttributeValue("spaceAfter", spaceAfter);
+			}
+		}
+
+
 		// when applying styles, we want to preserve any special treatments to paragraphs
 		// because that would be tedious for the user to restore manually if their intention 
 		// was to keep those colors, but we want to clear all color styling from every other
@@ -196,7 +232,6 @@ private void ApplyToLists(List<Style> styles)
 				};
 			}
 
-			var ns = page.Namespace;
 			var elements = page.Root.Descendants(ns + "Bullet");
 			if (elements?.Any() == true)
 			{
diff --git a/OneMore/Commands/Styles/ChangePageColorCommand.cs b/OneMore/Commands/Styles/ChangePageColorCommand.cs
index bd467e7c32..c28bbe31a9 100644
--- a/OneMore/Commands/Styles/ChangePageColorCommand.cs
+++ b/OneMore/Commands/Styles/ChangePageColorCommand.cs
@@ -4,6 +4,8 @@
 
 namespace River.OneMoreAddIn.Commands
 {
+	using River.OneMoreAddIn.Models;
+	using River.OneMoreAddIn.Styles;
 	using System.Drawing;
 	using System.Linq;
 	using System.Threading.Tasks;
@@ -15,6 +17,8 @@ internal class ChangePageColorCommand : Command
 	{
 		public ChangePageColorCommand()
 		{
+			// prevent replay
+			IsCancelled = true;
 		}
 
 
@@ -22,53 +26,62 @@ public override async Task Execute(params object[] args)
 		{
 			using (var one = new OneNote(out var page, out _))
 			{
-				var currentColor = page.GetPageColor(out _, out _);
-				var currentlydDark = currentColor.GetBrightness() < 0.5;
+				var color = page.GetPageColor(out _, out _);
 
-				using (var dialog = new ChangePageColorDialog(currentColor))
+				using (var dialog = new ChangePageColorDialog(color))
 				{
 					if (dialog.ShowDialog(owner) != DialogResult.OK)
 					{
 						return;
 					}
 
-					var element = page.Root
-						.Elements(page.Namespace + "PageSettings")
-						.FirstOrDefault();
+					UpdatePageColor(page, dialog.PageColor);
+					ThemeProvider.RecordTheme(dialog.ThemeKey);
 
-					if (element != null)
+					if (dialog.ApplyStyle)
 					{
-						var attr = element.Attribute("color");
-						if (attr != null)
-						{
-							attr.Value = dialog.PageColor;
-						}
-						else
-						{
-							element.Add(new XAttribute("color", dialog.PageColor));
-						}
-
-						// if light->dark or dark->light, apply appropriate theme...
-
-						var dark = false;
-						if (dialog.PageColor != "automatic")
-						{
-							dark = ColorTranslator.FromHtml(dialog.PageColor).GetBrightness() < 0.5;
-						}
-
-						if (dark != currentlydDark)
-						{
-							//
-						}
-
-						await one.Update(page);
-					}
-					else
-					{
-						logger.WriteLine("ChangePageColor failed because PageSettings not found");
+						new ApplyStylesCommand().Apply(page);
 					}
 				}
+
+				await one.Update(page);
 			}
 		}
+
+
+		private void UpdatePageColor(Page page, string color)
+		{
+			var element = page.Root
+				.Elements(page.Namespace + "PageSettings")
+				.FirstOrDefault();
+
+			if (element == null)
+			{
+				logger.WriteLine("ChangePageColor failed because PageSettings not found");
+				return;
+			}
+
+			ribbon.Invalidate();
+
+			var attr = element.Attribute("color");
+			if (attr != null)
+			{
+				attr.Value = color;
+			}
+			else
+			{
+				element.Add(new XAttribute("color", color));
+			}
+
+			// if light->dark or dark->light, apply appropriate theme...
+
+			var dark = false;
+			if (color != "automatic")
+			{
+				dark = ColorTranslator.FromHtml(color).GetBrightness() < 0.5;
+			}
+
+			logger.WriteLine($"color set to {color} (dark:{dark})");
+		}
 	}
 }
diff --git a/OneMore/Commands/Styles/ChangePageColorDialog.Designer.cs b/OneMore/Commands/Styles/ChangePageColorDialog.Designer.cs
index 4233dbea0f..cb62f075bb 100644
--- a/OneMore/Commands/Styles/ChangePageColorDialog.Designer.cs
+++ b/OneMore/Commands/Styles/ChangePageColorDialog.Designer.cs
@@ -29,63 +29,26 @@ protected override void Dispose(bool disposing)
 		private void InitializeComponent()
 		{
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ChangePageColorDialog));
-			this.lightButton = new System.Windows.Forms.RadioButton();
-			this.darkButton = new System.Windows.Forms.RadioButton();
-			this.customButton = new System.Windows.Forms.RadioButton();
 			this.cancelButton = new System.Windows.Forms.Button();
 			this.okButton = new System.Windows.Forms.Button();
 			this.introLabel = new System.Windows.Forms.Label();
+			this.colorsBox = new River.OneMoreAddIn.UI.ColorsComboBox();
+			this.customLink = new River.OneMoreAddIn.UI.MoreLinkLabel();
+			this.themeIntroLabel = new System.Windows.Forms.Label();
+			this.themeGroup = new System.Windows.Forms.GroupBox();
+			this.applyBox = new System.Windows.Forms.CheckBox();
+			this.loadLink = new River.OneMoreAddIn.UI.MoreLinkLabel();
+			this.themeLabel = new System.Windows.Forms.Label();
+			this.currentLabel = new System.Windows.Forms.Label();
+			this.statusLabel = new System.Windows.Forms.Label();
+			this.themeGroup.SuspendLayout();
 			this.SuspendLayout();
 			// 
-			// lightButton
-			// 
-			this.lightButton.BackColor = System.Drawing.SystemColors.Window;
-			this.lightButton.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.lightButton.Location = new System.Drawing.Point(22, 110);
-			this.lightButton.Name = "lightButton";
-			this.lightButton.Padding = new System.Windows.Forms.Padding(10, 5, 0, 5);
-			this.lightButton.Size = new System.Drawing.Size(400, 41);
-			this.lightButton.TabIndex = 0;
-			this.lightButton.TabStop = true;
-			this.lightButton.Text = "Light background";
-			this.lightButton.UseVisualStyleBackColor = false;
-			this.lightButton.Click += new System.EventHandler(this.SetLightColor);
-			// 
-			// darkButton
-			// 
-			this.darkButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
-			this.darkButton.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.darkButton.ForeColor = System.Drawing.Color.White;
-			this.darkButton.Location = new System.Drawing.Point(22, 177);
-			this.darkButton.Name = "darkButton";
-			this.darkButton.Padding = new System.Windows.Forms.Padding(10, 5, 0, 5);
-			this.darkButton.Size = new System.Drawing.Size(400, 41);
-			this.darkButton.TabIndex = 1;
-			this.darkButton.TabStop = true;
-			this.darkButton.Text = "Dark background";
-			this.darkButton.UseVisualStyleBackColor = false;
-			this.darkButton.Click += new System.EventHandler(this.SetDarkColor);
-			// 
-			// customButton
-			// 
-			this.customButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-			this.customButton.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.customButton.ForeColor = System.Drawing.Color.Black;
-			this.customButton.Location = new System.Drawing.Point(22, 245);
-			this.customButton.Name = "customButton";
-			this.customButton.Padding = new System.Windows.Forms.Padding(10, 5, 0, 5);
-			this.customButton.Size = new System.Drawing.Size(400, 41);
-			this.customButton.TabIndex = 3;
-			this.customButton.TabStop = true;
-			this.customButton.Text = "Custom background...";
-			this.customButton.UseVisualStyleBackColor = false;
-			this.customButton.Click += new System.EventHandler(this.ChooseCustomColor);
-			// 
 			// cancelButton
 			// 
 			this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.cancelButton.Location = new System.Drawing.Point(382, 323);
+			this.cancelButton.Location = new System.Drawing.Point(413, 412);
 			this.cancelButton.Name = "cancelButton";
 			this.cancelButton.Size = new System.Drawing.Size(100, 38);
 			this.cancelButton.TabIndex = 4;
@@ -96,7 +59,7 @@ private void InitializeComponent()
 			// 
 			this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.okButton.Location = new System.Drawing.Point(276, 323);
+			this.okButton.Location = new System.Drawing.Point(307, 412);
 			this.okButton.Name = "okButton";
 			this.okButton.Size = new System.Drawing.Size(100, 38);
 			this.okButton.TabIndex = 5;
@@ -107,10 +70,113 @@ private void InitializeComponent()
 			// 
 			this.introLabel.Location = new System.Drawing.Point(13, 10);
 			this.introLabel.Name = "introLabel";
-			this.introLabel.Size = new System.Drawing.Size(469, 63);
+			this.introLabel.Size = new System.Drawing.Size(500, 53);
 			this.introLabel.TabIndex = 6;
-			this.introLabel.Text = "After choosing a page color, load one of the predefined styles or customize your " +
-    "own styles so all content has enough contrast to be visible.\r\n\r\n";
+			this.introLabel.Text = "Select on of the predefined background colors or choose a custom color.";
+			// 
+			// colorsBox
+			// 
+			this.colorsBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
+			this.colorsBox.DropDownHeight = 495;
+			this.colorsBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.colorsBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.colorsBox.FormattingEnabled = true;
+			this.colorsBox.IntegralHeight = false;
+			this.colorsBox.Location = new System.Drawing.Point(39, 66);
+			this.colorsBox.Name = "colorsBox";
+			this.colorsBox.Size = new System.Drawing.Size(337, 36);
+			this.colorsBox.TabIndex = 7;
+			this.colorsBox.ColorChanged += new System.EventHandler(this.AnalyzeColorSelection);
+			// 
+			// customLink
+			// 
+			this.customLink.AutoSize = true;
+			this.customLink.Cursor = System.Windows.Forms.Cursors.Hand;
+			this.customLink.Location = new System.Drawing.Point(35, 109);
+			this.customLink.Name = "customLink";
+			this.customLink.Size = new System.Drawing.Size(171, 20);
+			this.customLink.TabIndex = 8;
+			this.customLink.TabStop = true;
+			this.customLink.Text = "Choose a custom color";
+			this.customLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.ChooseCustomColor);
+			// 
+			// themeIntroLabel
+			// 
+			this.themeIntroLabel.Location = new System.Drawing.Point(11, 27);
+			this.themeIntroLabel.Name = "themeIntroLabel";
+			this.themeIntroLabel.Size = new System.Drawing.Size(468, 53);
+			this.themeIntroLabel.TabIndex = 9;
+			this.themeIntroLabel.Text = "Optionally, load one of the predefined style themes or customize your own theme s" +
+    "o all content has enough contrast to be visible.\r\n\r\n";
+			// 
+			// themeGroup
+			// 
+			this.themeGroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.themeGroup.Controls.Add(this.applyBox);
+			this.themeGroup.Controls.Add(this.loadLink);
+			this.themeGroup.Controls.Add(this.themeLabel);
+			this.themeGroup.Controls.Add(this.currentLabel);
+			this.themeGroup.Controls.Add(this.themeIntroLabel);
+			this.themeGroup.Location = new System.Drawing.Point(17, 150);
+			this.themeGroup.Name = "themeGroup";
+			this.themeGroup.Padding = new System.Windows.Forms.Padding(8);
+			this.themeGroup.Size = new System.Drawing.Size(496, 212);
+			this.themeGroup.TabIndex = 10;
+			this.themeGroup.TabStop = false;
+			this.themeGroup.Text = "Style Theme";
+			// 
+			// applyBox
+			// 
+			this.applyBox.AutoSize = true;
+			this.applyBox.Checked = true;
+			this.applyBox.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.applyBox.Location = new System.Drawing.Point(22, 171);
+			this.applyBox.Name = "applyBox";
+			this.applyBox.Size = new System.Drawing.Size(246, 24);
+			this.applyBox.TabIndex = 13;
+			this.applyBox.Text = "Apply style theme to this page";
+			this.applyBox.UseVisualStyleBackColor = true;
+			// 
+			// loadLink
+			// 
+			this.loadLink.AutoSize = true;
+			this.loadLink.Cursor = System.Windows.Forms.Cursors.Hand;
+			this.loadLink.Location = new System.Drawing.Point(18, 124);
+			this.loadLink.Name = "loadLink";
+			this.loadLink.Size = new System.Drawing.Size(143, 20);
+			this.loadLink.TabIndex = 12;
+			this.loadLink.TabStop = true;
+			this.loadLink.Text = "Load a style theme";
+			this.loadLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LoadStyleTheme);
+			// 
+			// themeLabel
+			// 
+			this.themeLabel.AutoSize = true;
+			this.themeLabel.Location = new System.Drawing.Point(147, 90);
+			this.themeLabel.Name = "themeLabel";
+			this.themeLabel.Size = new System.Drawing.Size(14, 20);
+			this.themeLabel.TabIndex = 11;
+			this.themeLabel.Text = "-";
+			// 
+			// currentLabel
+			// 
+			this.currentLabel.AutoSize = true;
+			this.currentLabel.Location = new System.Drawing.Point(18, 90);
+			this.currentLabel.Name = "currentLabel";
+			this.currentLabel.Size = new System.Drawing.Size(123, 20);
+			this.currentLabel.TabIndex = 10;
+			this.currentLabel.Text = "Current Theme: ";
+			// 
+			// statusLabel
+			// 
+			this.statusLabel.AutoSize = true;
+			this.statusLabel.ForeColor = System.Drawing.SystemColors.GrayText;
+			this.statusLabel.Location = new System.Drawing.Point(28, 365);
+			this.statusLabel.Name = "statusLabel";
+			this.statusLabel.Size = new System.Drawing.Size(31, 20);
+			this.statusLabel.TabIndex = 11;
+			this.statusLabel.Text = "OK";
 			// 
 			// ChangePageColorDialog
 			// 
@@ -118,13 +184,14 @@ private void InitializeComponent()
 			this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.CancelButton = this.cancelButton;
-			this.ClientSize = new System.Drawing.Size(495, 374);
+			this.ClientSize = new System.Drawing.Size(526, 463);
+			this.Controls.Add(this.statusLabel);
+			this.Controls.Add(this.themeGroup);
+			this.Controls.Add(this.customLink);
+			this.Controls.Add(this.colorsBox);
 			this.Controls.Add(this.introLabel);
 			this.Controls.Add(this.okButton);
 			this.Controls.Add(this.cancelButton);
-			this.Controls.Add(this.customButton);
-			this.Controls.Add(this.darkButton);
-			this.Controls.Add(this.lightButton);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
 			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
 			this.MaximizeBox = false;
@@ -134,18 +201,26 @@ private void InitializeComponent()
 			this.ShowInTaskbar = false;
 			this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Change Page Color";
+			this.Text = "Change Page Theme";
+			this.themeGroup.ResumeLayout(false);
+			this.themeGroup.PerformLayout();
 			this.ResumeLayout(false);
+			this.PerformLayout();
 
 		}
 
 		#endregion
-
-		private System.Windows.Forms.RadioButton lightButton;
-		private System.Windows.Forms.RadioButton darkButton;
-		private System.Windows.Forms.RadioButton customButton;
 		private System.Windows.Forms.Button cancelButton;
 		private System.Windows.Forms.Button okButton;
 		private System.Windows.Forms.Label introLabel;
+		private UI.ColorsComboBox colorsBox;
+		private UI.MoreLinkLabel customLink;
+		private System.Windows.Forms.Label themeIntroLabel;
+		private System.Windows.Forms.GroupBox themeGroup;
+		private System.Windows.Forms.Label currentLabel;
+		private System.Windows.Forms.Label themeLabel;
+		private UI.MoreLinkLabel loadLink;
+		private System.Windows.Forms.CheckBox applyBox;
+		private System.Windows.Forms.Label statusLabel;
 	}
 }
\ No newline at end of file
diff --git a/OneMore/Commands/Styles/ChangePageColorDialog.cs b/OneMore/Commands/Styles/ChangePageColorDialog.cs
index 9f3276d14d..4d61e24c94 100644
--- a/OneMore/Commands/Styles/ChangePageColorDialog.cs
+++ b/OneMore/Commands/Styles/ChangePageColorDialog.cs
@@ -2,8 +2,12 @@
 // Copyright © 2020 Steven M Cohn. All rights reserved.
 //************************************************************************************************
 
+#pragma warning disable S4275 // Getters and setters should access the expected fields
+
 namespace River.OneMoreAddIn.Commands
 {
+	using River.OneMoreAddIn.Settings;
+	using River.OneMoreAddIn.Styles;
 	using System;
 	using System.Drawing;
 	using System.Windows.Forms;
@@ -12,10 +16,7 @@ namespace River.OneMoreAddIn.Commands
 
 	internal partial class ChangePageColorDialog : UI.LocalizableForm
 	{
-		private readonly Color DarkColor = Color.FromArgb(0x21, 0x21, 0x21);
-
-		private Color pageColor;
-		private bool initialized = false;
+		private Theme theme;
 
 
 		public ChangePageColorDialog(Color pageColor)
@@ -29,87 +30,117 @@ public ChangePageColorDialog(Color pageColor)
 				Localize(new string[]
 				{
 					"introLabel",
-					"lightButton",
-					"darkButton",
-					"customButton",
+					"customLink",
+					"themeIntroLabel",
+					"currentLabel",
+					"loadLink",
+					"applyBox",
 					"cancelButton",
 					"okButton"
 				});
 			}
 
-			this.pageColor = pageColor;
+			statusLabel.Text = string.Empty;
 
-			if (pageColor.Equals(Color.White))
-			{
-				lightButton.Checked = true;
-			}
-			else if (pageColor.Equals(DarkColor))
-			{
-				darkButton.Checked = true;
-			}
-			else
-			{
-				customButton.Checked = true;
-				SetCustomOption(pageColor);
-			}
-		}
+			InitializeCustomColor(pageColor);
+			colorsBox.SelectColor(pageColor);
 
-		protected override void OnShown(EventArgs e)
-		{
-			initialized = true;
-			base.OnShown(e);
+			theme = new ThemeProvider().Theme;
+			themeLabel.Text = theme.Name;
+
+			AnalyzeColorSelection(null, null);
 		}
 
 
+		public bool ApplyStyle => applyBox.Checked;
+
+		public string ThemeKey => theme.Key;
+
+
 		public string PageColor
 		{
 			get
 			{
-				if (pageColor.Equals(Color.White))
+				if (colorsBox.Color.Equals(Color.White))
 				{
 					return "automatic";
 				}
 
-				return pageColor.ToRGBHtml();
+				return colorsBox.Color.ToRGBHtml();
 			}
 		}
 
-		
-		private void SetCustomOption(Color color)
+
+		private void InitializeCustomColor(Color pageColor)
 		{
-			pageColor = color;
-			customButton.BackColor = color;
-			customButton.ForeColor = color.GetBrightness() < 0.5 ? Color.White : Color.Black;
+			var provider = new SettingsProvider();
+			var settings = provider.GetCollection("pageTheme");
+			if (settings != null && settings.Contains("customColor"))
+			{
+				try
+				{
+					colorsBox.SetCustomColor(ColorTranslator.FromHtml(settings["customColor"]));
+					return;
+				}
+				catch (Exception exc)
+				{
+					logger.WriteLine("error reading saved custom color", exc);
+				}
+			}
+
+			colorsBox.SetCustomColor(pageColor);
 		}
 
-		private void SetLightColor(object sender, EventArgs e)
+
+		private void ChooseCustomColor(object sender, LinkLabelLinkClickedEventArgs e)
 		{
-			pageColor = Color.White;
+			var location = PointToScreen(customLink.Location);
+
+			using (var dialog = new UI.MoreColorDialog(Resx.PageColorDialog_Text,
+				location.X + customLink.Bounds.Location.X + customLink.Width,
+				location.Y - 50))
+			{
+				dialog.Color = colorsBox.CustomColor;
+
+				if (dialog.ShowDialog() == DialogResult.OK)
+				{
+					colorsBox.SetCustomColor(dialog.Color);
+
+					var provider = new SettingsProvider();
+					var settings = provider.GetCollection("pageTheme");
+					settings.Add("customColor", dialog.Color.ToRGBHtml());
+					provider.SetCollection(settings);
+					provider.Save();
+				}
+			}
 		}
 
-		private void SetDarkColor(object sender, EventArgs e)
+
+		private void AnalyzeColorSelection(object sender, EventArgs e)
 		{
-			pageColor = DarkColor;
+			if (theme == null || colorsBox.SelectedItem == null)
+			{
+				statusLabel.Text = string.Empty;
+				return;
+			}
+
+			var dark = colorsBox.Color.GetBrightness() < 0.5;
+
+			statusLabel.Text = theme.Dark == dark
+				? string.Empty
+				: Resx.ChangePageColorDialog_Contrast;
 		}
 
 
-		private void ChooseCustomColor(object sender, EventArgs e)
+		private void LoadStyleTheme(object sender, LinkLabelLinkClickedEventArgs e)
 		{
-			if (initialized && customButton.Checked)
+			var thm = new LoadStylesCommand().LoadTheme();
+			if (thm != null)
 			{
-				var location = PointToScreen(customButton.Location);
-
-				using (var dialog = new UI.MoreColorDialog(Resx.PageColorDialog_Text,
-					location.X + customButton.Bounds.Location.X + (customButton.Width / 2),
-					location.Y - 200))
-				{
-					dialog.Color = pageColor;
+				theme = thm;
+				themeLabel.Text = thm.Name;
 
-					if (dialog.ShowDialog() == DialogResult.OK)
-					{
-						SetCustomOption(dialog.Color);
-					}
-				}
+				AnalyzeColorSelection(sender, e);
 			}
 		}
 	}
diff --git a/OneMore/Commands/Styles/EditStylesCommand.cs b/OneMore/Commands/Styles/EditStylesCommand.cs
index 526ebf9b5a..9a4f678dfd 100644
--- a/OneMore/Commands/Styles/EditStylesCommand.cs
+++ b/OneMore/Commands/Styles/EditStylesCommand.cs
@@ -4,6 +4,8 @@
 
 namespace River.OneMoreAddIn.Commands
 {
+	using River.OneMoreAddIn.Styles;
+	using River.OneMoreAddIn.UI;
 	using System.Drawing;
 	using System.Threading.Tasks;
 	using System.Windows.Forms;
@@ -26,20 +28,20 @@ public override async Task Execute(params object[] args)
 				pageColor = page.GetPageColor(out _, out var black);
 				if (black)
 				{
-					pageColor = ColorTranslator.FromHtml("#201F1E");
+					// if Office Black theme, translate to softer Black Shadow
+					pageColor = BasicColors.BlackSmoke;
 				}
 			}
 
-			var provider = new StyleProvider();
-			var styles = provider.GetStyles();
+			var theme = new ThemeProvider().Theme;
 
-			using (var dialog = new StyleDialog(styles, pageColor))
+			using (var dialog = new StyleDialog(theme, pageColor))
 			{
 				if (dialog.ShowDialog(owner) == DialogResult.OK)
 				{
-					// save styles to remove deleted items and preserve ordering
-					styles = dialog.GetStyles();
-					StyleProvider.Save(styles);
+					ThemeProvider.Save(dialog.Theme);
+					ThemeProvider.RecordTheme(dialog.Theme.Key);
+
 					ribbon.Invalidate();
 				}
 			}
diff --git a/OneMore/Commands/Styles/LoadStylesCommand.cs b/OneMore/Commands/Styles/LoadStylesCommand.cs
new file mode 100644
index 0000000000..2274eb0d7b
--- /dev/null
+++ b/OneMore/Commands/Styles/LoadStylesCommand.cs
@@ -0,0 +1,70 @@
+//************************************************************************************************
+// Copyright © 2021 Steven M Cohn.  All rights reserved.
+//************************************************************************************************
+
+namespace River.OneMoreAddIn.Commands
+{
+	using River.OneMoreAddIn.Styles;
+	using System.IO;
+	using System.Threading.Tasks;
+	using System.Windows.Forms;
+	using Resx = River.OneMoreAddIn.Properties.Resources;
+
+
+	internal class LoadStylesCommand : Command
+	{
+		public LoadStylesCommand()
+		{
+			// prevent replay
+			IsCancelled = true;
+		}
+
+
+		public override async Task Execute(params object[] args)
+		{
+			var theme = LoadTheme();
+			if (theme != null)
+			{
+				ThemeProvider.RecordTheme(theme.Key);
+				ribbon.Invalidate();
+			}
+
+			await Task.Yield();
+		}
+
+
+		public Theme LoadTheme()
+		{
+			var path = Path.Combine(PathFactory.GetAppDataPath(), Resx.ThemesFolder);
+			PathFactory.EnsurePathExists(path);
+
+			using (var dialog = new OpenFileDialog())
+			{
+				dialog.DefaultExt = "xml";
+				dialog.Filter = "Theme files (*.xml)|*.xml|All files (*.*)|*.*";
+				dialog.Multiselect = false;
+				dialog.Title = "Open Style Theme";
+				dialog.ShowHelp = true; // stupid, but this is needed to avoid hang
+				dialog.AutoUpgradeEnabled = true; // simpler UI, faster
+
+				if (dialog.ShowDialog(owner) != DialogResult.OK)
+				{
+					return null;
+				}
+
+				var theme = new ThemeProvider(dialog.FileName).Theme;
+				if (theme != null)
+				{
+					var styles = theme.GetStyles();
+					if (styles.Count > 0)
+					{
+						return theme;
+					}
+				}
+
+				UIHelper.ShowError("could not load theme file or them contains no styles");
+				return null;
+			}
+		}
+	}
+}
diff --git a/OneMore/Commands/Styles/NewStyleCommand.cs b/OneMore/Commands/Styles/NewStyleCommand.cs
index c1f6a18ebc..5f656ac594 100644
--- a/OneMore/Commands/Styles/NewStyleCommand.cs
+++ b/OneMore/Commands/Styles/NewStyleCommand.cs
@@ -5,6 +5,7 @@
 namespace River.OneMoreAddIn.Commands
 {
 	using River.OneMoreAddIn.Models;
+	using River.OneMoreAddIn.Styles;
 	using System;
 	using System.Drawing;
 	using System.Linq;
@@ -34,16 +35,14 @@ public override async Task Execute(params object[] args)
 					pageColor = page.GetPageColor(out _, out _);
 				}
 
-				DialogResult result;
 				using (var dialog = new StyleDialog(style, pageColor))
 				{
-					result = dialog.ShowDialog(owner);
-					if (result == DialogResult.OK)
+					if (dialog.ShowDialog(owner) == DialogResult.OK)
 					{
 						style = dialog.Style;
 						if (style != null)
 						{
-							new StyleProvider().Save(style);
+							ThemeProvider.Save(style);
 							ribbon.Invalidate();
 						}
 					}
diff --git a/OneMore/Commands/Styles/ReorderDialog.cs b/OneMore/Commands/Styles/ReorderDialog.cs
index 99171d9c22..a99bcc6734 100644
--- a/OneMore/Commands/Styles/ReorderDialog.cs
+++ b/OneMore/Commands/Styles/ReorderDialog.cs
@@ -4,6 +4,7 @@
 
 namespace River.OneMoreAddIn.Commands
 {
+	using River.OneMoreAddIn.Styles;
 	using System.Drawing;
 	using System.Linq;
 	using System.Windows.Forms;
diff --git a/OneMore/Commands/Styles/StyleDialog.Designer.cs b/OneMore/Commands/Styles/StyleDialog.Designer.cs
index 6493758ff4..ff96aadbd7 100644
--- a/OneMore/Commands/Styles/StyleDialog.Designer.cs
+++ b/OneMore/Commands/Styles/StyleDialog.Designer.cs
@@ -196,11 +196,11 @@ private void InitializeComponent ()
 			// 
 			this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.okButton.Location = new System.Drawing.Point(352, 368);
+			this.okButton.Location = new System.Drawing.Point(314, 368);
 			this.okButton.Name = "okButton";
-			this.okButton.Size = new System.Drawing.Size(116, 38);
+			this.okButton.Size = new System.Drawing.Size(154, 38);
 			this.okButton.TabIndex = 9;
-			this.okButton.Text = "OK";
+			this.okButton.Text = "OK (Save)";
 			this.okButton.UseVisualStyleBackColor = true;
 			// 
 			// namesBox
diff --git a/OneMore/Commands/Styles/StyleDialog.cs b/OneMore/Commands/Styles/StyleDialog.cs
index a8811a00f8..a90cdd607f 100644
--- a/OneMore/Commands/Styles/StyleDialog.cs
+++ b/OneMore/Commands/Styles/StyleDialog.cs
@@ -4,6 +4,7 @@
 
 namespace River.OneMoreAddIn.Commands
 {
+	using River.OneMoreAddIn.Styles;
 	using System;
 	using System.Collections.Generic;
 	using System.Drawing;
@@ -27,6 +28,7 @@ internal partial class StyleDialog : UI.LocalizableForm
 		private GraphicStyle selection;
 		private readonly Color pageColor;
 		private bool allowEvents;
+		private Theme theme;
 
 
 		#region Lifecycle
@@ -44,7 +46,6 @@ public StyleDialog(Style style, Color pageColor)
 			allowEvents = false;
 			this.pageColor = pageColor;
 
-			Text = Resx.StyleDialog_NewText;
 			mainTools.Visible = false;
 			loadButton.Enabled = false;
 			saveButton.Enabled = false;
@@ -53,6 +54,8 @@ public StyleDialog(Style style, Color pageColor)
 			deleteButton.Enabled = false;
 
 			selection = new GraphicStyle(style, false);
+
+			Text = Resx.StyleDialog_NewText;
 		}
 
 
@@ -61,12 +64,13 @@ public StyleDialog(Style style, Color pageColor)
 		/// </summary>
 		/// <param name="styles"></param>
 
-		public StyleDialog(List<Style> styles, Color pageColor)
+		public StyleDialog(Theme theme, Color pageColor)
 		{
 			Initialize();
 
-			Text = Resx.StyleDialog_Text;
 			allowEvents = false;
+
+			var styles = theme.GetStyles();
 			LoadStyles(styles);
 
 			if (styles.Count > 0)
@@ -75,6 +79,9 @@ public StyleDialog(List<Style> styles, Color pageColor)
 			}
 
 			this.pageColor = pageColor;
+
+			Text = string.Format(Resx.StyleDialog_ThemeText, theme.Name);
+			this.theme = theme;
 		}
 
 
@@ -197,6 +204,41 @@ protected override void OnShown(EventArgs e)
 		#endregion Lifecycle
 
 
+		// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+
+		/// <summary>
+		/// Gets the currently selected custom style. Used when creating a single new style
+		/// </summary>
+		public Style Style
+		{
+			get
+			{
+				var style = selection.GetStyle();
+
+				style.Name = nameBox.Text;
+
+				if (subButton.Checked) style.IsSubscript = true;
+				if (superButton.Checked) style.IsSuperscript = true;
+
+				return style;
+			}
+		}
+
+
+		/// <summary>
+		/// Get the modified theme. Used when editing an entire theme.
+		/// </summary>
+		public Theme Theme => new Theme(MakeStyles(), theme.Key, theme.Name, theme.Dark);
+
+
+		// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+
+		private List<Style> MakeStyles()
+		{
+			return namesBox.Items.Cast<GraphicStyle>().ToList().ConvertAll(e => e.GetStyle());
+		}
+
+
 		private void ShowSelection()
 		{
 			allowEvents = false;
@@ -247,31 +289,6 @@ private void ShowSelection()
 		}
 
 
-		/// <summary>
-		/// Gets the currently selected custom style
-		/// </summary>
-		public Style Style
-		{
-			get
-			{
-				var style = selection.GetStyle();
-
-				style.Name = nameBox.Text;
-
-				if (subButton.Checked) style.IsSubscript = true;
-				if (superButton.Checked) style.IsSuperscript = true;
-
-				return style;
-			}
-		}
-
-
-		public List<Style> GetStyles() =>
-			namesBox.Items.Cast<GraphicStyle>().ToList().ConvertAll(e => e.GetStyle());
-
-
-		// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
-
 		private void RepaintSample(object sender, PaintEventArgs e)
 		{
 			var vcenter = previewBox.Height / 2;
@@ -596,9 +613,17 @@ private void ChangeSpacing(object sender, EventArgs e)
 
 		private void AddStyle(object sender, EventArgs e)
 		{
+			var index = 0;
+			foreach (GraphicStyle style in namesBox.Items)
+			{
+				if (index <= style.Index)
+					index = style.Index + 1;
+			}
+
 			namesBox.Items.Add(new GraphicStyle(new Style
 			{
-				Name = "Style-" + new Random().Next(1000, 9999).ToString()
+				Name = "Style-" + new Random().Next(1000, 9999).ToString(),
+				Index = index
 			},
 			false));
 
@@ -619,8 +644,9 @@ private void LoadTheme(object sender, EventArgs e)
 				dialog.Multiselect = false;
 				dialog.Title = "Open Style Theme";
 				dialog.ShowHelp = true; // stupid, but this is needed to avoid hang
+				dialog.AutoUpgradeEnabled = true; // simpler UI, faster
 
-				var path = PathFactory.GetAppDataPath();
+				var path = Path.Combine(PathFactory.GetAppDataPath(), Resx.ThemesFolder);
 				if (Directory.Exists(path))
 				{
 					dialog.InitialDirectory = path;
@@ -634,10 +660,14 @@ private void LoadTheme(object sender, EventArgs e)
 				var result = dialog.ShowDialog();
 				if (result == DialogResult.OK)
 				{
-					var styles = new StyleProvider().LoadTheme(dialog.FileName);
-					if (styles.Count > 0)
+					theme = new ThemeProvider(dialog.FileName).Theme;
+					var styles = theme?.GetStyles();
+					if (styles?.Count > 0)
 					{
 						LoadStyles(styles);
+
+						// update dialog title
+						Text = string.Format(Resx.StyleDialog_ThemeText, theme.Name);
 					}
 					else
 					{
@@ -717,6 +747,7 @@ private void DeleteStyle(object sender, EventArgs e)
 			}
 		}
 
+
 		private void SaveTheme(object sender, EventArgs e)
 		{
 			using (var dialog = new SaveFileDialog())
@@ -740,7 +771,13 @@ private void SaveTheme(object sender, EventArgs e)
 				var result = dialog.ShowDialog();
 				if (result == DialogResult.OK)
 				{
-					StyleProvider.Save(GetStyles(), dialog.FileName);
+					var key = Path.GetFileNameWithoutExtension(dialog.FileName);
+					theme = new Theme(MakeStyles(), key, key, theme.Dark);
+					ThemeProvider.Save(theme, dialog.FileName);
+
+					Text = string.Format(
+						Resx.StyleDialog_ThemeText,
+						Path.GetFileNameWithoutExtension(dialog.FileName));
 				}
 			}
 		}
diff --git a/OneMore/Commands/Styles/StyleDialog.resx b/OneMore/Commands/Styles/StyleDialog.resx
index e65c63393a..a43543c2f8 100644
--- a/OneMore/Commands/Styles/StyleDialog.resx
+++ b/OneMore/Commands/Styles/StyleDialog.resx
@@ -124,164 +124,164 @@
   <data name="boldButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAArNSURBVGhD7Zl5UFTZFYedTJyM49QkNTEZO1NlZSqpCs6o
+        pRg1WDoq49q47/u+76BiNK64y+6+4e4EVFRQ0AgqxBWVRQWXoBJQaBRkGdZumr75zi16ipqqqeQfmqlU
+        36pTb+nX3e+755zfOfe9Bs7hHM7hHM7hHM7x/zfeW7169c9+aJz/r2a/Vin1Q3vPblzn+DF9+vSGXbp0
+        +Xjo0KGfjhw58rMxY8YYxAYNGmTo1auXwdXV1dCsWTNtTZo00VsXFxdD586d9TXTpk0zLF++3LBnzx7D
+        hQsXmj58+PAzk8n0W5vN9mugfoV9zP4v2L7vMEiZaSA+6dev3xdDhgz5M/bN8OHDjSNGjOg7cODAvr17
+        9zZ27NjR2LZtW2OLFi2MzZs319sOHToYu3XrZuzfv7/HxIkTjUuWLDFu2bLFeOTIkV7Xrl3rnp6e3vXd
+        u3cdzWZza6D+gP0GqA8dBjZs2LAP8NTngwcP/hqbgq0Czo9zwQMGDAjq06dPQPfu3QO6du0a2KlTp0A3
+        N7dAQAPlGG8GAh84bty4gDlz5gSsXLnSb/v27VvCw8PX3759e+WLFy88CwoKxldVVXUHyAX7JSbhW/cD
+        gEbAuHCDY7FthNY/OL7Pfir7D/FISt++fVM8PDwesn0oW6PRKPYA8Ad8P2Xs2LHJM2bMSMZr9zdv3nzn
+        6NGj169cuXL50aNHYa9fvw4oKiqaWV5e3vnt27cGwH5e89d1O7ipxgC4AuIFxHns3xyXknNmQrKSm68g
+        VCuBssyePdsyd+5cCxAWws8s5+XzCRMmlE+ZMqV85syZpWvWrCneuXNn4alTp3KBewxcdFZW1oa8vLwB
+        hYWFvwesYc1f1+3o0aNHY6DaA7QCL8RxowV4QY0aNUoRYmrWrFlq2bJlivxRO3bsULt371aBgYHKx8dH
+        eXt7K0JQTZ06VQGmr8VrauPGjQohqT558mTB1atXE5OTk3c/f/581Js3b/4I2Ac1f123Q8CA6iBgCEgc
+        eVMoYKijwivK09NTbd26VR0/frw6KirKevnyZWtERIT14MGD1Zs2bdIgeErhNTV+/HiFN9XSpUv1d5gI
+        c1hY2LNLly4dJecmPnny5E+ijjV/XbdDwAi9doD9lXCLAS4PDyqB40Zt3HAVglAKzLu7d+++SUtLe3Pz
+        5s08IAt37doloWcmJ6sJS/0d1FR7UODWr19ftW3bthdMyreRkZFT4+LimjsMDJiPJMcIwcVARSPvuUAq
+        bla5u7tXS94w89mEVNrLly/vE04J5EwSkM/Io2x/f/8ics9M2Nr4HcXv6DCWsATOQghn7N+/Pyw0NHQG
+        k/MVpeDDmr+u22EHE/Fg/wKWYwdj9qsQi/zg4ODU+Pj4GIpuuMViCSspKYmgTv0T2NR9+/aZvLy8yvhe
+        NaVDibcljGvCs2rdunWZeDyc+jabsGyJNar567odtcGYbQ0msy5gqGIVYWUKCgpKuHXr1klq0t7q6urt
+        WAiei7hz507CsWPHMgm5EmqfDke+o3Nt4cKFau3atVUITRYeO3PixIm5hK/jwYBZRChG4S2THUw8hupp
+        sOvXr58GbB9QOym4B3NzcyMRhARqViZe0WACRPnQArJixQpFV2MJCQnJPH36dPjFixfnkGMtmaD6AcME
+        TOcLs2/FY/nMeiq5cSUnJ+dMRUXFSQpuBAoXj9qlUrN0KHKdTaDsSkqh1qpIF/KSMA5LTEyc+fjx4xbI
+        vWNzrDYY52ySKxRpLR6EWvbZs2cfc3OJCEgCTW4Ssv+UEHuNKhZyjRRr2+jRo7UiirdQTEUdq8DT/3r6
+        9OmJ7Ozsqfn5+V/WCxgwURznCJCAoW426TIWL15cQmHOJ6RMdO/ZeMG0d+/efELtO+k+MKu9qKOQ2lvk
+        lIqJiSlLTU19Qit1BE9PAsolIyOjfsEkFEXdJk2aZFuwYIFV8oWiaw4ICDAj4WaWKRY8ZeUa8a4OXQlF
+        wlJRu9S5c+cU+VRCI5yGih6kfo3HHFegfwysRhX1zUp4zZs3Ty1atEh3GqJ4rOGUqKAAEb5abCS/pDBL
+        GJ4/f14hLgKWSk6GWK3Wnx6Y9IF2MMJSg4nyiQpK7UIRtXdlAgRMPEbxVrGxsaX0iWnAHaY8TKysrKwf
+        MBEPO5h4QtqjyZMna5WjJik/Pz9FKOocEoEgRDWMNMtiMgFybU0TLHlWhueeIiDH0J3JiEj95JiAsbDU
+        YBxrMaDzsJFftg0bNtjIm2rEoxqJt9EA2wSSxaUGlNAUMOk4xKuopawIKrj2+eHDh/+OQk6Pjo7+0uEt
+        lYCxH0WvqMEkb0TCCT8L9aiUJraI/rCAWlTI7H9348aNikOHDlWhjtXiIck9CU/ERntR1HH+/PkWljwZ
+        FPBTQM6mr2yJ1U+BZoVsYl1mk36RumTlhou5+ayEhIQ0CnQKQvCouLj4+atXr3IFEC+YxXuyhJHcEwER
+        T4vJ9wnlLCDP8tk8PNmKUK3Xlsom4sFnFm4oG7AERCCCWvQtLdUp7CpL/VSW/SaWMKXkkVVySvJOwlEE
+        RUK5Xbt2VgTpNZ6PBHABnmxdL2CiimxNHNvXVpXkTrqvr28UNWkH9WgjUH7YCeT7Op3ECwpwEWFqoWeU
+        9ZfOMQHjd1WbNm0ELBt1vYC6eiIwbfi9j2r+um6HHYwb8MJLF7Ac8ZaAIeOVLD2e4Ql045wvHvobDbAP
+        FlJWVnaV0Ewn52T5bwbeVhtMclRyld/P4Tgar3nVO5h4TOC4MekBM6hNsUh3COEYxJpsFy1SODmWAFQm
+        Kld85swZiygn3YgORal/UtsEjFwzMTnRhKEX0I4HIwQXs43Gcu1geK2Km8pD2VJRwDgK7iXgYlNSUu6h
+        kC/x1Dv6xwqgrCifln0RD+lIRB2BsFEupPuPYnI8MceByTMP4PQzD7wWA1SehKHMusw4SV8BWD5NcBbd
+        RAYqmInl0ggXs8isFCjxlsi9PA4QqZdwlONVq1bZKAW5kqOs6TwpG60dJvcChrx3AGoFUHF4qlA6DlmC
+        yMzLjXp7e+smWNZXYlK/BEYew4mnpI2iZulHcSL5AKng4GCFmirgTayaz5Oj85mQVg7rPASM2qWfK2IC
+        ViDekjokYNJSSYhJhyGFWB6rSc0CTD9vFBApxuItuU4kH+/I4zolE8DSJUMeKxDCM9LS0r5yWK+IDDfG
+        U65AeaFkkexn4MESEQ7yrgLvlcsWyEpCzAyAfgKMSJQDX1bbqFFlPj4+ZdS0ckK1NC4uzkQ+JqSnp+/K
+        zc0dTR103ANT8kk/uwdqLADBhOQl7B6gjzh+wPlkMc49EJNzfJbCvpxL4vtJTE4ioImIRCINctKBAweS
+        o6Ki7t+7dy+W0DtcWFi4BKieeOtzwBzz7J4ao9+2cLNfc9P6bQvmi1wHceOBeM+/Z8+e/vLGxd3dXd66
+        aJN9OQ+0P97yw5N+hKY/eRcQGhoagLd86eZX5+XlzWG50h+oVtingL1f89d1O8gV/X4MuC8Iw3YA6fdj
+        bL9/PwaIh5ubm0f79u09XF1dtcm+vDcD2AiYEfEwEoZGwtCDFYBHUlJSHwr6NxTyvwDWHKCmgDVi65jX
+        SDKoLQ3x3I++0QTgd/JWU95i2t9syr6cs7/VREQMdB4GVNAQHx9vIASb0oLpt5rYJwDJSz/HvdGsNb5/
+        XyxetBvn/yer/R1+46fxDto5nMM5nMM5nKPeR4MG/wGd9dR8y/E20AAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="italicButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
 </value>
   </data>
   <data name="underlineButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
-        YII=
+        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
+        RK5CYII=
 </value>
   </data>
   <data name="strikeButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAF9SURBVDhP7ZDLSwJRFMbvv9K2bav+DRcuBHGhID4QdMTE
-        RY4vBF0kKOIzRF2FOuHO0IW4FCIYkxaZxEQOKihDEGr5de8w7SJwGfTBgXsO9/udB/nXz7LZbOj1ek9a
-        erg0wK2WHi4G6Ha7r1r6u4bD4V0wGPwwmUw7q9W6G41GNwxQLpcRjUY3brd7n06noX0ng8FA8ng84DgO
-        8XgcZDqdYjabXSiKclav1xGJREBBSCaTWCwWJ/P5XGTvUqkEaobP58N4PD5dr9fnoihekkKhgEAgALvd
-        Dp1OB7PZDIPBwLqrJhbhcFits2CAbDb7RuvPxWLxhVgsFjQaDXQ6HaRSKRVkNBqRy+VYbVOtVvfUAKfT
-        qQJisZj6VxCE93a7vSXMMJlMrum4XCKRgN/vB4Pm83ksl8tjusJjKBRCrVZDs9kEz/OQJElYrVZHdJUr
-        0mq1+g6HQ/F6vTLr9A3IZDKgNfVYlUoFsiw/UBNPIfd6vf7T5XJt2ZTabf+uCPkCpeQM4h4pK6IAAAAA
-        SUVORK5CYII=
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAF+SURBVDhP7ZDLSwJRFMbvv9K2bav+DcGNIC4UxQeCjpi4
+        yPGFoIsERXyGoqtQJ9wZugiXQgRj0iKTmMhBBWUIQi2/7h2mXQQtgz44cM/hfr/zIP/6Xna7Hf1+/1FL
+        fy8NcKOlvxcD9Hq9Fy39WcPh8DYUCr2bTKad1WrdjUajKwaoVCqIxWIbj8ezz2Qy0L6TwWAgeb1ecByH
+        RCIBMp1OMZvNzhRFOWk0GohGo7DZbEilUlgsFkfz+Vxk73K5DGqG3+/HeDw+Xq/Xp6IonpNisYhgMAiH
+        wwGdTgez2QyDwcC6qyYWkUhErbNggFwu90rrT6VS6ZlYLBY0m010u12k02kVZDQakc/nWW1Tq9X21ACX
+        y6UC4vG4+lcQhLdOp7MlzDCZTC7puFwymUQgEACDFgoFLJfLQ7rCQzgcRr1eR6vVAs/zkCRJWK1WB3SV
+        C9Jut6+dTqfi8/lk1ukLkM1mQWvqsarVKmRZvqcmnkLu9Hr9h9vt3rIptdv+XRHyCZidDNloGFc6AAAA
+        AElFTkSuQmCC
 </value>
   </data>
   <data name="superButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -313,160 +313,160 @@
   <data name="backColorButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAABQSSURBVGhD3ZkJWFXl1sePaabldcwK0/uVlZU5ZmYpKuKU
-        85RaamXODQ4pDigIqOSAA4KCs6hYJmkiDogyCaI5ICIyqwQHUGTmyHTgvPe3dgfvvV6/+9T19vXw7edZ
-        7nM2e7/v+q/1X/+19lH3uEfr1q1rd+vW7a+9evUaOmjQoJVjxowJ+PLLL2MdHR0TPDw8zn333Xe7Tp48
-        OePKlSvtlFJ1zI/9roPnamC1s7Oz66enpz8bGxtrcfXq1RcjIiJeDA8Pb3bp0iWLjIyMptzT0GQyPcO5
-        lvnRxzrqdOrU6Y0ePXpM++CDD3xHjhyZa2trqzZv3qz27NlTfujQociAgIDVbN5NnDM/87sOnqtZVFT0
-        XGpqatv4+HhrgjT0/Pnzo0JDQ0dduHBheFRU1JBffvmlT35+fmfubQm4+uZHtaOG+fx7Dw1Y9+7dZ/Tt
-        2/fYhAkTcpYuXaq2b9+udu/ebfTz84s5deqUW1BQUO+YmJh63C/7PMr+1yM3N7cBjne6cePGJ2TK8eef
-        f3Y/d+7cNoBtA6BnZGSkW2Ji4gqy9gXg+hYXF7fQBQcH1/vpp58aOjg4NP7www8bQ63G9evXb8x6D6x5
-        8+aN+/Xr13jRokWNDh482CAzM1PS/SQmDj3Vrl27VtBxEsB+hIoZCxcuVJs2bVL79u0r//HHH+MxL44J
-        y5Yte3PIkCHPW1paNv3444+fZb0m3377bROC0Jh767P2v2T08uXLT5OhNzmPh3oboV4AgCIJ1A18jwkL
-        C4sma5HXrl0LSkhI2J6WljYd/9roTp8+3crHx+ed5cuXd/38888toZMlGbBs1aqVZcuWLbVzly5dLAcP
-        Hmz5zTffvEfddAwJCXmNh58D2NNcq9uxY8dXu3btOqF37977AJYya9Ys06pVqxTBKt+xY8cvPHNy5cqV
-        K6i98cOHD+9HLVoBrOecOXO6Ozs7d4e2XanFdtSixYkTJ54yYxIK1oFmLwNiGH6uIvNB/v7+adDbQCBK
-        SUiJGNeKAZxJAIIBuIwafE8H+mEAm7Vu3TpbNrIna0tx0J4M2Hfu3Nn+/ffft5fvXLfD4QUuLi4zDh8+
-        PDI6OvoduNwMCtTn7y3fe++9MZx3jBgxImno0KGVS5YsEWAVWC4WM3/+/GOTJk3aCrDVBGnZRx995MR6
-        DgBz9PT0tAXYpOPHj3eDWs8DqKYwgrWb41//Y8eOLSWbx7///vsUmFDGvWr//v2K7+ro0aPqzJkziuyV
-        cm805sYaVjqQLsFRHx44jTMhM2bMCB03blwIIhCCg5rJ508++SR45syZ/itWrPCmdpxZ6GO9Xt/hzp07
-        z/P3lgRipLW1tcewYcPiJk6cWEEm1YIFC0yzZ88uAcDdr776Kp41LgLsLHQMHj9+fCj3nCWz4VDxNHTd
-        joPTqaF3DQaDRVJSUgv2sAKUzYEDBw5xTyI+Fm/cuFFt2LBBMxEob29vdeTIkap6jid7nmS9tw50Xjyc
-        hILlsEkB0S3EoQKcyZ8yZUpBlQE4n2tZ9vb2sa6urseImgOUHEDmWn766aevIB7DkPyN0OwGAlIBEAUo
-        0+TJk4u//vrr7KlTp6aQpSQymgx4/dixY7PZp3DNmjVFrJVNti6fPXvWE2CfIzLWkikoNwvH95HRGLmP
-        7CoRJqlhnhVGKAG6d+9eDRj3xwFyC/TsrYOXfixigN8acmipJNW7du1S1IZav369ov7U4sWLtcWQcgML
-        xq5du3bXtm3bPmXjtmToNeR+iJWV1QYyHIOIVAowqF0xd+7cbDIdR3DCqatgsnsRWqfw+b6sKxEnsEKn
-        LIIcevHiRQ8Uz47oOxHsPYC6TJkInU3iA2sqgqymT5+uWFshPpqfQlGoGQ0od5610lFsp/hQDkCF8ij6
-        jXZGUoW3Cppq0k1taREy0ytz3rx5vqja11hnwLwOFTVgUC0GoCahIpEtJRBJ3HscoO5QcTXisvWzzz4L
-        YR29m5ub0dfXVxFYhbKVsGcK4CIAeRL6BQAqkkzdYd9yOzs7xTpKAibAvvjiC2VjY6MkizBIcW8edRhO
-        kL6Fjl11pD0A5SnnrOgTKi4uTiUnJ6ubN2+q69eva+Akg/KwAAOUwsF8nAuCggupx259+vR5EwkfzHk9
-        2YiZNm2aCcByv4GIXqIuPXBsCpQciTJOB9R2HI4i0gaatxZERMDEXveR7yzYk0ay0mFLrpOTU5msJdkh
-        8xowSkIDKWAlk0JTMh/PGgdZYw5rtNcBKoAvZURMES2JnJLskUkte0isogcpHta4jdOKWimEUmFkx27g
-        wIE9UM+3BBi9bv3o0aNjAGBipFJSs2QldOvWrY7Ifm/WeYvsW+3cudOeYAUhGLmSLdkPCioibkLWK2BJ
-        OfeVr169ulLoJ8EkIJoJFWWykfWFhtDUwPrxlJAvmV4G24aTnJd0oAsEaTl0lIU1GZUMQQVNTqXWeFgr
-        WtkAmimyUoiyhQHKDvr1bN++/VtCRWprA6BviGjIpgIMQIGssxCHOzPrvUgT7UANzUYojgPqngRTqM81
-        LYhCfQmkMIRsaXSroh8B04ILA6pKo5Q6T8ZnX8THkTU+BFTbvLy8hjqkMRw1qURVtJsBUE5EiomUpo6o
-        oIFIleFwpSwOBRXKVgCwswBbghL26NChQ2v62ANgRFVr0BR0AZQ688MPPyyEclrfw9qlpKTMhPrHUMAs
-        xiGNigJKAomjmh+SERErCaYAEhoK/STA/L0SGheT+V94xh/BWEG2RrDOW7dv325ID6ylo4NfElCSFZw2
-        YvdGjRqVANUuUz8XoN41IqYHlIGCNaFuGjDpbwMGDLDt2bOnJZPHmzTywQ9njKjn4+gZsr4QBmgZA1h7
-        Zr+Z1PBxWkWWZIu2oQCv3N3dNTGQmhLKCRgx+SwgpcalprivgKze5JlTiMUqgjYGBrSmjOoD6te5k82j
-        ZUHmOAFWJA2WLPhBMU+c38C1fQA7j7OZFLDWn6TGuC+0f//+tlBQAyY1VgVMnJH1iGw+NXaGXrOQZtoZ
-        GlYBm8XnE1DnnoiTTA/UidZWhGoiDqJ6UlPyWUBJBqXO8bWQTMUC6iignAMDA8dQo+3Mmfr7MI0DCdLF
-        hc8slEv9XATYFqg1h2Y7lUw5sbAfU8ltVKhc1AlQJYA+DzAZuTQq0seGAswdYPFVwKTGYEIw6mYPuJ5Q
-        pdXdu3e73rp1awHCdBqnsqV3Sk0JdQWAABFAAqyKflWZgtoG2JVI9o8QDAeCMhwqt2byb6TR7x8PInFb
-        CpUhVRbJI0OXcNoDp7+CihOZ8Zay6FEKNgVnjRJR/lYJ6KvI+zIGZCum+zYyUqGKWwCWLM5JgYsMk6kL
-        KNwGamEclOuL+o3l7IJj57iWh7hoZSCzpQARRohJbYlwiCqyf4UEiUwlkCl0zs+JoAwlU68SqHqAqmmG
-        8/eDh1Jk5mKSUIAoZsJPIGuHqLM1fHYkQ9sQkHPclyVRE2D0LwWwaIZe53fffde6LQfT/SiAbmVUuiVO
-        SQYo8FLGnTiK+xCqtZLGuYgMOQPIh9q7QUANElARBGGCZEpASU3JPuwrmTcSoFwZq1Drn6DfMqb9UdD4
-        DVrVM2YY/3pAkwTht0SNwbQSywLUFcAdR9p/IvohRO4mG9+XqIoDNOgKgEWSoeUA6/Xyyy+3ffvtt0cw
-        BG8W4SHyJlmPGqsgunehTBTOBPD5KGIVQN1dJaOZorbSkyQzki0BJmcCrNEP0JX4ly+geO5HAmRfRT9k
-        /S9mCI8+oEmIFCQLGZi/8uRFkRpKRBWvMsxe4VoM4FKg6T0iWUTNFTLn6bnnJHJvQy12s7CweIOjH3R0
-        RDFDeCaLui2hjZRDuxJ6VR5ynEGP0pOpTLKZS1ZLJJCSHaGumHwWUJJBYQcZLYSqsWTqEJm2oxcOBtRr
-        9+7d+8s/CcWjDkYRNygTiiKF0y9CqZFgJoogIh/E5yCm8yAiGUQkgynos2QxFLod5Z61vFeNA1jbRo0a
-        tQDc2zTq8YB1xekg6J0E/fKk+WMm6GciUyZxWEyyJP1JsiRnYYLUk4gOE4dWnwQhTkDxvB2ZGkzve1Xe
-        3s2u//uDseaTLVu22APMkU0cAONE1L8F2GrEYw0vhyvJwHL5Gz3NAXGxJ6vzuEdAdIWKzVmmYd26dV8E
-        XCfewMfjoAvq5U9/uSVvt7zSK5kJZaoRBZbakSFZQEnTF/pJ75IeZn7PKiZTyQTdV+jHhDKIehJFld9M
-        ftsB79vgRDfoYclGPRCGXtRXX5zvDxU/4Hs/mrI1oHpw7i4/H3C9C8DaAKL566+/Llx/EqtTr169pmS1
-        E5GeCu3kZ7doJooCMqdNFdIvq8YkASNCIWfJloCVTAqFZaJA0k8BajmBGUxreMWsfk9oTv+Wg5GqPhLa
-        mEmhCc4/i9PPMci+gOMW1IAFGXpBrgFW+wEG4WhCJhsBqj40rMsSmtRClVpkpjF06YAjk/m+g7qIwsEC
-        mWygodZkpS8J9cREPaWmyLDQs1yEAlBJzKynUb+11NRYJopW6enpT8se/9FhLsYabPDEo4y/iWn3PGRV
-        P2g2YqpobTQaR+CIE6PSESKeKK8m0koElGRGGm8V/f5BKEpR0btk9DqzpS81tZrhfJxMFOHh4f9e/f6o
-        Q0ABSGa0DpzHGwyGtXq9/gQ1cYOMZcmbbdX8J8onoKS2BCTtw4SklzCVZKDOF+l5+1HSxTLQ8nwb85j0
-        2+n33zwYZhuUlZW1KSgomJCTk+OekZFxDofSiHYh04E06EqZ1uWlUGpL6Gd+u5ZMFVNT0gIioOxuMvUN
-        z/STieI3SfofccimMk3LqwJT+pjY2FgXmmYob99Z1FlFYmKi9tIqr/6orvZSKAIhki7G51KadDoKGIGk
-        70DEZqN+1rzF/09qaqrU7p9zyDgjrwpEePSZM6dWQh9/PqdK35KfGZjeFYAV9yjopb1nyTQiAKGmkV51
-        R+ZIBuCd1OJMnu91/fr1FgTsP/qPi//KkZoaUTc8PPAVZHw4su4MjU4S9ZvUSbGAAKD2qg947bVfXv9l
-        ihd1RCCM7u5uWQC9SJ/yoo/Opi1YcU8LKPzngBL6SecPCzvdElADcMrO23uP77Ztm5M3bnQrpmZMzHXy
-        m72S3iWv+1euRD4A5+t7pIKay6FRX/Hx8dkL/eYBqg8K+Feo++Cn7f/zA9WrC11eofcNxLHFe/d6HfT0
-        9IiV8WfFCmfGoeW8LK7Q3hTkt5KjR/1UWFi4BkzGKmiZHxgYGk2P82aGnBsWFtGHOfIl+t+fVVOqxt69
-        mc8EBiYC6vxAXokW79y5/6Crq0e0g4NLvr29g8nWdimqJ5O6LQroyGS/Aep5k6UTZCu8IiwsMv/atevX
-        Y2ISfoiLS7KJj0+2TkrSt/jTQI0erWoyvjXcvfveG3v3Xh+yZ0/Qkq1bD/u4uOyMcXJyy5s4cSUT+lJ6
-        0yI1ffp8GvBCepQDDXkdc99OtWnT4bIjR8KyLlyIi0xKuuudk1M8t6ioxOr+/fvNoLaMYn/GoWp4eKhG
-        O3aUddyz59bY7dsvLN+06dhhF5d9MQ4OW3JtbBwqZs5coaZOXaImTpyvPvvMRk2btoQ+tZIetQlbXbFp
-        k2/OoUMRkefOpXqlppq+hs7dMPkvqD+2Rymle+JhM1+vyVjUwN8/oT0j36cHDpxb5+V1/KS7u3f8qlXr
-        c+3sHMptbJYzGtkBxkZNnjxHTZnyDd8XQ8U1vHr8+nv6vn1+t/38wv0uXIi1zcwssgaUZOqf/oPv4f0f
-        0xjvGPVMJl1TrJnZLLj4Aufn0IlmqalT20ZFbR8bFvbdupMn9wX6+Gy/vXv3miJXV8dKZ2eZ82YzKn1J
-        XU3DpqgFC6ZBwTnK1dVJ7dy5jol+Q4mf3/74kJDvv4uK8voiP9+ls8nU5Xn2aMgeTTD5/IJ5T4vHMfMa
-        TTk34PyURMuSD0PNNggbgPU3GmsPKSjo+Hla2oQ1MTFzAn7+eWFKaOjsEi+vWaaDByehemOUp+dwsjIU
-        G6I8PIbwfZjy8vpIHT48Xfn7z0U0ZpdcurQoMS5u9uG0tCGLS0stRpSX63qyvlhfbOBjmvg72GwfmLG8
-        hTWRjM2rrNRtNho124CtxVyMxpquJSXPeeXktA/U63vejI/veT8hYZC6caO/unTJEqffphG3V2fOtNPO
-        wcEdVEhIRxUR0YXGbK1iYweq5OSeZXp9//SsrC7nCwubeZeV1VjLXsswZ2wN+6x/HCsr07libthG1ltV
-        UaGbB7jhYHpFx4Uf+EMiFk80o7Arv1qNqwZDnYS8vAYZeXkvGmJjXzIVFLRUeXkvqaysZkqvf1alpjbR
-        LC2tifY9Pb2punPneZWT00Ll57dkrHq5orCweWF+fhN9cfFTMSUluos4dF7OmOwT+ZgWVVysi8Guy7pg
-        OQCo+dg7Ov54NTVVZ8Iq8vJ0JYWFuvti+fm64uzsGqUpKbUqUlJqm4zGOspkqqMqK59SRuOTqry8lior
-        q/nA5LuY0VhLVVTU1u7T62uz7pMVd+/WLCssrHHfYNAViRUV6QxV+zyOib937+rKxAhUHhm7AriNZM2K
-        XXS3+IBQVW9LT9dVkLUkbCfWTwcF/18Ay8z8FRgZ26EB45+4R91Y3UzoCJYbAPPk3EeART/qxupkiAWi
-        piuhxq4BzJ3vvQTYtUfdXJ1MgInYVQHjmpWoYuzDN1ZHM1Mx1kzF3rrSUt3NR91Y3Uyv11UCKBl7tCpK
-        Wqubid9paQ+A7cL6CxWjMzJ0RklldrauVIqwOpn4LMb0kQ+gKKi4CbDWOgruCBcSsVg+R2NR1ciuYTJO
-        iV0C1GFALca6CDBbLm7j4hZBi7lVI3PHNpttHYAWYqOwV2W6fwdgfTj3xnrBV6vqYuIvxsurZj2wd7BX
-        ldI1+BsAULyB/0NaDQAAAABJRU5ErkJggg==
+        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
+        VSldg78Bk+a8OCySI+AAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="colorButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
-        AAAASUVORK5CYII=
+        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
+        TkSuQmCC
 </value>
   </data>
   <metadata name="mainTools.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -490,190 +490,190 @@
   <data name="reorderButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAADYAAAA2CAYAAACMRWrdAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        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
-        TkSuQmCC
+        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
+        RK5CYII=
 </value>
   </data>
   <data name="deleteButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/OneMore/Helpers/Extensions/ColorExtensions.cs b/OneMore/Helpers/Extensions/ColorExtensions.cs
index 2e5260b849..cadfc3c3a6 100644
--- a/OneMore/Helpers/Extensions/ColorExtensions.cs
+++ b/OneMore/Helpers/Extensions/ColorExtensions.cs
@@ -4,6 +4,7 @@
 
 namespace River.OneMoreAddIn
 {
+	using System;
 	using System.Drawing;
 
 
@@ -22,6 +23,23 @@ public static bool IsGray(this Color color)
 		}
 
 
+		/// <summary>
+		/// Compare this color with a given color and determines if they are close enough
+		/// to be called the same color
+		/// </summary>
+		/// <param name="color">The Color value</param>
+		/// <param name="candidate">A candidate color to test</param>
+		/// <returns>True if the candiate color is a close match to this color</returns>
+		public static bool Matches(this Color color, Color candidate)
+		{
+			return
+				Math.Abs(color.A - candidate.A) < 3 &&
+				Math.Abs(color.R - candidate.R) < 3 &&
+				Math.Abs(color.G - candidate.G) < 3 &&
+				Math.Abs(color.B - candidate.B) < 3;
+		}
+
+
 		/// <summary>
 		/// Formats an HTML RGB seven character (without AA) to appease OneNote
 		/// and with all uppercase letters to avoid case-sensitive comparison problems
diff --git a/OneMore/Models/Heading.cs b/OneMore/Models/Heading.cs
index 24306ce072..676d18c869 100644
--- a/OneMore/Models/Heading.cs
+++ b/OneMore/Models/Heading.cs
@@ -4,6 +4,7 @@
 
 namespace River.OneMoreAddIn.Models
 {
+	using River.OneMoreAddIn.Styles;
 	using System.Xml.Linq;
 
 
diff --git a/OneMore/Models/PageHeadings.cs b/OneMore/Models/PageHeadings.cs
index 57f63b0ca0..1905e6626d 100644
--- a/OneMore/Models/PageHeadings.cs
+++ b/OneMore/Models/PageHeadings.cs
@@ -4,6 +4,7 @@
 
 namespace River.OneMoreAddIn.Models
 {
+	using River.OneMoreAddIn.Styles;
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
@@ -29,7 +30,7 @@ public List<Heading> GetHeadings(OneNote one)
 		{
 			quickStyles = GetQuickStyles();
 
-			customStyles = new StyleProvider().GetStyles()
+			customStyles = new ThemeProvider().Theme.GetStyles()
 				.Where(e => e.StyleType == StyleType.Heading)
 				.OrderBy(e => e.Index)
 				.ToList();
diff --git a/OneMore/Models/QuickStyleMapping.cs b/OneMore/Models/QuickStyleMapping.cs
index 38ca5a88a9..3136f40dfa 100644
--- a/OneMore/Models/QuickStyleMapping.cs
+++ b/OneMore/Models/QuickStyleMapping.cs
@@ -4,6 +4,7 @@
 
 namespace River.OneMoreAddIn.Models
 {
+	using River.OneMoreAddIn.Styles;
 	using System.Xml.Linq;
 
 
diff --git a/OneMore/Models/SelectionRange.cs b/OneMore/Models/SelectionRange.cs
index e52ee52d94..0cd0ffa18a 100644
--- a/OneMore/Models/SelectionRange.cs
+++ b/OneMore/Models/SelectionRange.cs
@@ -4,6 +4,7 @@
 
 namespace River.OneMoreAddIn.Models
 {
+	using River.OneMoreAddIn.Styles;
 	using System.Collections.Generic;
 	using System.Linq;
 	using System.Text.RegularExpressions;
diff --git a/OneMore/OneMore.csproj b/OneMore/OneMore.csproj
index 6edcea67f6..13253e8d2c 100644
--- a/OneMore/OneMore.csproj
+++ b/OneMore/OneMore.csproj
@@ -258,6 +258,7 @@
     <Compile Include="Commands\Settings\GeneralSheet.Designer.cs">
       <DependentUpon>GeneralSheet.cs</DependentUpon>
     </Compile>
+    <Compile Include="Commands\Styles\LoadStylesCommand.cs" />
     <Compile Include="Commands\Tables\InsertCellsCommand.cs" />
     <Compile Include="Commands\Tables\InsertCellsDialog.cs">
       <SubType>Form</SubType>
@@ -380,6 +381,11 @@
     <Compile Include="Models\Paragraph.cs" />
     <Compile Include="Models\SelectionRange.cs" />
     <Compile Include="Models\SelectionScope.cs" />
+    <Compile Include="Styles\Theme.cs" />
+    <Compile Include="Styles\ThemeProvider.cs" />
+    <Compile Include="UI\ColorsComboBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="UI\FormTextBox.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -534,7 +540,7 @@
     <Compile Include="UI\HierarchyView.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Helpers\GalleryTileFactory.cs" />
+    <Compile Include="UI\TileFactory.cs" />
     <Compile Include="Commands\Snippets\InsertCodeBlockCommand.cs" />
     <Compile Include="Commands\Snippets\InsertExpandCommand.cs" />
     <Compile Include="Commands\Snippets\InsertInfoBlockCommand.cs" />
@@ -691,7 +697,6 @@
     <Compile Include="Styles\Style.cs" />
     <Compile Include="Styles\StyleAnalyzer.cs" />
     <Compile Include="Styles\StyleBase.cs" />
-    <Compile Include="Styles\StyleProvider.cs" />
     <Compile Include="Styles\StyleRecord.cs" />
     <Compile Include="Styles\StyleType.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -863,7 +868,7 @@
     <Content Include="Properties\Images\UpArrow.png" />
     <Content Include="Properties\Images\Logo.png" />
     <Content Include="Properties\Images\NoSpellCheck.png" />
-    <Content Include="Properties\CustomStyles.xml" />
+    <Content Include="Properties\DefaultStyles.xml" />
     <Content Include="Properties\Images\WrapText.png" />
     <Content Include="Properties\Ribbon.xml">
       <SubType>Designer</SubType>
diff --git a/OneMore/Properties/AssemblyInfo.cs b/OneMore/Properties/AssemblyInfo.cs
index 103bb31092..be38a8d79d 100644
--- a/OneMore/Properties/AssemblyInfo.cs
+++ b/OneMore/Properties/AssemblyInfo.cs
@@ -36,7 +36,7 @@ internal static class AssemblyInfo
 		 * NOTE - also update the version in the Setup project
 		 * by clicking on the Setup project node in VS and update its properties
 		 */
-		public const string Version = "3.30";
+		public const string Version = "4.0";
 
 		public const string Product = "OneMore";
 
diff --git a/OneMore/Properties/CustomStyles.xml b/OneMore/Properties/DefaultStyles.xml
similarity index 98%
rename from OneMore/Properties/CustomStyles.xml
rename to OneMore/Properties/DefaultStyles.xml
index 6eac04087c..716a54b3b8 100644
--- a/OneMore/Properties/CustomStyles.xml
+++ b/OneMore/Properties/DefaultStyles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<CustomStyles>
+<Theme name="Orange" dark="false">
   <Style index="0" name="Heading 1" font="Calibri Light" fontColor="Black" fontSize="20.0" spaceBefore="14.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
   <Style index="1" name="Heading 2" font="Calibri Light" fontColor="#E67832" fontSize="18.0" spaceBefore="14.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
   <Style index="2" name="Heading 3" font="Calibri Light" fontColor="#823D0A" fontSize="16.0" spaceBefore="12.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
@@ -15,4 +15,4 @@
   <Style index="12" name="Emphasis" font="Calibri" fontColor="#4F81BD" fontSize="11.0" bold="true" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
   <Style index="13" name="Intense Emphasis" font="Calibri" fontColor="#C0504D" fontSize="11.0" bold="true" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
   <Style index="14" name="Subtle Emphasis" font="Calibri" fontColor="Gray" fontSize="11.0" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
-</CustomStyles>
\ No newline at end of file
+</Theme>
\ No newline at end of file
diff --git a/OneMore/Properties/Resources.Designer.cs b/OneMore/Properties/Resources.Designer.cs
index 68776e7845..35b78c170f 100644
--- a/OneMore/Properties/Resources.Designer.cs
+++ b/OneMore/Properties/Resources.Designer.cs
@@ -750,6 +750,15 @@ internal static System.Drawing.Bitmap Camera {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Apply style theme to this page.
+        /// </summary>
+        internal static string ChangePageColorDialog_applyBox {
+            get {
+                return ResourceManager.GetString("ChangePageColorDialog_applyBox", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Cancel.
         /// </summary>
@@ -760,20 +769,29 @@ internal static string ChangePageColorDialog_cancelButton_Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Custom background....
+        ///   Looks up a localized string similar to Choose a custom color.
+        /// </summary>
+        internal static string ChangePageColorDialog_colorLink_Text {
+            get {
+                return ResourceManager.GetString("ChangePageColorDialog_colorLink.Text", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Color and theme may not have enough contrast.
         /// </summary>
-        internal static string ChangePageColorDialog_customButton_Text {
+        internal static string ChangePageColorDialog_Contrast {
             get {
-                return ResourceManager.GetString("ChangePageColorDialog_customButton.Text", resourceCulture);
+                return ResourceManager.GetString("ChangePageColorDialog_Contrast", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Dark background.
+        ///   Looks up a localized string similar to Current Theme:.
         /// </summary>
-        internal static string ChangePageColorDialog_darkButton_Text {
+        internal static string ChangePageColorDialog_currentLabel {
             get {
-                return ResourceManager.GetString("ChangePageColorDialog_darkButton.Text", resourceCulture);
+                return ResourceManager.GetString("ChangePageColorDialog_currentLabel", resourceCulture);
             }
         }
         
@@ -787,11 +805,11 @@ internal static string ChangePageColorDialog_introLabel_Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Light background.
+        ///   Looks up a localized string similar to Load a style theme.
         /// </summary>
-        internal static string ChangePageColorDialog_lightButton_Text {
+        internal static string ChangePageColorDialog_loadLink {
             get {
-                return ResourceManager.GetString("ChangePageColorDialog_lightButton.Text", resourceCulture);
+                return ResourceManager.GetString("ChangePageColorDialog_loadLink", resourceCulture);
             }
         }
         
@@ -805,7 +823,7 @@ internal static string ChangePageColorDialog_okButton_Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Change Page Color.
+        ///   Looks up a localized string similar to Change Page Theme.
         /// </summary>
         internal static string ChangePageColorDialog_Text {
             get {
@@ -813,6 +831,15 @@ internal static string ChangePageColorDialog_Text {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Optionally, load one of the predefined style themes or customize your own theme so all content has enough contrast to be visible..
+        /// </summary>
+        internal static string ChangePageColorDialog_themeIntroLabel {
+            get {
+                return ResourceManager.GetString("ChangePageColorDialog_themeIntroLabel", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -1436,19 +1463,6 @@ internal static string CustomStyle_Screentip {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
-        ///&lt;CustomStyles&gt;
-        ///  &lt;Style index=&quot;0&quot; name=&quot;Heading 1&quot; font=&quot;Calibri Light&quot; fontColor=&quot;Black&quot; fontSize=&quot;20.0&quot; spaceBefore=&quot;14.0&quot; spaceAfter=&quot;0.0&quot; applyColors=&quot;true&quot; styleType=&quot;Heading&quot; /&gt;
-        ///  &lt;Style index=&quot;1&quot; name=&quot;Heading 2&quot; font=&quot;Calibri Light&quot; fontColor=&quot;#E67832&quot; fontSize=&quot;18.0&quot; spaceBefore=&quot;14.0&quot; spaceAfter=&quot;0.0&quot; applyColors=&quot;true&quot; styleType=&quot;Heading&quot; /&gt;
-        ///  &lt;Style index=&quot;2&quot; name=&quot;Heading 3&quot; font=&quot;Calibri Light&quot; fontColor=&quot;#823D0A&quot; fontSize=&quot;16.0&quot; spaceBefore=&quot;12.0&quot; sp [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string CustomStyles {
-            get {
-                return ResourceManager.GetString("CustomStyles", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to CustomStyles.xml.
         /// </summary>
@@ -1468,6 +1482,19 @@ internal static System.Drawing.Bitmap Cyclist {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;Theme name=&quot;Orange&quot; dark=&quot;false&quot;&gt;
+        ///  &lt;Style index=&quot;0&quot; name=&quot;Heading 1&quot; font=&quot;Calibri Light&quot; fontColor=&quot;Black&quot; fontSize=&quot;20.0&quot; spaceBefore=&quot;14.0&quot; spaceAfter=&quot;0.0&quot; applyColors=&quot;true&quot; styleType=&quot;Heading&quot; /&gt;
+        ///  &lt;Style index=&quot;1&quot; name=&quot;Heading 2&quot; font=&quot;Calibri Light&quot; fontColor=&quot;#E67832&quot; fontSize=&quot;18.0&quot; spaceBefore=&quot;14.0&quot; spaceAfter=&quot;0.0&quot; applyColors=&quot;true&quot; styleType=&quot;Heading&quot; /&gt;
+        ///  &lt;Style index=&quot;2&quot; name=&quot;Heading 3&quot; font=&quot;Calibri Light&quot; fontColor=&quot;#823D0A&quot; fontSize=&quot;16.0&quot; s [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string DefaultStyles {
+            get {
+                return ResourceManager.GetString("DefaultStyles", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -4834,6 +4861,15 @@ internal static string ribLinkReferencesButton_Label {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Load Styles.
+        /// </summary>
+        internal static string ribLoadStylesButton_Label {
+            get {
+                return ResourceManager.GetString("ribLoadStylesButton_Label", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to To lowercase.
         /// </summary>
@@ -4988,7 +5024,7 @@ internal static string ribOutlineButton_Label {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Set Page Color.
+        ///   Looks up a localized string similar to Change Page Theme.
         /// </summary>
         internal static string ribPageColorButton_Label {
             get {
@@ -6820,7 +6856,7 @@ internal static string StyleDialog_NewText {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to OK.
+        ///   Looks up a localized string similar to OK (Save).
         /// </summary>
         internal static string StyleDialog_okButton_Text {
             get {
@@ -6911,6 +6947,15 @@ internal static string StyleDialog_Text {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to {0} Styles.
+        /// </summary>
+        internal static string StyleDialog_ThemeText {
+            get {
+                return ResourceManager.GetString("StyleDialog_ThemeText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Transparent.
         /// </summary>
@@ -7206,6 +7251,15 @@ internal static string TextToTableDialog_unquoteBox_Text {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Themes.
+        /// </summary>
+        internal static string ThemesFolder {
+            get {
+                return ResourceManager.GetString("ThemesFolder", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Cancel.
         /// </summary>
diff --git a/OneMore/Properties/Resources.ar-SA.resx b/OneMore/Properties/Resources.ar-SA.resx
index f671e43bd2..b78396e4e3 100644
--- a/OneMore/Properties/Resources.ar-SA.resx
+++ b/OneMore/Properties/Resources.ar-SA.resx
@@ -222,9 +222,6 @@
   <data name="Watch" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>emoji\watch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="CustomStyles" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>customstyles.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
   <data name="CustomColorsFilesname" xml:space="preserve">
     <value>CustomColors.xml</value>
     <comment>FILENAME</comment>
@@ -490,8 +487,8 @@
     <comment>Ribbon main button</comment>
   </data>
   <data name="ribPageColorButton_Label" xml:space="preserve">
-    <value>تعيين لون الصفحة</value>
-    <comment>Ribbon Custom Styles menu item, set page background color</comment>
+    تغيير سمة الصفحة
+    Ribbon Custom Styles menu item, set page background color EDIT
   </data>
   <data name="ribPasteRtfButton_Label" xml:space="preserve">
     <value>لصق نص منسق</value>
@@ -605,29 +602,17 @@
     <comment>the version of the add-in</comment>
   </data>
   <data name="ChangePageColorDialog.Text" xml:space="preserve">
-    <value>تغيير لون الصفحة</value>
-    <comment>dialog title</comment>
+    تغيير سمة الصفحة
+    dialog title EDIT
   </data>
   <data name="ChangePageColorDialog_cancelButton.Text" xml:space="preserve">
     <value>إلغاء</value>
     <comment>cancel button</comment>
   </data>
-  <data name="ChangePageColorDialog_customButton.Text" xml:space="preserve">
-    <value>خلفية مخصصة...</value>
-    <comment>button</comment>
-  </data>
-  <data name="ChangePageColorDialog_darkButton.Text" xml:space="preserve">
-    <value>خلفية داكنة</value>
-    <comment>button</comment>
-  </data>
   <data name="ChangePageColorDialog_introLabel.Text" xml:space="preserve">
     <value>بعد اختيار لون الصفحة ، قم بتحميل أحد الأنماط المحددة مسبقًا أو قم بتخصيص الأنماط الخاصة بك بحيث يكون لكل المحتوى تباين كافٍ ليكون مرئيًا.</value>
     <comment>instructions</comment>
   </data>
-  <data name="ChangePageColorDialog_lightButton.Text" xml:space="preserve">
-    <value>خلفية فاتحة</value>
-    <comment>button</comment>
-  </data>
   <data name="ChangePageColorDialog_okButton.Text" xml:space="preserve">
     <value>حسنا</value>
     <comment>ok button</comment>
@@ -2042,8 +2027,8 @@
     <comment>dialog title</comment>
   </data>
   <data name="StyleDialog_okButton.Text" xml:space="preserve">
-    <value>حسنا</value>
-    <comment>button</comment>
+    موافق (حفظ)
+    button EDIT
   </data>
   <data name="StyleDialog_reorderButton.Text" xml:space="preserve">
     <value>إعادة ترتيب</value>
@@ -3259,4 +3244,36 @@ ISO-code then comma then language name</comment>
     استيراد كصور ثابتة
     checkbox EDIT
   </data>
+  <data name="ChangePageColorDialog_colorLink.Text" xml:space="preserve">
+    <value>اختر لونًا مخصصًا</value>
+    <comment>link</comment>
+  </data>
+  <data name="ribLoadStylesButton_Label" xml:space="preserve">
+    <value>أنماط التحميل</value>
+    <comment>ribbon item</comment>
+  </data>
+  <data name="ChangePageColorDialog_applyBox" xml:space="preserve">
+    <value>تطبيق موضوع النمط على هذه الصفحة</value>
+    <comment>checkbox</comment>
+  </data>
+  <data name="ChangePageColorDialog_currentLabel" xml:space="preserve">
+    <value>الموضوع الحالي:</value>
+    <comment>label</comment>
+  </data>
+  <data name="ChangePageColorDialog_loadLink" xml:space="preserve">
+    <value>تحميل موضوع النمط</value>
+    <comment>hyperlink</comment>
+  </data>
+  <data name="ChangePageColorDialog_themeIntroLabel" xml:space="preserve">
+    <value>اختياريًا ، قم بتحميل أحد سمات النمط المحددة مسبقًا أو قم بتخصيص المظهر الخاص بك بحيث يحتوي كل المحتوى على تباين كافٍ ليكون مرئيًا.</value>
+    <comment>label</comment>
+  </data>
+  <data name="StyleDialog_ThemeText" xml:space="preserve">
+    <value>{0} الأنماط</value>
+    <comment>dialog title</comment>
+  </data>
+  <data name="ChangePageColorDialog_Contrast" xml:space="preserve">
+    <value>قد لا يكون للون والموضوع تباين كافٍ</value>
+    <comment>label</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/OneMore/Properties/Resources.de-DE.resx b/OneMore/Properties/Resources.de-DE.resx
index 0a5ef3c519..4e42a81ac5 100644
--- a/OneMore/Properties/Resources.de-DE.resx
+++ b/OneMore/Properties/Resources.de-DE.resx
@@ -136,12 +136,12 @@
     <value>Einer noch</value>
   </data>
   <data name="ribNoSpellCheckButton_Label" xml:space="preserve">
-    Rechtschreibprüfung deaktivieren
-    Ribbon OneMore menu item, no spell check on this page EDIT
+    <value>Rechtschreibprüfung deaktivieren
+    Ribbon OneMore menu item, no spell check on this page EDIT</value>
   </data>
   <data name="ribNoSpellCheckButton_Screentip" xml:space="preserve">
-    Deaktiviere die Rechtschreibprüfung für die gesamte Seite (F4)
-    Ribbon OneMore menu item, no spell check on this page EDIT
+    <value>Deaktiviere die Rechtschreibprüfung für die gesamte Seite (F4)
+    Ribbon OneMore menu item, no spell check on this page EDIT</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="Ribbon" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -222,9 +222,6 @@
   <data name="Watch" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>emoji\watch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="CustomStyles" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>customstyles.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
   <data name="CustomColorsFilesname" xml:space="preserve">
     <value>CustomColors.xml</value>
     <comment>FILENAME</comment>
@@ -489,10 +486,6 @@
     <value>Mehr</value>
     <comment>Ribbon main button</comment>
   </data>
-  <data name="ribPageColorButton_Label" xml:space="preserve">
-    <value>Seitenfarbe einstellen</value>
-    <comment>Ribbon Custom Styles menu item, set page background color</comment>
-  </data>
   <data name="ribPasteRtfButton_Label" xml:space="preserve">
     <value>Rich Text einfügen</value>
     <comment>Ribbon OneMore menu item, paste rich text</comment>
@@ -602,29 +595,17 @@
     <comment>the version of the add-in</comment>
   </data>
   <data name="ChangePageColorDialog.Text" xml:space="preserve">
-    <value>Seitenfarbe ändern</value>
-    <comment>dialog title</comment>
+    <value>Seitenthema ändern
+    dialog title EDIT</value>
   </data>
   <data name="ChangePageColorDialog_cancelButton.Text" xml:space="preserve">
     <value>Stornieren</value>
     <comment>cancel button</comment>
   </data>
-  <data name="ChangePageColorDialog_customButton.Text" xml:space="preserve">
-    <value>Benutzerdefinierter Hintergrund ...</value>
-    <comment>button</comment>
-  </data>
-  <data name="ChangePageColorDialog_darkButton.Text" xml:space="preserve">
-    <value>Dunkler Hintergrund</value>
-    <comment>button</comment>
-  </data>
   <data name="ChangePageColorDialog_introLabel.Text" xml:space="preserve">
     <value>Laden Sie nach Auswahl einer Seitenfarbe einen der vordefinierten Stile oder passen Sie Ihre eigenen Stile an, damit der gesamte Inhalt genügend Kontrast aufweist, um sichtbar zu sein.</value>
     <comment>instructions</comment>
   </data>
-  <data name="ChangePageColorDialog_lightButton.Text" xml:space="preserve">
-    <value>Heller Hintergrund</value>
-    <comment>button</comment>
-  </data>
   <data name="ChangePageColorDialog_okButton.Text" xml:space="preserve">
     <value>OK</value>
     <comment>ok button</comment>
@@ -1274,8 +1255,8 @@
     <comment>ok button</comment>
   </data>
   <data name="PluginDialog_cmdLabel.Text" xml:space="preserve">
-    Befehl
-    label EDIT
+    <value>Befehl
+    label EDIT</value>
   </data>
   <data name="PluginDialog_updateRadio.Text" xml:space="preserve">
     <value>Aktuelle Seite aktualisieren</value>
@@ -1591,12 +1572,12 @@
     <comment>label</comment>
   </data>
   <data name="ExportDialog_formatBox.Text" xml:space="preserve">
-    HTML-Datei (*.htm)
+    <value>HTML-Datei (*.htm)
 PDF-Datei (*.pdf)
 Word-Datei (*.docx)
 XML-Datei (*.xml)
 OneNote-Datei (*.one)
-    combo box EDIT
+    combo box EDIT</value>
   </data>
   <data name="ExportDialog_formatLabel.Text" xml:space="preserve">
     <value>Format:</value>
@@ -1635,8 +1616,8 @@ OneNote-Datei (*.one)
     <comment>label</comment>
   </data>
   <data name="ImportDialog_introLabel.Text" xml:space="preserve">
-    Wählen Sie eine Word-, PowerPoint-, OneNote-, Markdown- oder XML-Datei aus
-    label EDIT
+    <value>Wählen Sie eine Word-, PowerPoint-, OneNote-, Markdown- oder XML-Datei aus
+    label EDIT</value>
   </data>
   <data name="ImportDialog_okButton.text" xml:space="preserve">
     <value>OK</value>
@@ -1675,8 +1656,8 @@ OneNote-Datei (*.one)
     <comment>group box</comment>
   </data>
   <data name="ImportDialog_OpenFileFilter" xml:space="preserve">
-    Alle Dateien (*.docx;*.pptx;*.md;*.one;*.xml)|*.docx;*.pptx;*.md;*.one;*.xml|Word-Dateien (*.doc 
-    openfiledialog filter EDIT
+    <value>Alle Dateien (*.docx;*.pptx;*.md;*.one;*.xml)|*.docx;*.pptx;*.md;*.one;*.xml|Word-Dateien (*.doc 
+    openfiledialog filter EDIT</value>
   </data>
   <data name="ImportDialog_OpenFileTitle" xml:space="preserve">
     <value>Wählen Sie die zu importierende Datei aus</value>
@@ -1768,8 +1749,8 @@ OneNote-Datei (*.one)
     <comment>intro</comment>
   </data>
   <data name="ContextMenuSheet_ribNoSpellCheckButton" xml:space="preserve">
-    ... Rechtschreibprüfung deaktivieren
-    option EDIT
+    <value>... Rechtschreibprüfung deaktivieren
+    option EDIT</value>
   </data>
   <data name="ContextMenuSheet_ribPasteRtfButton" xml:space="preserve">
     <value>Rich Text einfügen</value>
@@ -1860,8 +1841,8 @@ OneNote-Datei (*.one)
     <comment>menu</comment>
   </data>
   <data name="SettingsDialog_Restart" xml:space="preserve">
-    Für eine oder mehrere Änderungen muss OneNote neu gestartet werden. 
-    restart message EDIT
+    <value>Für eine oder mehrere Änderungen muss OneNote neu gestartet werden. 
+    restart message EDIT</value>
   </data>
   <data name="InsertCellsCommand_NoSelection" xml:space="preserve">
     <value>Wählen Sie eine oder mehrere Tabellenzellen aus</value>
@@ -2028,8 +2009,8 @@ OneNote-Datei (*.one)
     <comment>dialog title</comment>
   </data>
   <data name="StyleDialog_okButton.Text" xml:space="preserve">
-    <value>OK</value>
-    <comment>button</comment>
+    OK (Speichern)
+    button EDIT
   </data>
   <data name="StyleDialog_reorderButton.Text" xml:space="preserve">
     <value>Nachbestellen</value>
@@ -2172,8 +2153,8 @@ In diesem Abschnitt</value>
     <comment>index button</comment>
   </data>
   <data name="TaggedDialog_introLabel.Text" xml:space="preserve">
-    Geben Sie ein oder mehrere durch Kommas getrennte Tags ein. 
-    EDIT label
+    <value>Geben Sie ein oder mehrere durch Kommas getrennte Tags ein. 
+    EDIT label</value>
   </data>
   <data name="TaggedDialog_moveButton.Text" xml:space="preserve">
     <value>Bewegung</value>
@@ -2567,8 +2548,8 @@ ISO-code then comma then language name</comment>
     <comment>favorite</comment>
   </data>
   <data name="InsertSnippets_CouldNotLoad" xml:space="preserve">
-    Cloud-Snippet nicht von "{0}" laden
-    error message EDIT
+    <value>Cloud-Snippet nicht von "{0}" laden
+    error message EDIT</value>
   </data>
   <data name="ribCustomSnippetsMenu_Label" xml:space="preserve">
     <value>Meine benutzerdefinierten Schnipsel</value>
@@ -2591,16 +2572,16 @@ ISO-code then comma then language name</comment>
     <comment>tree node</comment>
   </data>
   <data name="SnippetsSheet_ConfirmDelete" xml:space="preserve">
-    Snippet "{0}" löschen
-    question EDIT
+    <value>Snippet "{0}" löschen
+    question EDIT</value>
   </data>
   <data name="SnippetsSheet_Text" xml:space="preserve">
     <value>Verwalten Sie meine benutzerdefinierten Snippets</value>
     <comment>SnippetsSheet</comment>
   </data>
   <data name="ribBoxButton_Label" xml:space="preserve">
-    Textfeld
-    ribbon EDIT
+    <value>Textfeld
+    ribbon EDIT</value>
   </data>
   <data name="ribBoxButton_Screentip" xml:space="preserve">
     <value>Fügen Sie eine Einzelzellentabelle ein und wickeln Sie den ausgewählten Text optional ein</value>
@@ -2919,8 +2900,8 @@ ISO-code then comma then language name</comment>
     <comment>ribbon item</comment>
   </data>
   <data name="ribCollapseContentButton_Label" xml:space="preserve">
-    Gliederungsübersicht
-    ribbon item EDIT
+    <value>Gliederungsübersicht
+    ribbon item EDIT</value>
   </data>
   <data name="ribTitlecaseButton_Label" xml:space="preserve">
     <value>Zum Titelfall</value>
@@ -2990,8 +2971,8 @@ ISO-code then comma then language name</comment>
     <comment>dialog title</comment>
   </data>
   <data name="ribLinkReferencesButton_Label" xml:space="preserve">
-    Verweise auf diese Seite verlinken
-    ribbon button EDIT
+    <value>Verweise auf diese Seite verlinken
+    ribbon button EDIT</value>
   </data>
   <data name="PluginDialog_timeoutLabel.Text" xml:space="preserve">
     <value>Tmeout</value>
@@ -3142,8 +3123,8 @@ ISO-code then comma then language name</comment>
     <comment>message box</comment>
   </data>
   <data name="BiLinkCommand_Marked" xml:space="preserve">
-    Als Anker markiert "{0}". 
-    message box EDIT
+    <value>Als Anker markiert "{0}". 
+    message box EDIT</value>
   </data>
   <data name="BiLinkCommand_NoAnchor" xml:space="preserve">
     <value>Startanker noch nicht markiert. </value>
@@ -3242,7 +3223,43 @@ ISO-code then comma then language name</comment>
     <comment>ribbon item</comment>
   </data>
   <data name="ImportWebDialog_imagesBox.Text" xml:space="preserve">
-    Als statische Bilder importieren
-    checkbox EDIT
+    <value>Als statische Bilder importieren
+    checkbox EDIT</value>
+  </data>
+  <data name="ChangePageColorDialog_colorLink.Text" xml:space="preserve">
+    <value>Wählen Sie eine benutzerdefinierte Farbe</value>
+    <comment>link</comment>
+  </data>
+  <data name="ribLoadStylesButton_Label" xml:space="preserve">
+    <value>Stile laden</value>
+    <comment>ribbon item</comment>
+  </data>
+  <data name="ChangePageColorDialog_applyBox" xml:space="preserve">
+    <value>Wenden Sie das Stilthema auf diese Seite an</value>
+    <comment>checkbox</comment>
+  </data>
+  <data name="ChangePageColorDialog_currentLabel" xml:space="preserve">
+    <value>Aktuelles Thema:</value>
+    <comment>label</comment>
+  </data>
+  <data name="ChangePageColorDialog_loadLink" xml:space="preserve">
+    <value>Laden Sie ein Stilthema</value>
+    <comment>hyperlink</comment>
+  </data>
+  <data name="ChangePageColorDialog_themeIntroLabel" xml:space="preserve">
+    <value>Laden Sie optional eines der vordefinierten Stilthemen oder passen Sie Ihr eigenes Thema an, damit alle Inhalte genug Kontrast haben, um sichtbar zu sein.</value>
+    <comment>label</comment>
+  </data>
+  <data name="ribPageColorButton_Label" xml:space="preserve">
+    <value>Seitenthema ändern</value>
+    <comment>Ribbon Custom Styles menu item, set page background color</comment>
+  </data>
+  <data name="StyleDialog_ThemeText" xml:space="preserve">
+    <value>{0} Stile</value>
+    <comment>dialog title</comment>
+  </data>
+  <data name="ChangePageColorDialog_Contrast" xml:space="preserve">
+    <value>Farbe und Thema haben möglicherweise nicht genug Kontrast</value>
+    <comment>label</comment>
   </data>
 </root>
\ No newline at end of file
diff --git a/OneMore/Properties/Resources.es-ES.resx b/OneMore/Properties/Resources.es-ES.resx
index 6dee341846..194d6eea81 100644
--- a/OneMore/Properties/Resources.es-ES.resx
+++ b/OneMore/Properties/Resources.es-ES.resx
@@ -222,9 +222,6 @@
   <data name="Watch" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>emoji\watch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="CustomStyles" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>customstyles.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
   <data name="CustomColorsFilesname" xml:space="preserve">
     <value>CustomColors.xml</value>
     <comment>FILENAME</comment>
@@ -490,8 +487,8 @@
     <comment>Ribbon main button</comment>
   </data>
   <data name="ribPageColorButton_Label" xml:space="preserve">
-    <value>Establecer color de página</value>
-    <comment>Ribbon Custom Styles menu item, set page background color</comment>
+    Cambiar tema de página
+    Ribbon Custom Styles menu item, set page background color EDIT
   </data>
   <data name="ribPasteRtfButton_Label" xml:space="preserve">
     <value>Pegar texto enriquecido</value>
@@ -605,29 +602,17 @@ OneNote se cerrará automáticamente</value>
     <comment>the version of the add-in</comment>
   </data>
   <data name="ChangePageColorDialog.Text" xml:space="preserve">
-    <value>Cambiar el color de la página</value>
-    <comment>dialog title</comment>
+    Cambiar tema de página
+    dialog title EDIT
   </data>
   <data name="ChangePageColorDialog_cancelButton.Text" xml:space="preserve">
     <value>Cancelar</value>
     <comment>cancel button</comment>
   </data>
-  <data name="ChangePageColorDialog_customButton.Text" xml:space="preserve">
-    <value>Fondo personalizado...</value>
-    <comment>button</comment>
-  </data>
-  <data name="ChangePageColorDialog_darkButton.Text" xml:space="preserve">
-    <value>Fondo oscuro</value>
-    <comment>button</comment>
-  </data>
   <data name="ChangePageColorDialog_introLabel.Text" xml:space="preserve">
     <value>Después de elegir un color de página, cargue uno de los estilos predefinidos o personalice sus propios estilos para que todo el contenido tenga suficiente contraste para ser visible.</value>
     <comment>instructions</comment>
   </data>
-  <data name="ChangePageColorDialog_lightButton.Text" xml:space="preserve">
-    <value>Fondo claro</value>
-    <comment>button</comment>
-  </data>
   <data name="ChangePageColorDialog_okButton.Text" xml:space="preserve">
     <value>Okay</value>
     <comment>ok button</comment>
@@ -2042,8 +2027,8 @@ Archivo de OneNote (*.one)
     <comment>dialog title</comment>
   </data>
   <data name="StyleDialog_okButton.Text" xml:space="preserve">
-    <value>Okay</value>
-    <comment>button</comment>
+    Aceptar (guardar)
+    button EDIT
   </data>
   <data name="StyleDialog_reorderButton.Text" xml:space="preserve">
     <value>Reordenar</value>
@@ -3259,4 +3244,36 @@ ISO-code then comma then language name</comment>
     Importar como imágenes estáticas
     checkbox EDIT
   </data>
+  <data name="ChangePageColorDialog_colorLink.Text" xml:space="preserve">
+    <value>Elige un color personalizado</value>
+    <comment>link</comment>
+  </data>
+  <data name="ribLoadStylesButton_Label" xml:space="preserve">
+    <value>Cargar estilos</value>
+    <comment>ribbon item</comment>
+  </data>
+  <data name="ChangePageColorDialog_applyBox" xml:space="preserve">
+    <value>Aplicar tema de estilo a esta página</value>
+    <comment>checkbox</comment>
+  </data>
+  <data name="ChangePageColorDialog_currentLabel" xml:space="preserve">
+    <value>Tema actual:</value>
+    <comment>label</comment>
+  </data>
+  <data name="ChangePageColorDialog_loadLink" xml:space="preserve">
+    <value>Cargar un tema de estilo</value>
+    <comment>hyperlink</comment>
+  </data>
+  <data name="ChangePageColorDialog_themeIntroLabel" xml:space="preserve">
+    <value>Opcionalmente, cargue uno de los temas de estilo predefinidos o personalice su propio tema para que todo el contenido tenga suficiente contraste para ser visible.</value>
+    <comment>label</comment>
+  </data>
+  <data name="StyleDialog_ThemeText" xml:space="preserve">
+    <value>{0} Estilos</value>
+    <comment>dialog title</comment>
+  </data>
+  <data name="ChangePageColorDialog_Contrast" xml:space="preserve">
+    <value>Es posible que el color y el tema no tengan suficiente contraste</value>
+    <comment>label</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/OneMore/Properties/Resources.fr-FR.resx b/OneMore/Properties/Resources.fr-FR.resx
index f7badcb855..7eb5df1c6c 100644
--- a/OneMore/Properties/Resources.fr-FR.resx
+++ b/OneMore/Properties/Resources.fr-FR.resx
@@ -136,12 +136,12 @@
     <value>Un de plus</value>
   </data>
   <data name="ribNoSpellCheckButton_Label" xml:space="preserve">
-    Désactiver la vérification orthographique
-    Ribbon OneMore menu item, no spell check on this page EDIT
+    <value>Désactiver la vérification orthographique
+    Ribbon OneMore menu item, no spell check on this page EDIT</value>
   </data>
   <data name="ribNoSpellCheckButton_Screentip" xml:space="preserve">
-    Désactiver la vérification orthographique pour la page entière (F4)
-    Ribbon OneMore menu item, no spell check on this page EDIT
+    <value>Désactiver la vérification orthographique pour la page entière (F4)
+    Ribbon OneMore menu item, no spell check on this page EDIT</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="Ribbon" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -222,9 +222,6 @@
   <data name="Watch" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>emoji\watch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="CustomStyles" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>customstyles.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
   <data name="CustomColorsFilesname" xml:space="preserve">
     <value>CustomColors.xml</value>
     <comment>FILENAME</comment>
@@ -489,10 +486,6 @@
     <value>Plus</value>
     <comment>Ribbon main button</comment>
   </data>
-  <data name="ribPageColorButton_Label" xml:space="preserve">
-    <value>Définir la couleur de la page</value>
-    <comment>Ribbon Custom Styles menu item, set page background color</comment>
-  </data>
   <data name="ribPasteRtfButton_Label" xml:space="preserve">
     <value>Coller du texte enrichi</value>
     <comment>Ribbon OneMore menu item, paste rich text</comment>
@@ -602,29 +595,17 @@
     <comment>the version of the add-in</comment>
   </data>
   <data name="ChangePageColorDialog.Text" xml:space="preserve">
-    <value>Changer la couleur de la page</value>
-    <comment>dialog title</comment>
+    <value>Changer le thème de la page
+    dialog title EDIT</value>
   </data>
   <data name="ChangePageColorDialog_cancelButton.Text" xml:space="preserve">
     <value>Annuler</value>
     <comment>cancel button</comment>
   </data>
-  <data name="ChangePageColorDialog_customButton.Text" xml:space="preserve">
-    <value>Arrière-plan personnalisé ...</value>
-    <comment>button</comment>
-  </data>
-  <data name="ChangePageColorDialog_darkButton.Text" xml:space="preserve">
-    <value>Fond sombre</value>
-    <comment>button</comment>
-  </data>
   <data name="ChangePageColorDialog_introLabel.Text" xml:space="preserve">
     <value>Après avoir choisi une couleur de page, chargez l'un des styles prédéfinis ou personnalisez vos propres styles afin que tout le contenu ait un contraste suffisant pour être visible.</value>
     <comment>instructions</comment>
   </data>
-  <data name="ChangePageColorDialog_lightButton.Text" xml:space="preserve">
-    <value>Fond clair</value>
-    <comment>button</comment>
-  </data>
   <data name="ChangePageColorDialog_okButton.Text" xml:space="preserve">
     <value>D'accord</value>
     <comment>ok button</comment>
@@ -1284,8 +1265,8 @@ Pourcentage</value>
     <comment>ok button</comment>
   </data>
   <data name="PluginDialog_cmdLabel.Text" xml:space="preserve">
-    Commander
-    label EDIT
+    <value>Commander
+    label EDIT</value>
   </data>
   <data name="PluginDialog_updateRadio.Text" xml:space="preserve">
     <value>Mettre à jour la page actuelle</value>
@@ -1616,12 +1597,12 @@ Symboles: PI, E</value>
     <comment>label</comment>
   </data>
   <data name="ExportDialog_formatBox.Text" xml:space="preserve">
-    Fichier HTML (*.htm)
+    <value>Fichier HTML (*.htm)
 Fichier PDF (*.pdf)
 Fichier Word (*.docx)
 Fichier XML (*.xml)
 Fichier OneNote (*.one)
-    combo box EDIT
+    combo box EDIT</value>
   </data>
   <data name="ExportDialog_formatLabel.Text" xml:space="preserve">
     <value>Format:</value>
@@ -1660,8 +1641,8 @@ Fichier OneNote (*.one)
     <comment>label</comment>
   </data>
   <data name="ImportDialog_introLabel.Text" xml:space="preserve">
-    Sélectionnez un fichier Word, PowerPoint, OneNote, Markdown ou XML
-    label EDIT
+    <value>Sélectionnez un fichier Word, PowerPoint, OneNote, Markdown ou XML
+    label EDIT</value>
   </data>
   <data name="ImportDialog_okButton.text" xml:space="preserve">
     <value>D'accord</value>
@@ -1700,8 +1681,8 @@ Fichier OneNote (*.one)
     <comment>group box</comment>
   </data>
   <data name="ImportDialog_OpenFileFilter" xml:space="preserve">
-    Tous les fichiers (*.docx;*.pptx;*.md;*.one;*.xml)|*.docx;*.pptx;*.md;*.one;*.xml|Fichiers Word (*.doc 
-    openfiledialog filter EDIT
+    <value>Tous les fichiers (*.docx;*.pptx;*.md;*.one;*.xml)|*.docx;*.pptx;*.md;*.one;*.xml|Fichiers Word (*.doc 
+    openfiledialog filter EDIT</value>
   </data>
   <data name="ImportDialog_OpenFileTitle" xml:space="preserve">
     <value>Choisissez le fichier à importer</value>
@@ -1793,8 +1774,8 @@ Fichier OneNote (*.one)
     <comment>intro</comment>
   </data>
   <data name="ContextMenuSheet_ribNoSpellCheckButton" xml:space="preserve">
-    ... Désactiver la vérification orthographique
-    option EDIT
+    <value>... Désactiver la vérification orthographique
+    option EDIT</value>
   </data>
   <data name="ContextMenuSheet_ribPasteRtfButton" xml:space="preserve">
     <value>Coller du texte enrichi</value>
@@ -1885,8 +1866,8 @@ Fichier OneNote (*.one)
     <comment>menu</comment>
   </data>
   <data name="SettingsDialog_Restart" xml:space="preserve">
-    Une ou plusieurs modifications nécessitent le redémarrage de OneNote. 
-    restart message EDIT
+    <value>Une ou plusieurs modifications nécessitent le redémarrage de OneNote. 
+    restart message EDIT</value>
   </data>
   <data name="InsertCellsCommand_NoSelection" xml:space="preserve">
     <value>Sélectionnez une ou plusieurs cellules de tableau</value>
@@ -2037,8 +2018,8 @@ Fichier OneNote (*.one)
     <comment>dialog title</comment>
   </data>
   <data name="StyleDialog_okButton.Text" xml:space="preserve">
-    <value>D'accord</value>
-    <comment>button</comment>
+    OK (Enregistrer)
+    button EDIT
   </data>
   <data name="StyleDialog_reorderButton.Text" xml:space="preserve">
     <value>Réorganiser</value>
@@ -2181,8 +2162,8 @@ Dans cette section</value>
     <comment>index button</comment>
   </data>
   <data name="TaggedDialog_introLabel.Text" xml:space="preserve">
-    Saisissez une ou plusieurs balises séparées par des virgules. 
-    EDIT label
+    <value>Saisissez une ou plusieurs balises séparées par des virgules. 
+    EDIT label</value>
   </data>
   <data name="TaggedDialog_moveButton.Text" xml:space="preserve">
     <value>Bouge toi</value>
@@ -2576,8 +2557,8 @@ ISO-code then comma then language name</comment>
     <comment>favorite</comment>
   </data>
   <data name="InsertSnippets_CouldNotLoad" xml:space="preserve">
-    Cloud ne charge pas l'extrait de "{0}"
-    error message EDIT
+    <value>Cloud ne charge pas l'extrait de "{0}"
+    error message EDIT</value>
   </data>
   <data name="ribCustomSnippetsMenu_Label" xml:space="preserve">
     <value>Mes extraits personnalisés</value>
@@ -2600,16 +2581,16 @@ ISO-code then comma then language name</comment>
     <comment>tree node</comment>
   </data>
   <data name="SnippetsSheet_ConfirmDelete" xml:space="preserve">
-    Supprimer l'extrait de code "{0}"
-    question EDIT
+    <value>Supprimer l'extrait de code "{0}"
+    question EDIT</value>
   </data>
   <data name="SnippetsSheet_Text" xml:space="preserve">
     <value>Gérer mes extraits personnalisés</value>
     <comment>SnippetsSheet</comment>
   </data>
   <data name="ribBoxButton_Label" xml:space="preserve">
-    Zone de texte
-    ribbon EDIT
+    <value>Zone de texte
+    ribbon EDIT</value>
   </data>
   <data name="ribBoxButton_Screentip" xml:space="preserve">
     <value>Insérer un tableau à une seule cellule, en enveloppant éventuellement le texte sélectionné</value>
@@ -2928,8 +2909,8 @@ ISO-code then comma then language name</comment>
     <comment>ribbon item</comment>
   </data>
   <data name="ribCollapseContentButton_Label" xml:space="preserve">
-    Réduire le contour
-    ribbon item EDIT
+    <value>Réduire le contour
+    ribbon item EDIT</value>
   </data>
   <data name="ribTitlecaseButton_Label" xml:space="preserve">
     <value>À la casse du titre</value>
@@ -2999,8 +2980,8 @@ ISO-code then comma then language name</comment>
     <comment>dialog title</comment>
   </data>
   <data name="ribLinkReferencesButton_Label" xml:space="preserve">
-    Lien Références à cette page
-    ribbon button EDIT
+    <value>Lien Références à cette page
+    ribbon button EDIT</value>
   </data>
   <data name="PluginDialog_timeoutLabel.Text" xml:space="preserve">
     <value>Temps d'attente</value>
@@ -3151,8 +3132,8 @@ ISO-code then comma then language name</comment>
     <comment>message box</comment>
   </data>
   <data name="BiLinkCommand_Marked" xml:space="preserve">
-    Marqué "{0}" comme ancre. 
-    message box EDIT
+    <value>Marqué "{0}" comme ancre. 
+    message box EDIT</value>
   </data>
   <data name="BiLinkCommand_NoAnchor" xml:space="preserve">
     <value>Ancre de départ pas encore marquée. </value>
@@ -3251,7 +3232,43 @@ ISO-code then comma then language name</comment>
     <comment>ribbon item</comment>
   </data>
   <data name="ImportWebDialog_imagesBox.Text" xml:space="preserve">
-    Importer en tant qu'images statiques
-    checkbox EDIT
+    <value>Importer en tant qu'images statiques
+    checkbox EDIT</value>
+  </data>
+  <data name="ChangePageColorDialog_colorLink.Text" xml:space="preserve">
+    <value>Choisissez une couleur personnalisée</value>
+    <comment>link</comment>
+  </data>
+  <data name="ribLoadStylesButton_Label" xml:space="preserve">
+    <value>Styles de charge</value>
+    <comment>ribbon item</comment>
+  </data>
+  <data name="ChangePageColorDialog_applyBox" xml:space="preserve">
+    <value>Appliquer le thème de style à cette page</value>
+    <comment>checkbox</comment>
+  </data>
+  <data name="ChangePageColorDialog_currentLabel" xml:space="preserve">
+    <value>Thème actuel :</value>
+    <comment>label</comment>
+  </data>
+  <data name="ChangePageColorDialog_loadLink" xml:space="preserve">
+    <value>Charger un thème de style</value>
+    <comment>hyperlink</comment>
+  </data>
+  <data name="ChangePageColorDialog_themeIntroLabel" xml:space="preserve">
+    <value>En option, chargez l'un des thèmes de style prédéfinis ou personnalisez votre propre thème afin que tout le contenu ait suffisamment de contraste pour être visible.</value>
+    <comment>label</comment>
+  </data>
+  <data name="ribPageColorButton_Label" xml:space="preserve">
+    <value>Changer le thème de la page</value>
+    <comment>Ribbon Custom Styles menu item, set page background color</comment>
+  </data>
+  <data name="StyleDialog_ThemeText" xml:space="preserve">
+    <value>{0} Styles</value>
+    <comment>dialog title</comment>
+  </data>
+  <data name="ChangePageColorDialog_Contrast" xml:space="preserve">
+    <value>La couleur et le thème peuvent ne pas avoir assez de contraste</value>
+    <comment>label</comment>
   </data>
 </root>
\ No newline at end of file
diff --git a/OneMore/Properties/Resources.nl-NL.resx b/OneMore/Properties/Resources.nl-NL.resx
index ddc0cd3047..adc4af08a0 100644
--- a/OneMore/Properties/Resources.nl-NL.resx
+++ b/OneMore/Properties/Resources.nl-NL.resx
@@ -137,12 +137,12 @@
     <value>Nog een</value>
   </data>
   <data name="ribNoSpellCheckButton_Label" xml:space="preserve">
-    Schakel de spellingcontrole uit
-    Ribbon OneMore menu item, no spell check on this page EDIT
+    <value>Schakel de spellingcontrole uit
+    Ribbon OneMore menu item, no spell check on this page EDIT</value>
   </data>
   <data name="ribNoSpellCheckButton_Screentip" xml:space="preserve">
-    Schakel de spellingcontrole uit voor de hele pagina (F4)
-    Ribbon OneMore menu item, no spell check on this page EDIT
+    <value>Schakel de spellingcontrole uit voor de hele pagina (F4)
+    Ribbon OneMore menu item, no spell check on this page EDIT</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="Ribbon" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -223,9 +223,6 @@
   <data name="Watch" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>emoji\watch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="CustomStyles" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>customstyles.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
   <data name="CustomColorsFilesname" xml:space="preserve">
     <value>CustomColors.xml</value>
     <comment>SKIP, filename</comment>
@@ -490,10 +487,6 @@
     <value>Meer</value>
     <comment>Ribbon main button</comment>
   </data>
-  <data name="ribPageColorButton_Label" xml:space="preserve">
-    <value>Paginakleur instellen</value>
-    <comment>Ribbon Custom Styles menu item, set page background color</comment>
-  </data>
   <data name="ribPasteRtfButton_Label" xml:space="preserve">
     <value>Plak Rich Text</value>
     <comment>Ribbon OneMore menu item, paste rich text</comment>
@@ -606,29 +599,17 @@ OneNote wordt automatisch gesloten</value>
     <comment>the version of the add-in</comment>
   </data>
   <data name="ChangePageColorDialog.Text" xml:space="preserve">
-    <value>Wijzig de paginakleur</value>
-    <comment>dialog title</comment>
+    <value>Paginathema wijzigen
+    dialog title EDIT</value>
   </data>
   <data name="ChangePageColorDialog_cancelButton.Text" xml:space="preserve">
     <value>annuleren</value>
     <comment>cancel button</comment>
   </data>
-  <data name="ChangePageColorDialog_customButton.Text" xml:space="preserve">
-    <value>Eigen achtergrond...</value>
-    <comment>button</comment>
-  </data>
-  <data name="ChangePageColorDialog_darkButton.Text" xml:space="preserve">
-    <value>Donkere achtergrond</value>
-    <comment>button</comment>
-  </data>
   <data name="ChangePageColorDialog_introLabel.Text" xml:space="preserve">
     <value>Nadat u een paginakleur heeft gekozen, laadt u een van de voorgedefinieerde stijlen of past u uw eigen stijlen aan, zodat alle inhoud voldoende contrast heeft om zichtbaar te zijn.</value>
     <comment>instructions</comment>
   </data>
-  <data name="ChangePageColorDialog_lightButton.Text" xml:space="preserve">
-    <value>Lichte achtergrond</value>
-    <comment>button</comment>
-  </data>
   <data name="ChangePageColorDialog_okButton.Text" xml:space="preserve">
     <value>OK</value>
     <comment>ok button</comment>
@@ -1292,8 +1273,8 @@ Probeer het later nog eens</value>
     <comment>ok button</comment>
   </data>
   <data name="PluginDialog_cmdLabel.Text" xml:space="preserve">
-    Opdracht
-    label EDIT
+    <value>Opdracht
+    label EDIT</value>
   </data>
   <data name="PluginDialog_updateRadio.Text" xml:space="preserve">
     <value>Update huidige pagina</value>
@@ -1622,12 +1603,12 @@ Symbolen: PI, E</value>
     <comment>label</comment>
   </data>
   <data name="ExportDialog_formatBox.Text" xml:space="preserve">
-    HTML-bestand (*.htm)
+    <value>HTML-bestand (*.htm)
 PDF-bestand (*.pdf)
 Word-bestand (*.docx)
 XML-bestand (*.xml)
 OneNote-bestand (*.one)
-    combo box EDIT
+    combo box EDIT</value>
   </data>
   <data name="ExportDialog_formatLabel.Text" xml:space="preserve">
     <value>Formaat:</value>
@@ -1666,8 +1647,8 @@ OneNote-bestand (*.one)
     <comment>label</comment>
   </data>
   <data name="ImportDialog_introLabel.Text" xml:space="preserve">
-    Selecteer een Word-, PowerPoint-, OneNote-, Markdown- of XML-bestand
-    label EDIT
+    <value>Selecteer een Word-, PowerPoint-, OneNote-, Markdown- of XML-bestand
+    label EDIT</value>
   </data>
   <data name="ImportDialog_okButton.text" xml:space="preserve">
     <value>OK</value>
@@ -1706,8 +1687,8 @@ OneNote-bestand (*.one)
     <comment>group box</comment>
   </data>
   <data name="ImportDialog_OpenFileFilter" xml:space="preserve">
-    Alle bestanden (*.docx;*.pptx;*.md;*.one;*.xml)|*.docx;*.pptx;*.md;*.one;*.xml|Word-bestanden (*.doc 
-    openfiledialog filter EDIT
+    <value>Alle bestanden (*.docx;*.pptx;*.md;*.one;*.xml)|*.docx;*.pptx;*.md;*.one;*.xml|Word-bestanden (*.doc 
+    openfiledialog filter EDIT</value>
   </data>
   <data name="ImportDialog_OpenFileTitle" xml:space="preserve">
     <value>Kies een bestand om te importeren</value>
@@ -1799,8 +1780,8 @@ OneNote-bestand (*.one)
     <comment>intro</comment>
   </data>
   <data name="ContextMenuSheet_ribNoSpellCheckButton" xml:space="preserve">
-    ... Schakel de spellingcontrole uit
-    option EDIT
+    <value>... Schakel de spellingcontrole uit
+    option EDIT</value>
   </data>
   <data name="ContextMenuSheet_ribPasteRtfButton" xml:space="preserve">
     <value>Plak Rich Text</value>
@@ -1891,8 +1872,8 @@ OneNote-bestand (*.one)
     <comment>menu</comment>
   </data>
   <data name="SettingsDialog_Restart" xml:space="preserve">
-    Een of meer wijzigingen vereisen dat OneNote opnieuw wordt gestart. 
-    restart message EDIT
+    <value>Een of meer wijzigingen vereisen dat OneNote opnieuw wordt gestart. 
+    restart message EDIT</value>
   </data>
   <data name="InsertCellsCommand_NoSelection" xml:space="preserve">
     <value>Selecteer een of meer tabelcellen</value>
@@ -2043,8 +2024,8 @@ OneNote-bestand (*.one)
     <comment>dialog title</comment>
   </data>
   <data name="StyleDialog_okButton.Text" xml:space="preserve">
-    <value>OK</value>
-    <comment>button</comment>
+    OK (Opslaan)
+    button EDIT
   </data>
   <data name="StyleDialog_reorderButton.Text" xml:space="preserve">
     <value>Opnieuw ordenen</value>
@@ -2187,8 +2168,8 @@ In deze sectie</value>
     <comment>index button</comment>
   </data>
   <data name="TaggedDialog_introLabel.Text" xml:space="preserve">
-    Voer een of meer tags in, gescheiden door komma's. 
-    EDIT label
+    <value>Voer een of meer tags in, gescheiden door komma's. 
+    EDIT label</value>
   </data>
   <data name="TaggedDialog_moveButton.Text" xml:space="preserve">
     <value>Actie</value>
@@ -2582,8 +2563,8 @@ ISO-code then comma then language name</comment>
     <comment>favorite</comment>
   </data>
   <data name="InsertSnippets_CouldNotLoad" xml:space="preserve">
-    Cloud laadt fragment van "{0}" niet
-    error message EDIT
+    <value>Cloud laadt fragment van "{0}" niet
+    error message EDIT</value>
   </data>
   <data name="ribCustomSnippetsMenu_Label" xml:space="preserve">
     <value>Mijn aangepaste fragmenten</value>
@@ -2606,16 +2587,16 @@ ISO-code then comma then language name</comment>
     <comment>tree node</comment>
   </data>
   <data name="SnippetsSheet_ConfirmDelete" xml:space="preserve">
-    Fragment "{0}" verwijderen
-    question EDIT
+    <value>Fragment "{0}" verwijderen
+    question EDIT</value>
   </data>
   <data name="SnippetsSheet_Text" xml:space="preserve">
     <value>Beheer mijn aangepaste fragmenten</value>
     <comment>SnippetsSheet</comment>
   </data>
   <data name="ribBoxButton_Label" xml:space="preserve">
-    Tekstvak
-    ribbon EDIT
+    <value>Tekstvak
+    ribbon EDIT</value>
   </data>
   <data name="ribBoxButton_Screentip" xml:space="preserve">
     <value>Voeg een tabel met één cel in, eventueel met omloop van geselecteerde tekst</value>
@@ -2934,8 +2915,8 @@ ISO-code then comma then language name</comment>
     <comment>ribbon item</comment>
   </data>
   <data name="ribCollapseContentButton_Label" xml:space="preserve">
-    Overzicht samenvouwen
-    ribbon item EDIT
+    <value>Overzicht samenvouwen
+    ribbon item EDIT</value>
   </data>
   <data name="ribTitlecaseButton_Label" xml:space="preserve">
     <value>Om Titel Case</value>
@@ -3005,8 +2986,8 @@ ISO-code then comma then language name</comment>
     <comment>dialog title</comment>
   </data>
   <data name="ribLinkReferencesButton_Label" xml:space="preserve">
-    Link Verwijzingen naar deze pagina
-    ribbon button EDIT
+    <value>Link Verwijzingen naar deze pagina
+    ribbon button EDIT</value>
   </data>
   <data name="PluginDialog_timeoutLabel.Text" xml:space="preserve">
     <value>Tmeout</value>
@@ -3157,8 +3138,8 @@ ISO-code then comma then language name</comment>
     <comment>message box</comment>
   </data>
   <data name="BiLinkCommand_Marked" xml:space="preserve">
-    Gemarkeerd met "{0}" als het anker. 
-    message box EDIT
+    <value>Gemarkeerd met "{0}" als het anker. 
+    message box EDIT</value>
   </data>
   <data name="BiLinkCommand_NoAnchor" xml:space="preserve">
     <value>Startanker nog niet gemarkeerd. </value>
@@ -3257,7 +3238,43 @@ ISO-code then comma then language name</comment>
     <comment>ribbon item</comment>
   </data>
   <data name="ImportWebDialog_imagesBox.Text" xml:space="preserve">
-    Importeren als statische afbeeldingen
-    checkbox EDIT
+    <value>Importeren als statische afbeeldingen
+    checkbox EDIT</value>
+  </data>
+  <data name="ChangePageColorDialog_colorLink.Text" xml:space="preserve">
+    <value>Kies een aangepaste kleur</value>
+    <comment>link</comment>
+  </data>
+  <data name="ribLoadStylesButton_Label" xml:space="preserve">
+    <value>Laad stijlen</value>
+    <comment>ribbon item</comment>
+  </data>
+  <data name="ChangePageColorDialog_applyBox" xml:space="preserve">
+    <value>Stijlthema toepassen op deze pagina</value>
+    <comment>checkbox</comment>
+  </data>
+  <data name="ChangePageColorDialog_currentLabel" xml:space="preserve">
+    <value>Huidig ​​thema:</value>
+    <comment>label</comment>
+  </data>
+  <data name="ChangePageColorDialog_loadLink" xml:space="preserve">
+    <value>Een stijlthema laden</value>
+    <comment>hyperlink</comment>
+  </data>
+  <data name="ChangePageColorDialog_themeIntroLabel" xml:space="preserve">
+    <value>Laad optioneel een van de vooraf gedefinieerde stijlthema's of pas uw eigen thema aan zodat alle inhoud voldoende contrast heeft om zichtbaar te zijn.</value>
+    <comment>label</comment>
+  </data>
+  <data name="ribPageColorButton_Label" xml:space="preserve">
+    <value>Paginathema wijzigen</value>
+    <comment>Ribbon Custom Styles menu item, set page background color</comment>
+  </data>
+  <data name="StyleDialog_ThemeText" xml:space="preserve">
+    <value>{0} Stijlen</value>
+    <comment>dialog title</comment>
+  </data>
+  <data name="ChangePageColorDialog_Contrast" xml:space="preserve">
+    <value>Kleur en thema hebben mogelijk niet genoeg contrast</value>
+    <comment>label</comment>
   </data>
 </root>
\ No newline at end of file
diff --git a/OneMore/Properties/Resources.pt-BR.resx b/OneMore/Properties/Resources.pt-BR.resx
index c0909dc59c..00fa2da509 100644
--- a/OneMore/Properties/Resources.pt-BR.resx
+++ b/OneMore/Properties/Resources.pt-BR.resx
@@ -223,9 +223,6 @@
   <data name="Watch" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>emoji\watch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="CustomStyles" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>customstyles.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
   <data name="CustomColorsFilesname" xml:space="preserve">
     <value>CustomColors.xml</value>
     <comment>SKIP, filename</comment>
@@ -491,8 +488,8 @@
     <comment>Ribbon main button</comment>
   </data>
   <data name="ribPageColorButton_Label" xml:space="preserve">
-    <value>Definir cor da página</value>
-    <comment>Ribbon Custom Styles menu item, set page background color</comment>
+    Alterar o tema da página
+    Ribbon Custom Styles menu item, set page background color EDIT
   </data>
   <data name="ribPasteRtfButton_Label" xml:space="preserve">
     <value>Colar Rich Text</value>
@@ -606,29 +603,17 @@ OneNote fechará automaticamente</value>
     <comment>the version of the add-in</comment>
   </data>
   <data name="ChangePageColorDialog.Text" xml:space="preserve">
-    <value>Mudar a cor da página</value>
-    <comment>dialog title</comment>
+    Alterar o tema da página
+    dialog title EDIT
   </data>
   <data name="ChangePageColorDialog_cancelButton.Text" xml:space="preserve">
     <value>Cancelar</value>
     <comment>cancel button</comment>
   </data>
-  <data name="ChangePageColorDialog_customButton.Text" xml:space="preserve">
-    <value>Plano de fundo personalizado ...</value>
-    <comment>button</comment>
-  </data>
-  <data name="ChangePageColorDialog_darkButton.Text" xml:space="preserve">
-    <value>Fundo escuro</value>
-    <comment>button</comment>
-  </data>
   <data name="ChangePageColorDialog_introLabel.Text" xml:space="preserve">
     <value>Depois de escolher uma cor de página, carregue um dos estilos predefinidos ou personalize seus próprios estilos para que todo o conteúdo tenha contraste suficiente para ser visível.</value>
     <comment>instructions</comment>
   </data>
-  <data name="ChangePageColorDialog_lightButton.Text" xml:space="preserve">
-    <value>Fundo claro</value>
-    <comment>button</comment>
-  </data>
   <data name="ChangePageColorDialog_okButton.Text" xml:space="preserve">
     <value>Está bem</value>
     <comment>ok button</comment>
@@ -2043,8 +2028,8 @@ Arquivo OneNote (*.one)
     <comment>dialog title</comment>
   </data>
   <data name="StyleDialog_okButton.Text" xml:space="preserve">
-    <value>Está bem</value>
-    <comment>button</comment>
+    OK (Salvar)
+    button EDIT
   </data>
   <data name="StyleDialog_reorderButton.Text" xml:space="preserve">
     <value>Reordenar</value>
@@ -3260,4 +3245,36 @@ ISO-code then comma then language name</comment>
     Importar como imagens estáticas
     checkbox EDIT
   </data>
+  <data name="ChangePageColorDialog_colorLink.Text" xml:space="preserve">
+    <value>Escolha uma cor personalizada</value>
+    <comment>link</comment>
+  </data>
+  <data name="ribLoadStylesButton_Label" xml:space="preserve">
+    <value>Estilos de carga</value>
+    <comment>ribbon item</comment>
+  </data>
+  <data name="ChangePageColorDialog_applyBox" xml:space="preserve">
+    <value>Aplicar tema de estilo a esta página</value>
+    <comment>checkbox</comment>
+  </data>
+  <data name="ChangePageColorDialog_currentLabel" xml:space="preserve">
+    <value>Tema atual:</value>
+    <comment>label</comment>
+  </data>
+  <data name="ChangePageColorDialog_loadLink" xml:space="preserve">
+    <value>Carregar um tema de estilo</value>
+    <comment>hyperlink</comment>
+  </data>
+  <data name="ChangePageColorDialog_themeIntroLabel" xml:space="preserve">
+    <value>Opcionalmente, carregue um dos temas de estilo predefinidos ou personalize seu próprio tema para que todo o conteúdo tenha contraste suficiente para ser visível.</value>
+    <comment>label</comment>
+  </data>
+  <data name="StyleDialog_ThemeText" xml:space="preserve">
+    <value>{0} Estilos</value>
+    <comment>dialog title</comment>
+  </data>
+  <data name="ChangePageColorDialog_Contrast" xml:space="preserve">
+    <value>A cor e o tema podem não ter contraste suficiente</value>
+    <comment>label</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/OneMore/Properties/Resources.resx b/OneMore/Properties/Resources.resx
index c20309351c..3ac8d3a004 100644
--- a/OneMore/Properties/Resources.resx
+++ b/OneMore/Properties/Resources.resx
@@ -223,9 +223,6 @@
   <data name="Watch" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>emoji\watch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="CustomStyles" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>customstyles.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
   <data name="CustomColorsFilesname" xml:space="preserve">
     <value>CustomColors.xml</value>
     <comment>SKIP, filename</comment>
@@ -495,7 +492,7 @@
     <comment>Ribbon main button</comment>
   </data>
   <data name="ribPageColorButton_Label" xml:space="preserve">
-    <value>Set Page Color</value>
+    <value>Change Page Theme</value>
     <comment>Ribbon Custom Styles menu item, set page background color</comment>
   </data>
   <data name="ribPasteRtfButton_Label" xml:space="preserve">
@@ -612,28 +609,20 @@ OneNote will close automatically</value>
     <comment>the version of the add-in</comment>
   </data>
   <data name="ChangePageColorDialog.Text" xml:space="preserve">
-    <value>Change Page Color</value>
+    <value>Change Page Theme</value>
     <comment>dialog title</comment>
   </data>
   <data name="ChangePageColorDialog_cancelButton.Text" xml:space="preserve">
     <value>Cancel</value>
     <comment>cancel button</comment>
   </data>
-  <data name="ChangePageColorDialog_customButton.Text" xml:space="preserve">
-    <value>Custom background...</value>
-    <comment>button</comment>
-  </data>
-  <data name="ChangePageColorDialog_darkButton.Text" xml:space="preserve">
-    <value>Dark background</value>
-    <comment>button</comment>
-  </data>
   <data name="ChangePageColorDialog_introLabel.Text" xml:space="preserve">
     <value>After choosing a page color, load one of the predefined styles or customize your own styles so all content has enough contrast to be visible.</value>
     <comment>instructions</comment>
   </data>
-  <data name="ChangePageColorDialog_lightButton.Text" xml:space="preserve">
-    <value>Light background</value>
-    <comment>button</comment>
+  <data name="ChangePageColorDialog_colorLink.Text" xml:space="preserve">
+    <value>Choose a custom color</value>
+    <comment>link</comment>
   </data>
   <data name="ChangePageColorDialog_okButton.Text" xml:space="preserve">
     <value>OK</value>
@@ -2278,7 +2267,7 @@ In this section</value>
     <comment>dialog title</comment>
   </data>
   <data name="StyleDialog_okButton.Text" xml:space="preserve">
-    <value>OK</value>
+    <value>OK (Save)</value>
     <comment>button</comment>
   </data>
   <data name="StyleDialog_reorderButton.Text" xml:space="preserve">
@@ -3282,4 +3271,39 @@ In this section</value>
     <value>Import as static images</value>
     <comment>checkbox</comment>
   </data>
+  <data name="ThemesFolder" xml:space="preserve">
+    <value>Themes</value>
+    <comment>SKIP</comment>
+  </data>
+  <data name="ribLoadStylesButton_Label" xml:space="preserve">
+    <value>Load Styles</value>
+    <comment>ribbon item</comment>
+  </data>
+  <data name="ChangePageColorDialog_applyBox" xml:space="preserve">
+    <value>Apply style theme to this page</value>
+    <comment>checkbox</comment>
+  </data>
+  <data name="ChangePageColorDialog_currentLabel" xml:space="preserve">
+    <value>Current Theme:</value>
+    <comment>label</comment>
+  </data>
+  <data name="ChangePageColorDialog_loadLink" xml:space="preserve">
+    <value>Load a style theme</value>
+    <comment>hyperlink</comment>
+  </data>
+  <data name="ChangePageColorDialog_themeIntroLabel" xml:space="preserve">
+    <value>Optionally, load one of the predefined style themes or customize your own theme so all content has enough contrast to be visible.</value>
+    <comment>label</comment>
+  </data>
+  <data name="DefaultStyles" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>defaultstyles.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="StyleDialog_ThemeText" xml:space="preserve">
+    <value>{0} Styles</value>
+    <comment>dialog title</comment>
+  </data>
+  <data name="ChangePageColorDialog_Contrast" xml:space="preserve">
+    <value>Color and theme may not have enough contrast</value>
+    <comment>label</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/OneMore/Properties/Resources.zh-CN.resx b/OneMore/Properties/Resources.zh-CN.resx
index 17780ad510..2e841c0bac 100644
--- a/OneMore/Properties/Resources.zh-CN.resx
+++ b/OneMore/Properties/Resources.zh-CN.resx
@@ -222,9 +222,6 @@
   <data name="Watch" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>emoji\watch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="CustomStyles" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>customstyles.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
   <data name="CustomColorsFilesname" xml:space="preserve">
     <value>CustomColors.xml</value>
     <comment>FILENAME</comment>
@@ -490,8 +487,8 @@
     <comment>Ribbon main button</comment>
   </data>
   <data name="ribPageColorButton_Label" xml:space="preserve">
-    <value>设置页面颜色</value>
-    <comment>Ribbon Custom Styles menu item, set page background color</comment>
+    更改页面主题
+    Ribbon Custom Styles menu item, set page background color EDIT
   </data>
   <data name="ribPasteRtfButton_Label" xml:space="preserve">
     <value>粘贴富文本</value>
@@ -607,29 +604,17 @@ OneNote 将自动关闭</value>
     <comment>the version of the add-in</comment>
   </data>
   <data name="ChangePageColorDialog.Text" xml:space="preserve">
-    <value>更改页面颜色</value>
-    <comment>dialog title</comment>
+    更改页面主题
+    dialog title EDIT
   </data>
   <data name="ChangePageColorDialog_cancelButton.Text" xml:space="preserve">
     <value>取消</value>
     <comment>cancel button</comment>
   </data>
-  <data name="ChangePageColorDialog_customButton.Text" xml:space="preserve">
-    <value>自订背景...</value>
-    <comment>button</comment>
-  </data>
-  <data name="ChangePageColorDialog_darkButton.Text" xml:space="preserve">
-    <value>黑暗的背景</value>
-    <comment>button</comment>
-  </data>
   <data name="ChangePageColorDialog_introLabel.Text" xml:space="preserve">
     <value>选择页面颜色后，加载预定义的样式之一或自定义样式，以便所有内容具有足够的对比度以使其可见。</value>
     <comment>instructions</comment>
   </data>
-  <data name="ChangePageColorDialog_lightButton.Text" xml:space="preserve">
-    <value>浅色背景</value>
-    <comment>button</comment>
-  </data>
   <data name="ChangePageColorDialog_okButton.Text" xml:space="preserve">
     <value>接受</value>
     <comment>ok button</comment>
@@ -2034,8 +2019,8 @@ OneNote文件（*.one）
     <comment>dialog title</comment>
   </data>
   <data name="StyleDialog_okButton.Text" xml:space="preserve">
-    <value>好</value>
-    <comment>button</comment>
+    确定（保存）
+    button EDIT
   </data>
   <data name="StyleDialog_reorderButton.Text" xml:space="preserve">
     <value>重新排序</value>
@@ -3251,4 +3236,36 @@ ISO-code then comma then language name</comment>
     导入为静态图像
     checkbox EDIT
   </data>
+  <data name="ChangePageColorDialog_colorLink.Text" xml:space="preserve">
+    <value>选择自定义颜色</value>
+    <comment>link</comment>
+  </data>
+  <data name="ribLoadStylesButton_Label" xml:space="preserve">
+    <value>加载样式</value>
+    <comment>ribbon item</comment>
+  </data>
+  <data name="ChangePageColorDialog_applyBox" xml:space="preserve">
+    <value>将样式主题应用到此页面</value>
+    <comment>checkbox</comment>
+  </data>
+  <data name="ChangePageColorDialog_currentLabel" xml:space="preserve">
+    <value>当前主题：</value>
+    <comment>label</comment>
+  </data>
+  <data name="ChangePageColorDialog_loadLink" xml:space="preserve">
+    <value>加载样式主题</value>
+    <comment>hyperlink</comment>
+  </data>
+  <data name="ChangePageColorDialog_themeIntroLabel" xml:space="preserve">
+    <value>或者，加载预定义的样式主题之一或自定义您自己的主题，以便所有内容都有足够的对比度可见。</value>
+    <comment>label</comment>
+  </data>
+  <data name="StyleDialog_ThemeText" xml:space="preserve">
+    <value>{0} 样式</value>
+    <comment>dialog title</comment>
+  </data>
+  <data name="ChangePageColorDialog_Contrast" xml:space="preserve">
+    <value>颜色和主题可能没有足够的对比度</value>
+    <comment>label</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/OneMore/Properties/Ribbon.xml b/OneMore/Properties/Ribbon.xml
index 64b8b999f0..9c504723de 100644
--- a/OneMore/Properties/Ribbon.xml
+++ b/OneMore/Properties/Ribbon.xml
@@ -15,6 +15,11 @@
             getItemImage="GetStyleGalleryItemImage"
             getItemScreentip="GetStyleGalleryItemScreentip"
             onAction="ApplyStyleCmd">
+            <button
+              id="ribLoadStylesButton"
+              getLabel="GetRibbonLabel"
+              imageMso="SharingOpenWssDocumentList"
+              onAction="LoadStylesCmd"/>
             <button
               id="ribEditStylesButton"
               getLabel="GetRibbonLabel"
diff --git a/OneMore/Styles/GraphicStyle.cs b/OneMore/Styles/GraphicStyle.cs
index 3adc6da71b..8ca5261b97 100644
--- a/OneMore/Styles/GraphicStyle.cs
+++ b/OneMore/Styles/GraphicStyle.cs
@@ -2,7 +2,7 @@
 // Copyright © 2020 Steven M Cohn.  All rights reserved.
 //************************************************************************************************
 
-namespace River.OneMoreAddIn
+namespace River.OneMoreAddIn.Styles
 {
 	using System;
 	using System.Globalization;
diff --git a/OneMore/Styles/QuickStyleDef.cs b/OneMore/Styles/QuickStyleDef.cs
index 4311a8e582..d260536b53 100644
--- a/OneMore/Styles/QuickStyleDef.cs
+++ b/OneMore/Styles/QuickStyleDef.cs
@@ -2,7 +2,7 @@
 // Copyright © 2020 Steven M Cohn. All rights reserved.
 //************************************************************************************************
 
-namespace River.OneMoreAddIn
+namespace River.OneMoreAddIn.Styles
 {
 	using System.Collections.Generic;
 	using System.Xml.Linq;
diff --git a/OneMore/Styles/Style.cs b/OneMore/Styles/Style.cs
index 6e92f893dc..179a12f91d 100644
--- a/OneMore/Styles/Style.cs
+++ b/OneMore/Styles/Style.cs
@@ -4,7 +4,7 @@
 
 #pragma warning disable CA1822 // member can be made static
 
-namespace River.OneMoreAddIn
+namespace River.OneMoreAddIn.Styles
 {
 	using System.Collections.Generic;
 	using System.Collections.Specialized;
diff --git a/OneMore/Styles/StyleAnalyzer.cs b/OneMore/Styles/StyleAnalyzer.cs
index 2dff8f101b..dc9f58060d 100644
--- a/OneMore/Styles/StyleAnalyzer.cs
+++ b/OneMore/Styles/StyleAnalyzer.cs
@@ -2,7 +2,7 @@
 // Copyright © 2020 Steven M Cohn.  All rights reserved.
 //************************************************************************************************
 
-namespace River.OneMoreAddIn
+namespace River.OneMoreAddIn.Styles
 {
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/OneMore/Styles/StyleBase.cs b/OneMore/Styles/StyleBase.cs
index 684cda58f2..e8edf9dadf 100644
--- a/OneMore/Styles/StyleBase.cs
+++ b/OneMore/Styles/StyleBase.cs
@@ -5,7 +5,7 @@
 #pragma warning disable CS3005 // Identifiers differ only in case
 #pragma warning disable CA1012 // Abstract types should not have constructors
 
-namespace River.OneMoreAddIn
+namespace River.OneMoreAddIn.Styles
 {
 	using System;
 	using System.Drawing;
diff --git a/OneMore/Styles/StyleProvider.cs b/OneMore/Styles/StyleProvider.cs
deleted file mode 100644
index 7076ee6c3c..0000000000
--- a/OneMore/Styles/StyleProvider.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-//************************************************************************************************
-// Copyright © 2016 Steven M Cohn.  All rights reserved.
-//************************************************************************************************
-
-namespace River.OneMoreAddIn
-{
-	using System;
-	using System.Collections.Generic;
-	using System.IO;
-	using System.Linq;
-	using System.Xml.Linq;
-
-
-	/// <summary>
-	/// Loads, save, and manages a cache of styles
-	/// </summary>
-	internal class StyleProvider
-	{
-
-		private readonly List<StyleRecord> cache;
-
-
-		/// <summary>
-		/// Initialize a new style cache.
-		/// </summary>
-		public StyleProvider()
-		{
-			cache = new List<StyleRecord>();
-
-			var path = Path.Combine(
-				PathFactory.GetAppDataPath(), Properties.Resources.CustomStylesFilename);
-
-			XElement root = null;
-			if (File.Exists(path))
-			{
-				try
-				{
-					root = XElement.Load(path);
-				}
-				catch (Exception exc)
-				{
-					Logger.Current.WriteLine($"error reading {path}", exc);
-				}
-			}
-
-			if (root == null)
-			{
-				// file not found so load default theme
-				root = XElement.Parse(Properties.Resources.CustomStyles);
-			}
-
-			//Logger.Current.WriteLine(root.ToString(SaveOptions.None));
-
-			foreach (var record in root.Elements("Style"))
-			{
-				cache.Add(new StyleRecord(record));
-			}
-		}
-
-
-		/// <summary>
-		/// Gets the number of styles cached and managed.
-		/// </summary>
-		public int Count => cache.Count;
-
-
-		/// <summary>
-		/// Get the name of the style at the specified index.
-		/// </summary>
-		/// <param name="index">The ordered index of the desired style</param>
-		/// <returns>A string specifying the name of the style.</returns>
-		public string GetName(int index)
-		{
-			if ((index >=0) && (index < cache.Count))
-			{
-				return cache.ElementAt(index).Name;
-			}
-
-			return null;
-		}
-
-
-		/// <summary>
-		/// Gets the style at the specified index as a Style.
-		/// </summary>
-		/// <param name="index"></param>
-		/// <returns></returns>
-		public Style GetStyle(int index)
-		{
-			if ((index >= 0) && (index < cache.Count))
-			{
-				return new Style(cache.ElementAt(index));
-			}
-
-			return null;
-		}
-
-
-		/// <summary>
-		/// Gets a list of all styles in the cache.
-		/// </summary>
-		/// <returns>A List of Style instances</returns>
-		public List<Style> GetStyles()
-		{
-			return cache.ConvertAll(e => new Style(e));
-		}
-
-
-		public List<Style> LoadTheme(string path)
-		{
-			if (File.Exists(path))
-			{
-				try
-				{
-					var root = XElement.Load(path);
-					var ns = root.GetDefaultNamespace();
-
-					return root.Elements(ns + "Style").ToList()
-						.ConvertAll(e => new Style(new StyleRecord(e)));
-				}
-				catch (Exception exc)
-				{
-					Logger.Current.WriteLine($"error loading theme {path}", exc);
-				}
-			}
-
-			return new List<Style>();
-		}
-
-
-		public void Save(Style style)
-		{
-			var target = cache.FirstOrDefault(e => e.Name.Equals(style.Name));
-			if (target != null)
-			{
-				cache.Remove(target);
-			}
-			else
-			{
-				style.Index = cache.Max(s => s.Index) + 1;
-			}
-
-			cache.Add(new StyleRecord(style));
-
-			Save(cache.OrderBy(e => e.Index));
-		}
-
-
-		public static void Save(List<Style> styles, string path = null)
-		{
-			Save(styles.ConvertAll(e => new StyleRecord(e)).OrderBy(e => e.Index), path);
-		}
-
-
-		private static void Save(IEnumerable<StyleRecord> styles, string path = null)
-		{
-			if (path == null)
-			{
-				path = Path.Combine(PathFactory.GetAppDataPath(), Properties.Resources.CustomStylesFilename);
-			}
-
-			PathFactory.EnsurePathExists(Path.GetDirectoryName(path));
-
-			var root = new XElement("CustomStyles");
-
-			foreach (var style in styles)
-			{
-				root.Add(style.ToXElement());
-			}
-
-			root.Save(path, SaveOptions.None);
-		}
-	}
-}
diff --git a/OneMore/Styles/StyleRecord.cs b/OneMore/Styles/StyleRecord.cs
index 503dd4020b..11d96098c8 100644
--- a/OneMore/Styles/StyleRecord.cs
+++ b/OneMore/Styles/StyleRecord.cs
@@ -2,7 +2,7 @@
 // Copyright © 2020 Steven M Cohn. All rights reserved.
 //************************************************************************************************
 
-namespace River.OneMoreAddIn
+namespace River.OneMoreAddIn.Styles
 {
 	using System.Xml;
 	using System.Xml.Linq;
diff --git a/OneMore/Styles/StyleType.cs b/OneMore/Styles/StyleType.cs
index 703c57dd9f..bd7935ada5 100644
--- a/OneMore/Styles/StyleType.cs
+++ b/OneMore/Styles/StyleType.cs
@@ -2,7 +2,7 @@
 // Copyright © 2020 Steven M Cohn.  All rights reserved.
 //************************************************************************************************
 
-namespace River.OneMoreAddIn
+namespace River.OneMoreAddIn.Styles
 {
 
 	/// <summary>
diff --git a/OneMore/Styles/Stylizer.cs b/OneMore/Styles/Stylizer.cs
index e3a2a561fd..e56725998b 100644
--- a/OneMore/Styles/Stylizer.cs
+++ b/OneMore/Styles/Stylizer.cs
@@ -2,7 +2,7 @@
 // Copyright © 2020 Steven M Cohn.  All rights reserved.
 //************************************************************************************************
 
-namespace River.OneMoreAddIn
+namespace River.OneMoreAddIn.Styles
 {
 	using System.Drawing;
 	using System.Linq;
diff --git a/OneMore/Styles/Theme.cs b/OneMore/Styles/Theme.cs
new file mode 100644
index 0000000000..176451c81a
--- /dev/null
+++ b/OneMore/Styles/Theme.cs
@@ -0,0 +1,189 @@
+//************************************************************************************************
+// Copyright © 2021 Steven M Cohn.  All rights reserved.
+//************************************************************************************************
+
+namespace River.OneMoreAddIn.Styles
+{
+	using System.Collections.Generic;
+	using System.Linq;
+	using System.Xml.Linq;
+
+
+	internal class Theme
+	{
+		private readonly XElement root;
+		private readonly XNamespace ns;
+		private readonly string name;
+		private readonly bool dark;
+
+
+		/// <summary>
+		/// Initialize a new instance by deserializing the given theme XML.
+		/// </summary>
+		public Theme(XElement root, string key)
+		{
+			Key = key;
+
+			this.root = root;
+			ns = root.GetDefaultNamespace();
+
+			if (!root.GetAttributeValue("name", out name, key))
+			{
+				root.Add(new XAttribute("name", name));
+			}
+
+			root.GetAttributeValue("dark", out dark, false);
+		}
+
+
+		/// <summary>
+		/// Initialize a new theme
+		/// </summary>
+		/// <param name="styles">The styles to store in this theme</param>
+		/// <param name="key">The access key for the theme</param>
+		/// <param name="name">The display name of the theme</param>
+		/// <param name="dark">True if intended for a dark background</param>
+		public Theme(List<Style> styles, string key, string name, bool dark)
+		{
+			Key = key;
+			this.name = name;
+			this.dark = dark;
+
+			root = new XElement("Theme",
+				new XAttribute("name", name),
+				new XAttribute("dark", dark.ToString())
+				);
+
+			ns = root.GetDefaultNamespace();
+
+			ReplaceStyles(styles);
+		}
+
+
+		/// <summary>
+		/// Gets the key for this theme. Used as the file name
+		/// </summary>
+		public string Key { get; private set; }
+
+
+		/// <summary>
+		/// Gets the display name of the theme
+		/// </summary>
+		public string Name => name;
+
+
+		/// <summary>
+		/// Gets a Boolean value indicating if this theme is intended for
+		/// use on dark background pages
+		/// </summary>
+		public bool Dark => dark;
+
+
+		/// <summary>
+		/// Gets the count of styles in this theme
+		/// </summary>
+		/// <returns>An integer specifying the count</returns>
+		public int GetCount()
+		{
+			return root.Elements(ns + "Style").Count();
+		}
+
+
+		/// <summary>
+		/// Gets the name of the indexed style
+		/// </summary>
+		/// <param name="index">The index of the style to name</param>
+		/// <returns>The name of the specified style</returns>
+		public string GetName(int index)
+		{
+			return root.Elements(ns + "Style")
+				.ElementAt(index)
+				.Attribute("name").Value;
+		}
+
+
+		/// <summary>
+		/// Gets the list of style records ready for saving
+		/// </summary>
+		/// <returns>A List of StyleRecord items</returns>
+		public List<StyleRecord> GetRecords()
+		{
+			return root.Elements(ns + "Style").ToList()
+				.ConvertAll(e => new StyleRecord(e))
+				.OrderBy(e => e.Index).ToList();
+		}
+
+
+		/// <summary>
+		/// Gets one style definition by its index value; used for the Style Gallery
+		/// </summary>
+		/// <param name="index">The index of the style to retrieve</param>
+		/// <returns>A Style</returns>
+		public Style GetStyle(int index)
+		{
+			return new Style(new StyleRecord(
+				root.Elements(ns + "Style").ElementAt(index)
+				));
+		}
+
+
+		/// <summary>
+		/// Gets the list of Styles described by this theme.
+		/// </summary>
+		/// <returns>A List of Style items</returns>
+		public List<Style> GetStyles()
+		{
+			return root.Elements(ns + "Style")
+				.ToList()
+				.ConvertAll(e => new Style(new StyleRecord(e)));
+		}
+
+
+		/// <summary>
+		/// Add a new style or repalce an existing style by its display name.
+		/// Used when creating a single new style
+		/// </summary>
+		/// <param name="style">The style to add or update</param>
+		public void ReplaceStyle(Style style)
+		{
+			var suspect = root.Elements(ns + "Style")
+				.FirstOrDefault(e => e.Attribute("name").Value == style.Name);
+
+			if (suspect != null)
+			{
+				// replace named style with new style, adopting its index value
+				style.Index = int.Parse(suspect.Attribute("index").Value);
+				suspect.ReplaceWith(new StyleRecord(style).ToXElement());
+			}
+			else
+			{
+				// calculate new index
+				style.Index = root.Elements(ns + "Style")
+					.Max(e => int.Parse(e.Attribute("index").Value)) + 1;
+
+				root.Add(new StyleRecord(style).ToXElement());
+			}
+		}
+
+
+		/// <summary>
+		/// Replaces all styles in this theme with the given list of styles; used when
+		/// editing an entire theme at once.
+		/// </summary>
+		/// <param name="styles"></param>
+		public void ReplaceStyles(List<Style> styles)
+		{
+			var elements = root.Elements(ns + "Style");
+			if (elements.Any())
+			{
+				elements.Remove();
+			}
+
+			var records = styles.ConvertAll(e => new StyleRecord(e)).OrderBy(e => e.Index);
+			foreach (var record in records)
+			{
+				root.Add(record.ToXElement());
+			}
+		}
+	}
+}
diff --git a/OneMore/Styles/ThemeProvider.cs b/OneMore/Styles/ThemeProvider.cs
new file mode 100644
index 0000000000..ed69238e81
--- /dev/null
+++ b/OneMore/Styles/ThemeProvider.cs
@@ -0,0 +1,197 @@
+//************************************************************************************************
+// Copyright © 2021 Steven M Cohn.  All rights reserved.
+//************************************************************************************************
+
+#pragma warning disable S1117 // Local variables should not shadow class fields
+
+namespace River.OneMoreAddIn.Styles
+{
+	using River.OneMoreAddIn.Settings;
+	using System;
+	using System.Collections.Generic;
+	using System.IO;
+	using System.Linq;
+	using System.Xml.Linq;
+	using Resx = River.OneMoreAddIn.Properties.Resources;
+
+
+	internal class ThemeProvider : Loggable
+	{
+		private const string SettingsKey = "pageTheme";
+		private const string SettingsKeyKey = "key";
+
+		private readonly Theme theme;
+
+
+		public ThemeProvider()
+			: this(GetSavedKey())
+		{
+		}
+
+
+		public ThemeProvider(string key)
+		{
+			// may be null if from default constructor and no setting
+			if (!string.IsNullOrEmpty(key))
+			{
+				// key actually specifies the path to a theme file
+				if (!string.IsNullOrEmpty(Path.GetDirectoryName(key)))
+				{
+					var root = LoadFromFile(key);
+					if (root != null)
+					{
+						theme = new Theme(root, Path.GetFileNameWithoutExtension(key));
+					}
+
+					// explicit path not found, leave theme null
+					return;
+				}
+
+				// load by key in expected appdata paths
+				theme = Load(key);
+			}
+
+			if (theme == null)
+			{
+				// last ditch, load something!
+				theme = new Theme(XElement.Parse(Resx.DefaultStyles), "Default");
+			}
+		}
+
+
+
+		public Theme Theme => theme;
+
+
+		private static string GetSavedKey()
+		{
+			var sp = new SettingsProvider();
+			var settings = sp.GetCollection(SettingsKey);
+			if (settings != null)
+			{
+				return settings.Get<string>(SettingsKeyKey);
+			}
+
+			return null;
+		}
+
+
+		private Theme Load(string key)
+		{
+			// appdata\Roaming\OneMore\Themes\key.xml
+			var root = LoadFromFile(Path.Combine(
+				PathFactory.GetAppDataPath(), Resx.ThemesFolder, $"{key}.xml"));
+
+			if (root == null)
+			{
+				// appdata\Roaming\OneMore\CustomStyles.xml -- backwards compatibility
+				root = LoadFromFile(Path.Combine(
+					PathFactory.GetAppDataPath(), Resx.CustomStylesFilename));
+			}
+
+			if (root == null)
+			{
+				// key not found, custom not found, so load default theme
+				root = XElement.Parse(Resx.DefaultStyles);
+			}
+
+			return new Theme(root, key);
+		}
+
+
+		private XElement LoadFromFile(string path)
+		{
+			if (!File.Exists(path))
+			{
+				//logger.WriteLine($"file not found {path}");
+				return null;
+			}
+
+			try
+			{
+				var root = XElement.Load(path);
+				if (root.Name.LocalName == "CustomStyles" ||
+					root.Name.LocalName == "Theme")
+				{
+					if (root.Attribute("name") == null)
+					{
+						// themes provided by OneMore will have an internal name
+						// but user-defined themes will not so infer from filename
+						root.Add(new XAttribute(
+							"name", Path.GetFileNameWithoutExtension(path)));
+					}
+
+					return root;
+				}
+
+				logger.WriteLine($"specified file is not a style theme {path}");
+				logger.WriteLine(root);
+			}
+			catch (Exception exc)
+			{
+				logger.WriteLine($"error reading {path}", exc);
+			}
+
+			return null;
+		}
+
+
+		public static void RecordTheme(string key)
+		{
+			var setprovider = new SettingsProvider();
+			var settings = setprovider.GetCollection(SettingsKey);
+			if (settings.Add(SettingsKeyKey, key))
+			{
+				setprovider.SetCollection(settings);
+				setprovider.Save();
+			}
+		}
+
+
+		public static void Save(Style style)
+		{
+			var theme = new ThemeProvider().Theme;
+			theme.ReplaceStyle(style);
+			Save(theme);
+		}
+
+
+		public static void Save(Theme theme, string path = null)
+		{
+			string key;
+			string name;
+			if (string.IsNullOrEmpty(path))
+			{
+				path = Path.Combine(PathFactory.GetAppDataPath(), Resx.ThemesFolder, theme.Key);
+				key = theme.Key;
+				name = theme.Name;
+			}
+			else
+			{
+				key = name = Path.GetFileNameWithoutExtension(path);
+			}
+
+			if (string.IsNullOrEmpty(Path.GetExtension(path)))
+			{
+				path = $"{path}.xml";
+			}
+
+			PathFactory.EnsurePathExists(Path.GetDirectoryName(path));
+
+			// create a new instance to handle the save-as workflow
+			var root = new XElement("Theme",
+				new XAttribute("key", key),
+				new XAttribute("name", name),
+				new XAttribute("dark", theme.Dark)
+				);
+
+			foreach (var record in theme.GetRecords())
+			{
+				root.Add(record.ToXElement());
+			}
+
+			root.Save(path, SaveOptions.None);
+
+		}
+	}
+}
diff --git a/OneMore/Styles/XmlStyleBase.cs b/OneMore/Styles/XmlStyleBase.cs
index f6b260e501..9e306d1c9d 100644
--- a/OneMore/Styles/XmlStyleBase.cs
+++ b/OneMore/Styles/XmlStyleBase.cs
@@ -4,7 +4,7 @@
 
 #pragma warning disable CA1012 // abstract should not have constructor
 
-namespace River.OneMoreAddIn
+namespace River.OneMoreAddIn.Styles
 {
 	using System;
 	using System.IO;
diff --git a/OneMore/UI/BasicColors.cs b/OneMore/UI/BasicColors.cs
index 5cd675119f..acb54c011f 100644
--- a/OneMore/UI/BasicColors.cs
+++ b/OneMore/UI/BasicColors.cs
@@ -2,10 +2,12 @@
 // Copyright © 2016 Steven M Cohn.  All rights reserved.
 //************************************************************************************************
 
-using System.Linq;
-
 namespace River.OneMoreAddIn.UI
 {
+	using System.Drawing;
+	using System.Linq;
+
+
 	#region LinqPad
 	/*
 	var basicColors = new List<Color>
@@ -122,6 +124,9 @@ internal static class BasicColors
 		};
 
 
+		public static Color BlackSmoke => Color.FromArgb(64, 64, 64);
+
+
 		public static bool IsKnown (int candidate)
 		{
 			return colors.Contains(candidate);
diff --git a/OneMore/UI/ColorsComboBox.cs b/OneMore/UI/ColorsComboBox.cs
new file mode 100644
index 0000000000..6bbd732502
--- /dev/null
+++ b/OneMore/UI/ColorsComboBox.cs
@@ -0,0 +1,295 @@
+//************************************************************************************************
+// Copyright © 2021 Steven M Cohn.  All rights reserved.
+//************************************************************************************************
+
+namespace River.OneMoreAddIn.UI
+{
+	using System;
+	using System.Drawing;
+	using System.Drawing.Drawing2D;
+	using System.Drawing.Text;
+	using System.Windows.Forms;
+
+
+	/// <summary>
+	/// An enhanced ComboBox that displays a selection of colors suitable for page backgrounds
+	/// in both light and dard shades.
+	/// </summary>
+	internal class ColorsComboBox : ComboBox
+	{
+		private class Swatch
+		{
+			public readonly string Name;
+			public Color Color;
+			public Swatch(string name, Color color) { Name = name; Color = color; }
+		}
+
+		private const string arrow = "\u00E8"; // black right arrow
+
+		private readonly Font itemFont;
+		private readonly Font arrowFont;
+		private readonly int itemHeight;
+		private readonly int customIndex;
+		private StringFormat stringFormat;
+		private bool opened;
+
+
+		public ColorsComboBox()
+		{
+			Items.AddRange(new[]
+			{
+				// light
+				new Swatch(Color.White.Name, Color.White),
+				new Swatch(Color.WhiteSmoke.Name, Color.WhiteSmoke),
+				new Swatch(Color.AliceBlue.Name, Color.AliceBlue),
+				new Swatch(Color.MintCream.Name, Color.MintCream),
+				new Swatch(Color.Honeydew.Name, Color.Honeydew),
+				new Swatch(Color.Ivory.Name, Color.Ivory),
+				new Swatch(Color.Snow.Name, Color.Snow),
+				new Swatch(Color.SeaShell.Name, Color.SeaShell),
+				new Swatch(Color.Linen.Name, Color.Linen),
+				// dark
+				new Swatch(Color.Black.Name, Color.Black),
+				new Swatch("Black Smoke", BasicColors.BlackSmoke),
+				new Swatch(Color.DarkCyan.Name, Color.FromArgb(39, 81, 81)),
+				new Swatch(Color.DarkOliveGreen.Name, Color.FromArgb(41, 53, 34)),
+				new Swatch(Color.DarkSlateBlue.Name, Color.FromArgb(46, 46, 73)),
+				new Swatch(Color.SteelBlue.Name, Color.FromArgb(33, 54, 79)),
+				new Swatch(Color.MidnightBlue.Name, Color.FromArgb(39, 46, 68)),
+				new Swatch(Color.SaddleBrown.Name, Color.FromArgb(76, 51, 26)),
+				new Swatch(Color.Brown.Name, Color.FromArgb(84, 37, 37)),
+				new Swatch(Color.Purple.Name, Color.FromArgb(61, 31, 50)),
+				new Swatch("Custom", Color.Transparent)
+			});
+
+			customIndex = Items.Count - 1;
+			arrowFont = new Font("Wingdings", 11.0f);
+			itemFont = new Font("Calibri", 11.0f);
+			itemHeight = CalculateLayout();
+			stringFormat = CreateStringFormat();
+
+			DrawMode = DrawMode.OwnerDrawVariable;
+			DropDownStyle = ComboBoxStyle.DropDownList;
+			DropDownHeight = itemHeight * 15;
+			Height = itemHeight;
+			Sorted = false;
+		}
+
+
+		/// <summary>
+		/// Fires when the chosen color changes
+		/// </summary>
+		public event EventHandler ColorChanged;
+
+
+		/// <summary>
+		/// Gets the custom color
+		/// </summary>
+		public Color CustomColor => ((Swatch)Items[customIndex]).Color;
+
+
+		/// <summary>
+		/// Gets the selected color
+		/// </summary>
+		public Color Color => ((Swatch)Items[SelectedIndex]).Color;
+
+
+		protected override void Dispose(bool disposing)
+		{
+			if (stringFormat != null)
+				stringFormat.Dispose();
+
+			if (itemFont != null)
+				itemFont.Dispose();
+
+			if (arrowFont != null)
+				arrowFont.Dispose();
+
+			base.Dispose(disposing);
+		}
+
+
+		/// <summary>
+		/// Select the item that matches the given color, or White if no matches
+		/// </summary>
+		/// <param name="color">The desired color</param>
+		public void SelectColor(Color color)
+		{
+			var index = 0;
+			while (index < Items.Count)
+			{
+				if (color.Matches(((Swatch)Items[index]).Color))
+				{
+					break;
+				}
+
+				index++;
+			}
+
+			SelectedIndex = index < Items.Count ? index : 0;
+		}
+
+
+		/// <summary>
+		/// Sets the value of the Custom Color item.
+		/// </summary>
+		/// <param name="color">The Color to apply</param>
+		public void SetCustomColor(Color color)
+		{
+			((Swatch)Items[customIndex]).Color = color;
+			Invalidate();
+
+			if (SelectedIndex == customIndex)
+			{
+				ColorChanged?.Invoke(this, new EventArgs());
+			}
+			else
+			{
+				SelectedIndex = customIndex;
+			}
+		}
+
+
+		protected override void OnSelectedIndexChanged(EventArgs e)
+		{
+			base.OnSelectedIndexChanged(e);
+			ColorChanged?.Invoke(this, e);
+		}
+
+
+		private int CalculateLayout()
+		{
+			// account for ascenders and descenders
+			var textSize = TextRenderer.MeasureText("yY", itemFont);
+			return textSize.Height + 4;
+		}
+
+
+		private StringFormat CreateStringFormat()
+		{
+			var format = new StringFormat(StringFormatFlags.NoWrap)
+			{
+				Trimming = StringTrimming.EllipsisCharacter,
+				HotkeyPrefix = HotkeyPrefix.None,
+				Alignment = StringAlignment.Center,
+				LineAlignment = StringAlignment.Center
+			};
+
+			if (IsUsingRTL(this))
+				format.FormatFlags |= StringFormatFlags.DirectionRightToLeft;
+
+			return format;
+		}
+
+
+		private bool IsUsingRTL(Control control)
+		{
+			bool result;
+
+			if (control.RightToLeft == RightToLeft.Yes)
+				result = true;
+			else if (control.RightToLeft == RightToLeft.Inherit && control.Parent != null)
+				result = IsUsingRTL(control.Parent);
+			else
+				result = false;
+
+			return result;
+		}
+
+
+		protected override void OnDrawItem(DrawItemEventArgs e)
+		{
+			base.OnDrawItem(e);
+
+			if (e.Index > -1 && e.Index < Items.Count)
+			{
+				try
+				{
+					var swatch = (Swatch)Items[e.Index];
+					var dark = swatch.Color.GetBrightness() < 0.5;
+
+					// focus
+					if ((e.State & DrawItemState.Selected) == DrawItemState.Selected)
+					{
+						using (var pen = new Pen(dark ? Color.Red : Color.Blue, 2)
+						{
+							DashStyle = DashStyle.Dash,
+							DashPattern = new float[] { 3, 2 }
+						})
+						{
+							e.Graphics.DrawRectangle(pen, e.Bounds);
+						}
+					}
+					else
+					{
+						e.Graphics.DrawRectangle(new Pen(Color.White, 2), e.Bounds);
+					}
+
+					// background
+					using (var backBrush = new SolidBrush(swatch.Color))
+					{
+						e.Graphics.FillRectangle(backBrush,
+							e.Bounds.X + 1, e.Bounds.Y + 1,
+							e.Bounds.Width - 2, e.Bounds.Height - 2);
+					}
+
+					// foreground
+					using (var textBrush = dark
+						? new SolidBrush(Color.WhiteSmoke)
+						: new SolidBrush(Color.Black))
+					{
+						e.Graphics.DrawString(
+							swatch.Name, itemFont,
+							textBrush, e.Bounds, stringFormat);
+
+						if (opened && (e.State & DrawItemState.Selected) == DrawItemState.Selected)
+						{
+							e.Graphics.DrawString(arrow, arrowFont,
+								textBrush, e.Bounds.X + 10, e.Bounds.Y);
+						}
+					}
+				}
+				catch (Exception exc)
+				{
+					Logger.Current.WriteLine("OnDrawItem", exc);
+				}
+			}
+		}
+
+
+		protected override void OnMeasureItem(MeasureItemEventArgs e)
+		{
+			base.OnMeasureItem(e);
+
+			if (e.Index > -1 && e.Index < Items.Count)
+			{
+				e.ItemHeight = itemHeight;
+			}
+		}
+
+
+		protected override void OnRightToLeftChanged(EventArgs e)
+		{
+			base.OnRightToLeftChanged(e);
+
+			if (stringFormat != null)
+				stringFormat.Dispose();
+
+			stringFormat = CreateStringFormat();
+		}
+
+		protected override void OnDropDown(EventArgs e)
+		{
+			opened = true;
+			Invalidate();
+			base.OnDropDown(e);
+		}
+
+		protected override void OnDropDownClosed(EventArgs e)
+		{
+			opened = false;
+			Invalidate();
+			base.OnDropDownClosed(e);
+		}
+	}
+}
\ No newline at end of file
diff --git a/OneMore/Helpers/GalleryTileFactory.cs b/OneMore/UI/TileFactory.cs
similarity index 93%
rename from OneMore/Helpers/GalleryTileFactory.cs
rename to OneMore/UI/TileFactory.cs
index f64a718d12..5bd0a1fb1a 100644
--- a/OneMore/Helpers/GalleryTileFactory.cs
+++ b/OneMore/UI/TileFactory.cs
@@ -4,6 +4,7 @@
 
 namespace River.OneMoreAddIn
 {
+	using River.OneMoreAddIn.Styles;
 	using System;
 	using System.Drawing;
 	using System.Drawing.Drawing2D;
@@ -11,18 +12,14 @@ namespace River.OneMoreAddIn
 	using System.Runtime.InteropServices.ComTypes;
 
 
-	internal class GalleryTileFactory
+	internal class TileFactory
 	{
-		private readonly StyleProvider provider;
-
-
-		public GalleryTileFactory()
+		public TileFactory()
 		{
-			provider = new StyleProvider();
 		}
 
 
-		public IStream MakeTile(int itemIndex, Color pageColor)
+		public IStream MakeTile(Style themeStyle, Color pageColor)
 		{
 			float scale = 1.0f;
 
@@ -44,7 +41,7 @@ public IStream MakeTile(int itemIndex, Color pageColor)
 					graphics.TextRenderingHint = TextRenderingHint.AntiAlias;
 
 					// TODO: scale font size?
-					using (var style = new GraphicStyle(provider.GetStyle(itemIndex)))
+					using (var style = new GraphicStyle(themeStyle))
 					{
 						// draw name...
 
diff --git a/OneMoreSetup/OneMoreSetup.vdproj b/OneMoreSetup/OneMoreSetup.vdproj
index c8e0acf897aaa569cbf3041d6e068740e51767cc..16a5047c5e8a89324a8d3ad81af731e9dddc5cbd 100644
GIT binary patch
delta 3188
zcmb_eU1%It6uvV%*_o|SHr8U(G`fkzB(+I)va>t8iIL3yMMG#~tszK_jZLj+8#mQL
zz=}$x?TaO4F$YvcLd7aowyrqR2Pq07dC*vYC_zP9jUu7sp_))z@H=<6HPl2UT`n_o
z&%NjGJNL{z=j2;;GjG=CBF(X|NQ;O_2oq0S1VvaRg@qBq%oYwPUSlc-z8HpywYYG|
zJYiI3GoG64WbC`_+Y`O{p5N=0?6HYH@*h=d@=fL;)sBi3^s;;$(#}==VW}kw3$|#1
zHKtAQ@GL2u{H6mH%2-h8lR9~l&BX%Qe(K9^yD<k^%YPWT`v%*Ba1th1C<Ntc3`?%G
zz|klS+EAO8#^O*P2fr<n*(2jsP<Sza$$6n7T(Is)#uS)C5VY`3KyeI|E$N6f#gR$D
zP>=?4zN#YnDQeoUc<Hr|l+Ds#CJUbD_w_&AM?Zd|XklB*Md2z(wFP=j=!!uXyBUKu
zj<bc;I5^|devH0QjH_1iKYXyxX>-8E(jjojSV`!7UP%lFXi0w)*yre{u@;rVu;|OA
zr{apw`T04`6ANO8Q6?n^OK<=~(8AfkXOhB5g5sE1a+UoJW``TvaPU+6=P$bR7nM8r
zx&G(X4T{@8qMq*OdA;KHo>AXjMZsIujcqOP^*ZwGwy{>Vt6__HRO}GD@jNNEVkE_Y
z*drbnoA4eGLt-a(n#73MP1S!WsfvHyuA|ZW)$Vo^St-vG_`|^H05#_+$AIUY|NKAj
zDo2I?0gh-KGl!gWTD3cSO7m-3tGSmlGm7EnX4IM$5_GHu3YV4s*-Zzkq&9|Kw-oG7
zz}|r|v;g$YS3obaSz^d;U{2lDRXAS$NtXF9QuSk=1O-~v^><tgG$Eb<xJSe;u~)*}
zj<>x4Y~_D2lp64q<4KPcj+QfG+4n|D!mYg)?tS7ZnZ|=Mtp^tXUA^R1sUZ%X^o*Y_
z{=SjJ+Ln8Y^V}J2yrDQB@szFDUYsA>SvKn{goH1VWnXf&oaz6F$dzP{7gONxpL_L^
zTP2Rj!Rg^LcY4_S@_LD~J%KCXx-Q^qM*6=}J+dGJ7ESd93?)YGe*UWWy;aMv4s@hT
zb!3)TUz_ENU)JS|E|(P5#~yit?!KJ&c(j<l8-MejJzAXij_O~>pXCOp(Ee}<42ecb
zbEDFTbuJP~%%Ug*VLXlCNP*(Q;NZ&zm<vWqJR@4gLy+LYX=9fQ2A5M45)rA1TLA|Y
zOIujuqHh@>(^!ts3DZ|gum7n8DA?><Nz>ozfl5bYFgW%3rby#@+$9EaDee&u((oF!
znu0aPI=#40W~Z-_{4c5+ojR-EPP0vFJ!LA@!xX52!pyI_zrqnc7-+b}7CdQG(r)Sf
zX1e#X((qD`@c@^h735#5X*4;fccWd500TELDZC5KP!z2TBZy*$3nf1sAEtufisGB1
z@|gE&+VG39lHTtynhK8fykTskQ|FBy8a=0PrRR2fw6UM`ThQbn1d!t9(?JZ=h+!HO
zTj6MO+r&*P7ibGBY=fIq_&@_mUmIn<(IaCa)lWU=^}A@YT=z=%OHl7Aa9$4-)Q;X{
ztZ^@WuOC<13%xP-PI0)yy%M*bg+4NcU~#puW%6*CxK#2QgGA>?Ck~aF)G_2)BmKT=
zAx#}W>z`5P9bX4sx~y+>N50avP-hFkbJ}sg!rw+{;Z!nZin66BW*odUv^U~gI5h6?
zxvQ}uk3f?0icvw6n{_|Uc#X9Q6KpmZxPN9bjyyNPocAVn9I2F>K{m;m&8-k;HfJzX
gaVp<yRJwz@F{FAd(L}@TO4Y#&KEu7>^L;w;7kMX%ZvX%Q

delta 579
zcmaE}Tw~Wt^$lkFn>!2|Sf)EzGKOv5VD^P~`i_Z=AwZS}<8(1k#t1NLa-C7c<PByD
zoBtVeFoHM``5l)TBc{1BDs5KS!NxfGpD|Q1kTG2$icw{Ao<E1c^jpVa#^v-tjhil!
z1!Zk^NqrQyxni%3<K}1onV8$HSQxiku`pTGOuz7iS!er#2Br(~VCHln^Vjwn51G~p
zPggk06fn8NAY{A4I%Y1$=^LC`wYKa1W%|ak-GGOAm)G<OdQ5)XePWs2DyBE^vIJ~@
zb(?v?C9o;eX0!a+zGXd2kSCI%dcRl}X(I7|sIYP+gZbMHI#^$EO+WCKHDJ2g9M+ia
z7v3`~Ft)#&#k&37EH)WUuuanwuCTFeFF3`vPI$ZA6Sfr=5ThO#u>aZqL6-f&5@e$f
zvtMzVZeYvdw|$Ke2aB=0A%i7@D}xb(BZE1RHf7LdaA7cJaAGh6vP^({kgP6{?+6ri
z1hPQ18-oRd0Z_~YsK*Vg+j6?%dq&CW4bjX3(-qt}q+HE`%3OfZ1gOjqY^Vv4=L9y?
z7-%@iP>_{|K&y3ud<&pO#y~#E5|ADX5C$8%eTExH9uu=MgWhz-`Rvk@4dhtb)jT=2
Kt9f!BI|TqY`oewy

diff --git a/Themes/ConfluenceStyles6.xml b/Themes/Confluence6.xml
similarity index 98%
rename from Themes/ConfluenceStyles6.xml
rename to Themes/Confluence6.xml
index 272f80f8d9..731fb11dcf 100644
--- a/Themes/ConfluenceStyles6.xml
+++ b/Themes/Confluence6.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<CustomStyles>
+<Theme name="Confluence 6">
   <Style index="0" name="Heading 1" font="Arial" fontSize="18" fontColor="#ff333333" spaceBefore="0" spaceAfter="0" styleType="Heading" />
   <Style index="1" name="Heading 2" font="Arial" fontSize="15" fontColor="#ff333333" spaceBefore="12" spaceAfter="0" styleType="Heading" />
   <Style index="2" name="Heading 3" font="Arial" fontSize="12" bold="true" fontColor="#ff333333" spaceBefore="12" spaceAfter="0" styleType="Heading" />
@@ -15,4 +15,4 @@
   <Style index="12" name="Emphasis" font="Arial" fontSize="10" bold="true" italic="true" fontColor="#ff5B9BD5" spaceBefore="0" spaceAfter="0" styleType="Character" />
   <Style index="13" name="Intense Emphasis" font="Arial" fontSize="10" bold="true" italic="true" fontColor="#ffC00000" spaceBefore="0" spaceAfter="0" styleType="Character" />
   <Style index="14" name="Subtle Emphasis" font="Arial" fontSize="10" bold="true" italic="true" fontColor="#ffA5A5A5" spaceBefore="0" spaceAfter="0" styleType="Character" />
-</CustomStyles>
\ No newline at end of file
+</Theme>
\ No newline at end of file
diff --git a/Themes/ConfluenceStyles7.xml b/Themes/Confluence7.xml
similarity index 98%
rename from Themes/ConfluenceStyles7.xml
rename to Themes/Confluence7.xml
index b185c0b7c1..98e9e8dc7b 100644
--- a/Themes/ConfluenceStyles7.xml
+++ b/Themes/Confluence7.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<CustomStyles>
+<Theme name="Confluence 7">
   <Style index="0" name="Heading 1" font="Segoe UI" fontColor="#151515" fontSize="22.0" spaceBefore="14.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
   <Style index="1" name="Heading 2" font="Segoe UI" fontColor="#151515" fontSize="20.0" spaceBefore="14.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
   <Style index="2" name="Heading 3" font="Segoe UI Semibold" fontColor="#5E6C84" fontSize="16.0" spaceBefore="12.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
@@ -15,4 +15,4 @@
   <Style index="12" name="Emphasis" font="Segoe UI" fontColor="#0080FF" fontSize="11.0" bold="true" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
   <Style index="13" name="Intense Emphasis" font="Segoe UI" fontColor="#FF0000" fontSize="11.0" bold="true" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
   <Style index="14" name="Subtle Emphasis" font="Segoe UI" fontColor="#5E6C84" fontSize="11.0" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
-</CustomStyles>
\ No newline at end of file
+</Theme>
\ No newline at end of file
diff --git a/Themes/DarkStyles.xml b/Themes/DarkBlue.xml
similarity index 69%
rename from Themes/DarkStyles.xml
rename to Themes/DarkBlue.xml
index 1913414839..d39f83f9d1 100644
--- a/Themes/DarkStyles.xml
+++ b/Themes/DarkBlue.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<CustomStyles>
-  <Style index="0" name="Heading 1" font="Segoe UI" fontColor="#0080C0" fontSize="22.0" spaceBefore="14.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
-  <Style index="1" name="Heading 2" font="Segoe UI" fontColor="#0080C0" fontSize="20.0" spaceBefore="14.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
-  <Style index="2" name="Heading 3" font="Segoe UI Semibold" fontColor="#5E6C84" fontSize="16.0" spaceBefore="12.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
-  <Style index="3" name="Heading 4" font="Segoe UI" fontColor="#5E6C84" fontSize="14.0" spaceBefore="12.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
-  <Style index="4" name="Heading 5" font="Segoe UI" fontColor="#0080C0" fontSize="14.0" spaceBefore="10.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
-  <Style index="5" name="Heading 6" font="Segoe UI" fontColor="#0080C0" fontSize="12.0" spaceBefore="10.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
-  <Style index="6" name="Page Title" font="Calibri Light" fontColor="#0080FF" fontSize="20.0" spaceBefore="0.0" spaceAfter="14.0" applyColors="true" styleType="Paragraph" />
-  <Style index="7" name="Citation" font="Segoe UI" fontColor="#5E6C84" fontSize="9.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Paragraph" />
-  <Style index="8" name="Quote" font="Segoe UI" fontColor="#5E6C84" fontSize="11.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Paragraph" />
+<Theme name="DarkBlue" dark="true">
+  <Style index="0" name="Heading 1" font="Segoe UI" fontColor="#B0CEEA" fontSize="18.0" spaceBefore="12.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="1" name="Heading 2" font="Segoe UI" fontColor="#69A4D8" fontSize="16.0" spaceBefore="12.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="2" name="Heading 3" font="Segoe UI Semibold" fontColor="#327DC3" fontSize="14.0" spaceBefore="12.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="3" name="Heading 4" font="Segoe UI" fontColor="#327CC3" fontSize="12.0" spaceBefore="10.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="4" name="Heading 5" font="Segoe UI" fontColor="#60A3D7" fontSize="12.0" spaceBefore="8.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="5" name="Heading 6" font="Segoe UI" fontColor="#58A2D6" fontSize="12.0" spaceBefore="8.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="6" name="Page Title" font="Calibri Light" fontColor="#FFFFFF" fontSize="20.0" spaceBefore="0.0" spaceAfter="14.0" applyColors="true" styleType="Paragraph" />
+  <Style index="7" name="Citation" font="Segoe UI" fontColor="#B2B089" fontSize="9.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Paragraph" />
+  <Style index="8" name="Quote" font="Segoe UI" fontColor="#B2B089" fontSize="11.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Paragraph" />
   <Style index="9" name="Code" font="Consolas" fontColor="#FFFFFF" fontSize="10.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="false" styleType="Paragraph" />
   <Style index="10" name="Normal" font="Segoe UI" fontColor="#EEEEEE" fontSize="11.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Paragraph" />
   <Style index="11" name="Strong" font="Segoe UI" fontColor="#FFFFFF" fontSize="11.0" bold="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
   <Style index="12" name="Emphasis" font="Segoe UI" fontColor="#0080FF" fontSize="11.0" bold="true" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
   <Style index="13" name="Intense Emphasis" font="Segoe UI" fontColor="#FF0000" fontSize="11.0" bold="true" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
   <Style index="14" name="Subtle Emphasis" font="Segoe UI" fontColor="#5E6C84" fontSize="11.0" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
-</CustomStyles>
\ No newline at end of file
+</Theme>
\ No newline at end of file
diff --git a/Themes/BlackStyles.xml b/Themes/DarkGreen.xml
similarity index 59%
rename from Themes/BlackStyles.xml
rename to Themes/DarkGreen.xml
index b3003b1de6..995b82157c 100644
--- a/Themes/BlackStyles.xml
+++ b/Themes/DarkGreen.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<CustomStyles>
-  <Style index="0" name="Heading 1" font="Segoe UI" fontColor="#0080C0" fontSize="22.0" spaceBefore="14.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
-  <Style index="1" name="Heading 2" font="Segoe UI" fontColor="#0080C0" fontSize="20.0" spaceBefore="14.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
-  <Style index="2" name="Heading 3" font="Segoe UI Semibold" fontColor="#5E6C84" fontSize="16.0" spaceBefore="12.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
-  <Style index="3" name="Heading 4" font="Segoe UI" fontColor="#5E6C84" fontSize="14.0" spaceBefore="12.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
-  <Style index="4" name="Heading 5" font="Segoe UI" fontColor="#0080C0" fontSize="14.0" spaceBefore="10.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
-  <Style index="5" name="Heading 6" font="Segoe UI" fontColor="#0080C0" fontSize="12.0" spaceBefore="10.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
-  <Style index="6" name="Page Title" font="Calibri Light" fontColor="#0080FF" fontSize="20.0" spaceBefore="0.0" spaceAfter="14.0" applyColors="true" styleType="Paragraph" />
-  <Style index="7" name="Citation" font="Segoe UI" fontColor="#8C98AC" fontSize="9.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Paragraph" />
-  <Style index="8" name="Quote" font="Segoe UI" fontColor="#8C98AC" fontSize="11.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Paragraph" />
+<Theme name="DarkGreen" dark="true">
+  <Style index="0" name="Heading 1" font="Segoe UI" fontColor="#6CAA46" fontSize="18.0" spaceBefore="12.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="1" name="Heading 2" font="Segoe UI" fontColor="#00853C" fontSize="16.0" spaceBefore="12.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="2" name="Heading 3" font="Segoe UI Semibold" fontColor="#517F2D" fontSize="14.0" spaceBefore="12.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="3" name="Heading 4" font="Segoe UI" fontColor="#517F2D" fontSize="12.0" spaceBefore="10.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="4" name="Heading 5" font="Segoe UI" fontColor="#02853C" fontSize="12.0" spaceBefore="8.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="5" name="Heading 6" font="Segoe UI" fontColor="#02853C" fontSize="12.0" spaceBefore="8.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="6" name="Page Title" font="Calibri Light" fontColor="#FFFFFF" fontSize="20.0" spaceBefore="0.0" spaceAfter="14.0" applyColors="true" styleType="Paragraph" />
+  <Style index="7" name="Citation" font="Segoe UI" fontColor="#B2B089" fontSize="9.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Paragraph" />
+  <Style index="8" name="Quote" font="Segoe UI" fontColor="#B2B089" fontSize="11.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Paragraph" />
   <Style index="9" name="Code" font="Consolas" fontColor="#FFFFFF" fontSize="10.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="false" styleType="Paragraph" />
-  <Style index="10" name="Normal" font="Segoe UI" fontColor="#FFFFFF" fontSize="11.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Paragraph" />
+  <Style index="10" name="Normal" font="Segoe UI" fontColor="#EEEEEE" fontSize="11.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Paragraph" />
   <Style index="11" name="Strong" font="Segoe UI" fontColor="#FFFFFF" fontSize="11.0" bold="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
-  <Style index="12" name="Emphasis" font="Segoe UI" fontColor="#0080FF" fontSize="11.0" bold="true" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
+  <Style index="12" name="Emphasis" font="Segoe UI" fontColor="#33AA00" fontSize="11.0" bold="true" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
   <Style index="13" name="Intense Emphasis" font="Segoe UI" fontColor="#FF0000" fontSize="11.0" bold="true" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
-  <Style index="14" name="Subtle Emphasis" font="Segoe UI" fontColor="#8C98AC" fontSize="11.0" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
-</CustomStyles>
\ No newline at end of file
+  <Style index="14" name="Subtle Emphasis" font="Segoe UI" fontColor="#5E6C84" fontSize="11.0" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
+</Theme>
\ No newline at end of file
diff --git a/Themes/DarkOrange.xml b/Themes/DarkOrange.xml
new file mode 100644
index 0000000000..2828bf2e4e
--- /dev/null
+++ b/Themes/DarkOrange.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Theme name="DarkOrange" dark="true">
+  <Style index="0" name="Heading 1" font="Calibri Light" fontColor="#FF9F40" fontSize="20.0" spaceBefore="14.0" spaceAfter="0.0" spacing="0.0" applyColors="true" styleType="Heading" />
+  <Style index="1" name="Heading 2" font="Calibri Light" fontColor="#E67832" fontSize="18.0" spaceBefore="14.0" spaceAfter="0.0" spacing="0.0" applyColors="true" styleType="Heading" />
+  <Style index="2" name="Heading 3" font="Calibri Light" fontColor="#AC510D" fontSize="16.0" spaceBefore="12.0" spaceAfter="0.0" spacing="0.0" applyColors="true" styleType="Heading" />
+  <Style index="3" name="Heading 4" font="Calibri Light" fontColor="#C85A14" fontSize="14.0" spaceBefore="12.0" spaceAfter="0.0" spacing="0.0" applyColors="true" styleType="Heading" />
+  <Style index="4" name="Heading 5" font="Calibri Light" fontColor="#AC510D" fontSize="12.0" italic="true" spaceBefore="10.0" spaceAfter="0.0" spacing="0.0" applyColors="true" styleType="Heading" />
+  <Style index="5" name="Heading 6" font="Calibri Light" fontColor="#E67832" fontSize="12.0" italic="true" spaceBefore="10.0" spaceAfter="0.0" spacing="0.0" applyColors="true" styleType="Heading" />
+  <Style index="6" name="Page Title" font="Calibri Light" fontColor="#FFFFFF" fontSize="20.0" spaceBefore="0.0" spaceAfter="14.0" spacing="0.0" applyColors="true" styleType="Paragraph" />
+  <Style index="7" name="Citation" font="Calibri" fontColor="#F3F3F3" fontSize="9.0" spaceBefore="0.0" spaceAfter="0.0" spacing="0.0" applyColors="true" styleType="Paragraph" />
+  <Style index="8" name="Quote" font="Calibri" fontColor="#A5A5A5" fontSize="11.0" italic="true" spaceBefore="0.0" spaceAfter="0.0" spacing="0.0" applyColors="true" styleType="Paragraph" />
+  <Style index="9" name="Code" font="Lucida Console" fontColor="#F3F3F3" fontSize="9.0" spaceBefore="0.0" spaceAfter="0.0" spacing="0.0" applyColors="true" styleType="Paragraph" />
+  <Style index="10" name="Normal" font="Calibri" fontColor="#F3F3F3" fontSize="11.0" spaceBefore="0.0" spaceAfter="0.0" spacing="0.0" applyColors="true" styleType="Paragraph" />
+  <Style index="11" name="Strong" font="Calibri" fontColor="#F1F1F1" fontSize="11.0" bold="true" spaceBefore="0.0" spaceAfter="0.0" spacing="0.0" applyColors="true" styleType="Character" />
+  <Style index="12" name="Emphasis" font="Calibri" fontColor="#779DCC" fontSize="11.0" bold="true" italic="true" spaceBefore="0.0" spaceAfter="0.0" spacing="0.0" applyColors="true" styleType="Character" />
+  <Style index="13" name="Intense Emphasis" font="Calibri" fontColor="#C0504D" fontSize="11.0" bold="true" italic="true" spaceBefore="0.0" spaceAfter="0.0" spacing="0.0" applyColors="true" styleType="Character" />
+  <Style index="14" name="Subtle Emphasis" font="Calibri" fontColor="#A3A3A3" fontSize="11.0" italic="true" spaceBefore="0.0" spaceAfter="0.0" spacing="0.0" applyColors="true" styleType="Character" />
+</Theme>
\ No newline at end of file
diff --git a/Themes/OrangeStyles.xml b/Themes/Orange.xml
similarity index 98%
rename from Themes/OrangeStyles.xml
rename to Themes/Orange.xml
index 6a8116fea7..33145c2227 100644
--- a/Themes/OrangeStyles.xml
+++ b/Themes/Orange.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<CustomStyles>
+<Theme name="Orange">
   <Style index="0" name="Heading 1" font="Calibri Light" fontColor="Black" fontSize="20.0" spaceBefore="14.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
   <Style index="1" name="Heading 2" font="Calibri Light" fontColor="#E67832" fontSize="18.0" spaceBefore="14.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
   <Style index="2" name="Heading 3" font="Calibri Light" fontColor="#823D0A" fontSize="16.0" spaceBefore="12.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
@@ -15,4 +15,4 @@
   <Style index="12" name="Emphasis" font="Calibri" fontColor="#4F81BD" fontSize="11.0" bold="true" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
   <Style index="13" name="Intense Emphasis" font="Calibri" fontColor="#C0504D" fontSize="11.0" bold="true" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
   <Style index="14" name="Subtle Emphasis" font="Calibri" fontColor="Gray" fontSize="11.0" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
-</CustomStyles>
+</Theme>
diff --git a/Themes/Standard.xml b/Themes/Standard.xml
new file mode 100644
index 0000000000..d319f18a79
--- /dev/null
+++ b/Themes/Standard.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Theme name="Standard">
+  <Style index="0" name="Heading 1" font="Calibri" fontColor="#1E4E79" fontSize="16.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="1" name="Heading 2" font="Calibri" fontColor="#2E75B5" fontSize="14.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="2" name="Heading 3" font="Calibri" fontColor="#5B9BD5" fontSize="12.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="3" name="Heading 4" font="Calibri" fontColor="#5B9BD5" fontSize="12.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Heading" italic="true" />
+  <Style index="4" name="Heading 5" font="Calibri" fontColor="#2E75B5" fontSize="11.0" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="5" name="Heading 6" font="Calibri" fontColor="#2E75B5" fontSize="11.0" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Heading" />
+  <Style index="6" name="Page Title" font="Calibri Light" fontColor="#000000" fontSize="20.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Paragraph" />
+  <Style index="7" name="Citation" font="Calibri" fontColor="#595959" fontSize="9.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Paragraph" />
+  <Style index="8" name="Quote" font="Calibri" fontColor="#595959" fontSize="11.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Paragraph" italic="true" />
+  <Style index="9" name="Code" font="Consolas" fontColor="Black" fontSize="11.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="false" styleType="Paragraph" />
+  <Style index="10" name="Normal" font="Calibri" fontColor="Black" fontSize="11.0" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Paragraph" />
+  <Style index="11" name="Strong" font="Calibri" fontColor="Black" fontSize="11.0" bold="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
+  <Style index="12" name="Emphasis" font="Calibri" fontColor="#4F81BD" fontSize="11.0" bold="true" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
+  <Style index="13" name="Intense Emphasis" font="Calibri" fontColor="#C0504D" fontSize="11.0" bold="true" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
+  <Style index="14" name="Subtle Emphasis" font="Calibri" fontColor="Gray" fontSize="11.0" italic="true" spaceBefore="0.0" spaceAfter="0.0" applyColors="true" styleType="Character" />
+</Theme>