--- a/Messaging/Server/App.xaml	Thu Mar 22 08:42:03 2012 +0000
+++ b/Messaging/Server/App.xaml	Tue Mar 27 16:15:45 2012 +0100
@@ -10,36 +10,14 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/Elysium.Theme;component/Themes/Generic.xaml" />
+                <ResourceDictionary Source="/Common;component/Themes/MetroColours.xaml" />
+                <ResourceDictionary Source="/Common;component/Themes/Generic.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <!--  Bug in .Net 4: http://connect.microsoft.com/VisualStudio/feedback/details/555322/global-wpf-styles-are-not-shown-when-using-2-levels-of-references  -->
             <Style TargetType="{x:Type Window}" />
             <local:Locator x:Key="Locator" d:IsDataSource="True" />
-            <Color x:Key="MetroMagenta">#FF0097</Color>
-            <Color x:Key="MetroPurple">#A200FF</Color>
-            <Color x:Key="MetroTeal">#00ABA9</Color>
-            <Color x:Key="MetroLime">#8CBF26</Color>
-            <Color x:Key="MetroBrown">#996600</Color>
-            <Color x:Key="MetroPink">#FF0097</Color>
-            <Color x:Key="MetroOrange">#F09609</Color>
-            <Color x:Key="MetroBlue">#1BA1E2</Color>
-            <Color x:Key="MetroLightBlue">#FFB2E0F4</Color>
-            <Color x:Key="MetroRed">#E51400</Color>
-            <Color x:Key="MetroGreen">#339933</Color>
-            <Color x:Key="MetroGray">#FFF2F2F2</Color>
-            <SolidColorBrush x:Key="MetroMagentaBrush" Color="{StaticResource MetroMagenta}" />
-            <SolidColorBrush x:Key="MetroPurpleBrush" Color="{StaticResource MetroPurple}" />
-            <SolidColorBrush x:Key="MetroTealBrush" Color="{StaticResource MetroTeal}" />
-            <SolidColorBrush x:Key="MetroLimeBrush" Color="{StaticResource MetroLime}" />
-            <SolidColorBrush x:Key="MetroBrownBrush" Color="{StaticResource MetroBrown}" />
-            <SolidColorBrush x:Key="MetroPinkBrush" Color="{StaticResource MetroPink}" />
-            <SolidColorBrush x:Key="MetroOrangeBrush" Color="{StaticResource MetroOrange}" />
-            <SolidColorBrush x:Key="MetroBlueBrush" Color="{StaticResource MetroBlue}" />
-            <SolidColorBrush x:Key="MetroLightBlueBrush" Color="{StaticResource MetroLightBlue}" />
-            <SolidColorBrush x:Key="MetroRedBrush" Color="{StaticResource MetroRed}" />
-            <SolidColorBrush x:Key="MetroGreenBrush" Color="{StaticResource MetroGreen}" />
-            <SolidColorBrush x:Key="MetroGrayBrush" Color="{StaticResource MetroGray}" />
 
-            <BitmapImage x:Key="Mail" UriSource="pack://application:,,,/Common;component/Icons/Mail.png" />
+            <Image x:Key="Mail" Source="pack://application:,,,/Common;component/Icons/mail.png" />
 
         </ResourceDictionary>
     </Application.Resources>