diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/DropShadowPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/DropShadowPanel.Metadata.cs
index 465f4ee8568..103040c42b4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/DropShadowPanel.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/DropShadowPanel.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Features;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ImageEx.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ImageEx.Metadata.cs
index 4ed95742ede..15707e9b6eb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ImageEx.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ImageEx.Metadata.cs
@@ -4,7 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/InAppNotification.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/InAppNotification.Metadata.cs
index bedee7bf898..0127ac9ffff 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/InAppNotification.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/InAppNotification.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Loading.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Loading.Metadata.cs
index b4756b1458f..c2d460649c2 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Loading.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Loading.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Menu.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Menu.Metadata.cs
index dd443d9a843..244c0eaf1da 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Menu.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Menu.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MenuItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MenuItem.Metadata.cs
index 7bfdfbcb4ee..84a334cf8b9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MenuItem.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MenuItem.Metadata.cs
@@ -4,7 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialProgressBar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialProgressBar.Metadata.cs
index f66d1cbadba..968fd46da15 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialProgressBar.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialProgressBar.Metadata.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.ComponentModel;
+
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Features;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
@@ -27,8 +28,8 @@ public RadialProgressBarMetadata()
                 b =>
                 {
                     b.AddCustomAttributes(new FeatureAttribute(typeof(RadialProgressBarDefaults)));
-                    b.AddCustomAttributes(nameof(RadialProgressBar.Thickness), new CategoryAttribute(Properties.Resources.CategoryAppearance));
-                    b.AddCustomAttributes(nameof(RadialProgressBar.Outline), new CategoryAttribute(Properties.Resources.CategoryBrush));
+                    b.AddCustomAttributes(nameof(RadialProgressBar.Thickness), new CategoryAttribute(Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(RadialProgressBar.Outline), new CategoryAttribute(Resources.CategoryBrush));
                     b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
                 }
             );
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RotatorTile.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RotatorTile.Metadata.cs
index f0245a5e99a..4fce34d1985 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RotatorTile.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RotatorTile.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ScrollHeader.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ScrollHeader.Metadata.cs
index a68a70a884d..781c618344b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ScrollHeader.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ScrollHeader.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBar.Metadata.cs
index 1bfc74980d1..d5efb16330d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBar.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBar.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBarItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBarItem.Metadata.cs
index ce7bcb9cbb8..003e003f530 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBarItem.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBarItem.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TextToolbar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TextToolbar.Metadata.cs
index f7cbb5eead2..f19f4173cb2 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TextToolbar.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TextToolbar.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TileControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TileControl.Metadata.cs
index 1a031992908..c5c27ad364a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TileControl.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TileControl.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Menu.icon.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Menu.icon.png
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/RotatorTile.icon.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/RotatorTile.icon.png
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
index 2db5364050f..739b1a13031 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs
index 41c23ec3c57..40ec3d38bfb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design {
     using System;
 
 
@@ -39,7 +39,7 @@ internal Resources() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
index aebeca63726..78c5e1d99bc 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
@@ -1,63 +1,4 @@
 <root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw
index a0a326287fb..9e3afbecdd9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw
@@ -1,63 +1,4 @@
 <root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs
index 356f25a1a12..cf30241c524 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.ComponentModel;
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
 
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Features;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj
index e54f0629e60..a557163fb2b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.Designer.cs
index 7c899168811..64e5efde430 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.Designer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design {
     using System;
 
 
@@ -39,7 +39,7 @@ internal Resources() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.resx
index a473b65f20d..c70d98fd662 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.resx
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.resx
@@ -1,63 +1,4 @@
 <root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs
index 8e5c4847812..0f8db860e03 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs
@@ -230,7 +230,7 @@ protected override string GetNameCore()
                 }
             }
 
-            string name = UI.Controls.Properties.Resources.DataGridRowAutomationPeer_ItemType;
+            string name = UI.Controls.Resources.DataGridRowAutomationPeer_ItemType;
 #if DEBUG_AUTOMATION
             System.Diagnostics.Debug.WriteLine("DataGridItemAutomationPeer.GetNameCore returns " + name);
 #endif
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs
index 5880dc4ea4f..e28b29b3254 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs
@@ -56,7 +56,7 @@ protected override string GetItemTypeCore()
                 return itemType;
             }
 
