diff --git a/MatterControlLib/ConfigurationPage/ApplicationSettings/ThemeColorPanel.cs b/MatterControlLib/ConfigurationPage/ApplicationSettings/ThemeColorPanel.cs
index 93d3b11d6..035e5d5a6 100644
--- a/MatterControlLib/ConfigurationPage/ApplicationSettings/ThemeColorPanel.cs
+++ b/MatterControlLib/ConfigurationPage/ApplicationSettings/ThemeColorPanel.cs
@@ -139,7 +139,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage
 						themeset = provider.GetTheme(themeName);
 					}
 
-					previewContainer.AddChild(new ThemePreviewButton(themeset, this)
+					var previewColumn = new FlowLayoutWidget(FlowDirection.TopToBottom);
+					previewContainer.AddChild(previewColumn);
+
+					previewColumn.AddChild(new ThemePreviewButton(themeset, this)
 					{
 						HAnchor = HAnchor.Absolute,
 						VAnchor = VAnchor.Absolute,
@@ -148,7 +151,19 @@ namespace MatterHackers.MatterControl.ConfigurationPage
 						Mode = themeName,
 						Border = 1,
 						BorderColor = theme.BorderColor20,
-						Margin = theme.DefaultContainerPadding
+						Margin = new BorderDouble(theme.DefaultContainerPadding, 0, theme.DefaultContainerPadding, theme.DefaultContainerPadding)
+					});
+
+					string name = themeset.Name;
+					if (string.IsNullOrEmpty(name))
+					{
+						name = themeset.ThemeID.Replace("-", " ");
+					}
+
+					previewColumn.AddChild(new TextWidget(name, pointSize: theme.FontSize7, textColor: theme.Colors.PrimaryTextColor)
+					{
+						HAnchor = HAnchor.Left,
+						Margin = new BorderDouble(12, 2)
 					});
 
 					if (themeName == AppContext.ThemeSet.ThemeID)
diff --git a/StaticData/Themes/System/Classic/Classic-Dark.json b/StaticData/Themes/System/Classic/Classic-Dark.json
index c4df9f1c7..2cb606ac1 100644
--- a/StaticData/Themes/System/Classic/Classic-Dark.json
+++ b/StaticData/Themes/System/Classic/Classic-Dark.json
@@ -1,5 +1,5 @@
 {
-  "ThemeName": "Classic Dark",
+  "Name": "Classic Dark",
   "AccentColors": [
     "#AC193D",
     "#DC4FAD",
diff --git a/StaticData/Themes/System/Classic/Classic-Light.json b/StaticData/Themes/System/Classic/Classic-Light.json
index aef473b11..6d6795df7 100644
--- a/StaticData/Themes/System/Classic/Classic-Light.json
+++ b/StaticData/Themes/System/Classic/Classic-Light.json
@@ -1,5 +1,5 @@
 {
-  "ThemeName": "Classic Light",
+  "Name": "Classic Light",
   "AccentColors": [
     "#AC193D",
     "#DC4FAD",
diff --git a/StaticData/Themes/System/Modern/Modern-Dark.json b/StaticData/Themes/System/Modern/Modern-Dark.json
index 4b114f3c7..b8f3f5c27 100644
--- a/StaticData/Themes/System/Modern/Modern-Dark.json
+++ b/StaticData/Themes/System/Modern/Modern-Dark.json
@@ -1,5 +1,5 @@
 {
-  "ThemeName": "Modern Dark",
+  "Name": "Modern Dark",
   "AccentColors": [
     "#B58900",
     "#CB4B16",
diff --git a/StaticData/Themes/System/Solarized/Solarized-Dark.json b/StaticData/Themes/System/Solarized/Solarized-Dark.json
index 71267eaea..6091a4b29 100644
--- a/StaticData/Themes/System/Solarized/Solarized-Dark.json
+++ b/StaticData/Themes/System/Solarized/Solarized-Dark.json
@@ -1,5 +1,5 @@
 {
-  "ThemeName": "Solarized Dark",
+  "Name": "Solarized Dark",
   "AccentColors": [
     "#B58900",
     "#CB4B16",
diff --git a/StaticData/Themes/System/Solarized/Solarized-Light.json b/StaticData/Themes/System/Solarized/Solarized-Light.json
index 3056d0b6a..9d4370049 100644
--- a/StaticData/Themes/System/Solarized/Solarized-Light.json
+++ b/StaticData/Themes/System/Solarized/Solarized-Light.json
@@ -1,5 +1,5 @@
 {
-  "ThemeName": "Solarized Light",
+  "Name": "Solarized Light",
   "AccentColors": [
     "#B58900",
     "#CB4B16",