Apply the new schema for changing the Telerik brushes in the Map control.

Controls/Map/Map.UWP/Themes/Generic.xaml

@@ -1,24 +1,22 @@
 <ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:telerikDrawing="using:Telerik.UI.Drawing"
     xmlns:local="using:Telerik.UI.Xaml.Controls.Map"
-    xmlns:localPrimitives="using:Telerik.UI.Xaml.Controls.Map.Primitives"
-        xmlns:theming="using:Telerik.UI.Xaml.Controls"
-    xmlns:telerikDrawing="using:Telerik.UI.Drawing">
+    xmlns:localPrimitives="using:Telerik.UI.Xaml.Controls.Map.Primitives">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Dark" Source="ms-appx:///Telerik.UI.Xaml.Map.UWP/Themes/ThemeResourcesDark.xaml"/>
+                <ResourceDictionary x:Key="Default" Source="ms-appx:///Telerik.UI.Xaml.Map.UWP/Themes/ThemeResourcesDark.xaml"/>
                 <ResourceDictionary x:Key="Light" Source="ms-appx:///Telerik.UI.Xaml.Map.UWP/Themes/ThemeResourcesLight.xaml"/>
                 <ResourceDictionary x:Key="HighContrast" Source="ms-appx:///Telerik.UI.Xaml.Map.UWP/Themes/ThemeResourcesHighContrast.xaml"/>
             </ResourceDictionary.ThemeDictionaries>
         </ResourceDictionary>
 
         <ResourceDictionary>
-            <theming:UserThemeResources x:Key="ResourceLoaderInitializer"/>
             <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Dark" Source="{CustomResource DarkResourcesPath}"/>
+                <ResourceDictionary x:Key="Default" Source="{CustomResource DarkResourcesPath}"/>
                 <ResourceDictionary x:Key="Light" Source="{CustomResource LightResourcesPath}"/>
                 <ResourceDictionary x:Key="HighContrast" Source="{CustomResource HighContrastResourcesPath}"/>
             </ResourceDictionary.ThemeDictionaries>

Controls/Map/Map.UWP/Themes/ThemeResourcesDark.xaml

@@ -3,6 +3,16 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:telerik="using:Telerik.UI.Xaml.Controls">
 
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="ms-appx:///Telerik.UI.Xaml.Primitives.UWP/Themes/ThemeColorsDark.xaml"/>
+        <ResourceDictionary>
+            <telerik:UserThemeResources x:Key="ResourceLoaderInitializer"/>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="{CustomResource DarkResourcesPath}"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </ResourceDictionary.MergedDictionaries>
+
     <SolidColorBrush x:Key="TelerikMapBackgroundBrush" Color="#FF373737"/>
     <SolidColorBrush x:Key="TelerikMapBorderBrush" Color="Transparent"/>
 
@@ -21,10 +31,4 @@
     <SolidColorBrush x:Key="TelerikMapToolTipForeground" Color="#FFDEDEDE" />
     <SolidColorBrush x:Key="TelerikMapToolTipBackground" Color="#FF262626" />
 
-    <telerik:UserThemeResources x:Key="ResourceLoaderInitializer"/>
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="{CustomResource DarkResourcesPath}"/>
-    </ResourceDictionary.MergedDictionaries>
-
 </ResourceDictionary>

Controls/Map/Map.UWP/Themes/ThemeResourcesHighContrast.xaml

@@ -3,6 +3,16 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:telerik="using:Telerik.UI.Xaml.Controls">
 
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="ms-appx:///Telerik.UI.Xaml.Primitives.UWP/Themes/ThemeColorsDark.xaml"/>
+        <ResourceDictionary>
+            <telerik:UserThemeResources x:Key="ResourceLoaderInitializer"/>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="{CustomResource HighContrastResourcesPath}"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </ResourceDictionary.MergedDictionaries>
+
     <SolidColorBrush x:Key="TelerikMapBackgroundBrush" Color="{ThemeResource SystemColorWindowColor}"/>
     <SolidColorBrush x:Key="TelerikMapBorderBrush" Color="{ThemeResource SystemColorButtonTextColor}"/>
 
@@ -21,10 +31,4 @@
     <SolidColorBrush x:Key="TelerikMapToolTipForeground" Color="{ThemeResource SystemColorButtonTextColor}" />
     <SolidColorBrush x:Key="TelerikMapToolTipBackground" Color="{ThemeResource SystemColorWindowColor}" />
 
-    <telerik:UserThemeResources x:Key="ResourceLoaderInitializer"/>
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="{CustomResource HighContrastResourcesPath}"/>
-    </ResourceDictionary.MergedDictionaries>
-
 </ResourceDictionary>

Controls/Map/Map.UWP/Themes/ThemeResourcesLight.xaml

@@ -3,6 +3,17 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:telerik="using:Telerik.UI.Xaml.Controls">
 
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="ms-appx:///Telerik.UI.Xaml.Primitives.UWP/Themes/ThemeColorsDark.xaml"/>
+        <ResourceDictionary>
+            <telerik:UserThemeResources x:Key="ResourceLoaderInitializer"/>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="{CustomResource LightResourcesPath}"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </ResourceDictionary.MergedDictionaries>
+
+
     <SolidColorBrush x:Key="TelerikMapBackgroundBrush" Color="#FFFFFFFF"/>
     <SolidColorBrush x:Key="TelerikMapBorderBrush" Color="#FFF0F0F0"/>
 
@@ -21,10 +32,4 @@
     <SolidColorBrush x:Key="TelerikMapToolTipForeground" Color="#FFDEDEDE" />
     <SolidColorBrush x:Key="TelerikMapToolTipBackground" Color="#FF262626" />
 
-    <telerik:UserThemeResources x:Key="ResourceLoaderInitializer"/>
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="{CustomResource LightResourcesPath}"/>
-    </ResourceDictionary.MergedDictionaries>
-
 </ResourceDictionary>