-            return UI.Controls.Properties.Resources.DataGridRowAutomationPeer_ItemType;
+            return UI.Controls.Resources.DataGridRowAutomationPeer_ItemType;
         }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
index 35814fff6fb..fcff002c18c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
@@ -409,7 +409,7 @@ public DataGrid()
             _loadedRows = new List<DataGridRow>();
             _lostFocusActions = new Queue<Action>();
             _selectedItems = new DataGridSelectedItemsCollection(this);
-            _rowGroupHeaderPropertyNameAlternative = Properties.Resources.DefaultRowGroupHeaderPropertyNameAlternative;
+            _rowGroupHeaderPropertyNameAlternative = Controls.Resources.DefaultRowGroupHeaderPropertyNameAlternative;
             _rowGroupHeaderStyles = new ObservableCollection<Style>();
             _rowGroupHeaderStyles.CollectionChanged += RowGroupHeaderStyles_CollectionChanged;
             _rowGroupHeaderStylesOld = new List<Style>();
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRowGroupHeader.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRowGroupHeader.cs
index 0cf50f304e5..aa3e8915bee 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRowGroupHeader.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRowGroupHeader.cs
@@ -656,7 +656,7 @@ internal void UpdateTitleElements()
 
                 if (!string.IsNullOrEmpty(propertyName) && hasPropertyValue)
                 {
-                    propertyName = string.Format(CultureInfo.CurrentCulture, Properties.Resources.DataGridRowGroupHeader_PropertyName, propertyName);
+                    propertyName = string.Format(CultureInfo.CurrentCulture, Controls.Resources.DataGridRowGroupHeader_PropertyName, propertyName);
                 }
 
                 if (!string.IsNullOrEmpty(propertyName))
@@ -674,7 +674,7 @@ internal void UpdateTitleElements()
             {
                 _itemCountElement.Text = string.Format(
                     CultureInfo.CurrentCulture,
-                    this.RowGroupInfo.CollectionViewGroup.GroupItems.Count == 1 ? Properties.Resources.DataGridRowGroupHeader_ItemCountSingular : Properties.Resources.DataGridRowGroupHeader_ItemCountPlural,
+                    this.RowGroupInfo.CollectionViewGroup.GroupItems.Count == 1 ? Controls.Resources.DataGridRowGroupHeader_ItemCountSingular : Controls.Resources.DataGridRowGroupHeader_ItemCountPlural,
                     this.RowGroupInfo.CollectionViewGroup.GroupItems.Count);
             }
         }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj
index 6552d8fcd47..0ab3e6b27bf 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj
@@ -13,19 +13,19 @@
     <PackageTags>Controls;XAML;UI;Data;Grid;DataGrid</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <CustomToolNamespace>$(RootNamespace)</CustomToolNamespace>
+      <!-- The 'ManifestResourceName' metadata changes the default manifest naming scheme -->
+      <ManifestResourceName>$(RootNamespace).%(Filename)</ManifestResourceName>
     </EmbeddedResource>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <Import Project="$(BuildToolsDirectory)Windows.Toolkit.UWP.Controls.targets" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/Resources.Designer.cs
index 7d11e0900e5..a1f6410b339 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/Resources.Designer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Properties {
+namespace Microsoft.Toolkit.Uwp.UI.Controls {
     using System;
     using System.Reflection;
 
@@ -40,7 +40,7 @@ internal Resources() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Properties.Resources", typeof(Resources).GetTypeInfo().Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Resources", typeof(Resources).GetTypeInfo().Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/Resources.resx
index ddf71b962b2..5c753f2ed9a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/Resources.resx
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/Resources.resx
@@ -1,63 +1,4 @@
 <root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RadialGauge.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RadialGauge.Metadata.cs
index f96249d9990..b40ae91e714 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RadialGauge.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RadialGauge.Metadata.cs
@@ -28,27 +28,27 @@ public RadialGaugeMetadata()
                 b =>
                 {
                     b.AddCustomAttributes(new FeatureAttribute(typeof(RadialGaugeDefaults)));
-                    b.AddCustomAttributes(nameof(RadialGauge.Minimum), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(RadialGauge.Maximum), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(RadialGauge.StepSize), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(RadialGauge.IsInteractive), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(RadialGauge.ScaleWidth), new CategoryAttribute(Properties.Resources.CategoryAppearance));
-                    b.AddCustomAttributes(nameof(RadialGauge.NeedleBrush), new CategoryAttribute(Properties.Resources.CategoryBrush));
-                    b.AddCustomAttributes(nameof(RadialGauge.Value), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(RadialGauge.Unit), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(RadialGauge.TrailBrush), new CategoryAttribute(Properties.Resources.CategoryBrush));
-                    b.AddCustomAttributes(nameof(RadialGauge.ScaleBrush), new CategoryAttribute(Properties.Resources.CategoryBrush));
-                    b.AddCustomAttributes(nameof(RadialGauge.TickBrush), new CategoryAttribute(Properties.Resources.CategoryBrush));
-                    b.AddCustomAttributes(nameof(RadialGauge.ValueStringFormat), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(RadialGauge.TickSpacing), new CategoryAttribute(Properties.Resources.CategoryAppearance));
-                    b.AddCustomAttributes(nameof(RadialGauge.NeedleLength), new CategoryAttribute(Properties.Resources.CategoryAppearance));
-                    b.AddCustomAttributes(nameof(RadialGauge.NeedleWidth), new CategoryAttribute(Properties.Resources.CategoryAppearance));
-                    b.AddCustomAttributes(nameof(RadialGauge.ScalePadding), new CategoryAttribute(Properties.Resources.CategoryAppearance));
-                    b.AddCustomAttributes(nameof(RadialGauge.ScaleTickWidth), new CategoryAttribute(Properties.Resources.CategoryAppearance));
-                    b.AddCustomAttributes(nameof(RadialGauge.TickWidth), new CategoryAttribute(Properties.Resources.CategoryAppearance));
-                    b.AddCustomAttributes(nameof(RadialGauge.TickLength), new CategoryAttribute(Properties.Resources.CategoryAppearance));
-                    b.AddCustomAttributes(nameof(RadialGauge.MinAngle), new CategoryAttribute(Properties.Resources.CategoryAppearance));
-                    b.AddCustomAttributes(nameof(RadialGauge.MaxAngle), new CategoryAttribute(Properties.Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(RadialGauge.Minimum), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RadialGauge.Maximum), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RadialGauge.StepSize), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RadialGauge.IsInteractive), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RadialGauge.ScaleWidth), new CategoryAttribute(Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(RadialGauge.NeedleBrush), new CategoryAttribute(Resources.CategoryBrush));
+                    b.AddCustomAttributes(nameof(RadialGauge.Value), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RadialGauge.Unit), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RadialGauge.TrailBrush), new CategoryAttribute(Resources.CategoryBrush));
+                    b.AddCustomAttributes(nameof(RadialGauge.ScaleBrush), new CategoryAttribute(Resources.CategoryBrush));
+                    b.AddCustomAttributes(nameof(RadialGauge.TickBrush), new CategoryAttribute(Resources.CategoryBrush));
+                    b.AddCustomAttributes(nameof(RadialGauge.ValueStringFormat), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RadialGauge.TickSpacing), new CategoryAttribute(Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(RadialGauge.NeedleLength), new CategoryAttribute(Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(RadialGauge.NeedleWidth), new CategoryAttribute(Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(RadialGauge.ScalePadding), new CategoryAttribute(Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(RadialGauge.ScaleTickWidth), new CategoryAttribute(Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(RadialGauge.TickWidth), new CategoryAttribute(Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(RadialGauge.TickLength), new CategoryAttribute(Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(RadialGauge.MinAngle), new CategoryAttribute(Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(RadialGauge.MaxAngle), new CategoryAttribute(Resources.CategoryAppearance));
                     b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
                 }
             );
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RangeSelector.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RangeSelector.Metadata.cs
index 663ea36dbaf..9f867d5368e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RangeSelector.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RangeSelector.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs
index 3b3bc0c3e34..052595e473f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj
index 3d09eb7086b..8c86644d51c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs
index 982edc0b1b2..6ec38c66457 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design {
     using System;
 
 
@@ -39,7 +39,7 @@ internal Resources() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.resx
index d4fd5c22e59..b3afabd65f4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.resx
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.resx
@@ -1,63 +1,4 @@
 <root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Strings/en-US/Resources.resw
index 4dc3f5eda86..4cc9b7f4b52 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Strings/en-US/Resources.resw
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Strings/en-US/Resources.resw
@@ -1,63 +1,4 @@
 <root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeItem.Metadata.cs
index e2a172bf8d6..cc66dd01d66 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeItem.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeItem.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeView.Metadata.cs
index 98bd4f11c78..1637fa1d405 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeView.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeView.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Carousel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Carousel.Metadata.cs
index abe6569fdb1..c1ef3d02928 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Carousel.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Carousel.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Expander.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Expander.Metadata.cs
index 00f6022adef..c7aa123c515 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Expander.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Expander.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/GridSplitter.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/GridSplitter.Metadata.cs
index ee43845355b..cfc9fc1fa0e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/GridSplitter.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/GridSplitter.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/LayoutTransitionControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/LayoutTransitionControl.Metadata.cs
index cac77662452..39f41ee44e1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/LayoutTransitionControl.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/LayoutTransitionControl.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs
index 45bba363e2f..e05acd7a980 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs
@@ -2,10 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
+using System.ComponentModel;
+
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
-using System.ComponentModel;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
 {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/OrbitView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/OrbitView.Metadata.cs
index d35fc1655d0..677aabd62a6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/OrbitView.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/OrbitView.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj
index d394a24fab3..134f74a4360 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs
index 982edc0b1b2..6ec38c66457 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design {
     using System;
 
 
@@ -39,7 +39,7 @@ internal Resources() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.resx
index d4fd5c22e59..b3afabd65f4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.resx
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.resx
@@ -1,63 +1,4 @@
 <root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Strings/en-US/Resources.resw
index 3a200ca0aa7..49a13464e39 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Strings/en-US/Resources.resw
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Strings/en-US/Resources.resw
@@ -1,63 +1,4 @@
 <root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs
index bee99ed2b25..6086789661c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs
@@ -4,7 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj
index 01340cfae86..fd234f49074 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.Designer.cs
index 80f9e154d4e..769043c95f9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.Designer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design {
     using System;
 
 
@@ -39,7 +39,7 @@ internal Resources() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.resx
index 91cafcbd071..08eea8a61f3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.resx
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.resx
@@ -1,63 +1,4 @@
 <root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj
index a2a931cea64..1d1da3892d0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs
index 35acb0b25a0..e15099efc90 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design {
     using System;
 
 
@@ -39,7 +39,7 @@ internal Resources() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx
index 6d2e88846dd..1259dd097e6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx
@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/AdaptiveGridView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/AdaptiveGridView.Metadata.cs
index 32662e780db..70802067aac 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/AdaptiveGridView.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/AdaptiveGridView.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/WrapPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/WrapPanel.Metadata.cs
index 1e1279d338e..09d165ad36c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/WrapPanel.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/WrapPanel.Metadata.cs
@@ -4,8 +4,6 @@
 
 using System.ComponentModel;
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
index 51ff1a1233e..f06b09cf7e6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs
index eb4fa4dc725..539da38f1e6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design {
     using System;
 
 
@@ -39,7 +39,7 @@ internal Resources() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx
index 2e4f8688cc5..55496358de1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx
@@ -1,63 +1,4 @@
 <root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/UnitTests/UnitTests.UWP/Strings/en-us/Resources.resw b/UnitTests/UnitTests.UWP/Strings/en-us/Resources.resw
index 73f830849af..baf5ba8ce29 100644
--- a/UnitTests/UnitTests.UWP/Strings/en-us/Resources.resw
+++ b/UnitTests/UnitTests.UWP/Strings/en-us/Resources.resw
@@ -1,63 +1,4 @@
 <root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/UnitTests/UnitTests.UWP/Strings/fr/Resources.resw b/UnitTests/UnitTests.UWP/Strings/fr/Resources.resw
index 60a5ba8da41..14cc753c3ae 100644
--- a/UnitTests/UnitTests.UWP/Strings/fr/Resources.resw
+++ b/UnitTests/UnitTests.UWP/Strings/fr/Resources.resw
@@ -1,63 +1,4 @@
 <root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/Strings/en-us/Resources.resw b/UnitTests/UnitTests.XamlIslands.UWPApp/Strings/en-us/Resources.resw
index 2ba42d93968..5493a47cd16 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/Strings/en-us/Resources.resw
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/Strings/en-us/Resources.resw
@@ -1,63 +1,4 @@
 <root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/build/Windows.Toolkit.VisualStudio.Design.props b/build/Windows.Toolkit.VisualStudio.Design.props
index be20674e59f..06432dfc837 100644
--- a/build/Windows.Toolkit.VisualStudio.Design.props
+++ b/build/Windows.Toolkit.VisualStudio.Design.props
@@ -12,17 +12,13 @@
     <EmbeddedResourceUseDependentUponConvention>True</EmbeddedResourceUseDependentUponConvention>
     <ParentTargetFramework>uap$(TargetPlatformBaseVersion).$(TargetPlatformMinRevision)</ParentTargetFramework>
     <ParentProjectName>$(MSBuildProjectName.Remove($(MSBuildProjectName.LastIndexOf('.'))))</ParentProjectName>
-    <!-- Strip root namespace from strings like "Microsoft.Toolkit.Uwp.UI.Controls.Primitives" to just "Primitives" -->
-    <ParentProjectType>$(ParentProjectName.Remove(0, $([MSBuild]::Add($(ParentProjectName.LastIndexOf('.')), '1'))))</ParentProjectType>
   </PropertyGroup>
 
   <ItemGroup>
     <AppDesigner Include="Properties\"/>
-    <EmbeddedResource Include="Icons\$(ParentProjectName).*.icon.png"/>
-    <EmbeddedResource Include="$(ParentProjectOutputPath)$(ParentProjectName).xml">
-      <Link>$(ParentProjectType).xml</Link>
-      <Visible>False</Visible>
-    </EmbeddedResource>
+      <!-- The 'LogicalName' metadata changes the default manifest naming scheme -->
+    <EmbeddedResource Include="Icons\*.icon.png" LogicalName="$(ParentProjectRootNamespace).%(Filename)%(Extension)"/>
+    <EmbeddedResource Include="$(ParentProjectOutputPath)$(ParentProjectName).xml" LinkBase="Properties\" LogicalName="%(Filename)%(Extension)"/>
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/build/Windows.Toolkit.VisualStudio.Design.targets b/build/Windows.Toolkit.VisualStudio.Design.targets
index 4c389fa9cd8..83d83552d6b 100644
--- a/build/Windows.Toolkit.VisualStudio.Design.targets
+++ b/build/Windows.Toolkit.VisualStudio.Design.targets
@@ -1,10 +1,30 @@
 <Project>
 
   <PropertyGroup>
+    <ParentProjectRootNamespace>$(RootNamespace.Remove($(RootNamespace.LastIndexOf('.'))))</ParentProjectRootNamespace>
     <ParentProjectOutputPath>..\$(ParentProjectName)\bin\$(Configuration)\$(ParentTargetFramework)\</ParentProjectOutputPath>
     <OutputPath>$(ParentProjectOutputPath)Design\</OutputPath>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(EnableDefaultEmbeddedResourceItems)' == 'True'">
+    <EmbeddedResourceUseDependentUponConvention>True</EmbeddedResourceUseDependentUponConvention>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(EnableDefaultEmbeddedResourceItems)' == 'True' AND '$(EmbeddedResourceUseDependentUponConvention)' == 'True'">
+    <EmbeddedResource Update="**\*.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <CustomToolNamespace>$(RootNamespace)</CustomToolNamespace>
+      <!-- The 'ManifestResourceName' metadata changes the default manifest naming scheme -->
+      <ManifestResourceName>$(RootNamespace).%(Filename)</ManifestResourceName>
+    </EmbeddedResource>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
   <ItemGroup Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">
     <ProjectReference Include="..\$(ParentProjectName)\$(ParentProjectName)$(MSBuildProjectExtension)">
       <Private>False</Private>