diff --git a/src/App/App.csproj b/src/App/App.csproj
index 7627feecd..4207c0b6b 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -57,6 +57,9 @@
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
     </Compile>
+    <Compile Update="Styles\Variables.xaml.cs">
+      <DependentUpon>Variables.xaml</DependentUpon>
+    </Compile>
     <Compile Update="Styles\Light.xaml.cs">
       <DependentUpon>Light.xaml</DependentUpon>
     </Compile>
diff --git a/src/App/Styles/Android.xaml b/src/App/Styles/Android.xaml
index 76862af82..51cef2d7e 100644
--- a/src/App/Styles/Android.xaml
+++ b/src/App/Styles/Android.xaml
@@ -4,6 +4,7 @@
                     x:Class="Bit.App.Styles.Android">
     <Style TargetType="Label"
            Class="list-header-platform">
-        
+        <Setter Property="TextColor"
+                Value="{StaticResource ListHeaderTextColor}" />
     </Style>
 </ResourceDictionary>
diff --git a/src/App/Styles/Dark.xaml b/src/App/Styles/Dark.xaml
index 2f6762b99..cb6597405 100644
--- a/src/App/Styles/Dark.xaml
+++ b/src/App/Styles/Dark.xaml
@@ -2,9 +2,10 @@
 <ResourceDictionary xmlns="http://xamarin.com/schemas/2014/forms"
                     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                     x:Class="Bit.App.Styles.Dark">
-    <Style TargetType="Label"
-           Class="list-header-themed">
-        <Setter Property="TextColor"
-                Value="Green" />
-    </Style>
+    <Color x:Key="TextColor">#000000</Color>
+    <Color x:Key="PrimaryColor">#3c8dbc</Color>
+    <Color x:Key="DangerColor">#dd4b39</Color>
+    <Color x:Key="SuccessColor">#00a65a</Color>
+    <Color x:Key="InfoColor">#555555</Color>
+    <Color x:Key="WarningColor">#bf7e16</Color>
 </ResourceDictionary>
diff --git a/src/App/Styles/Light.xaml b/src/App/Styles/Light.xaml
index cfb9582f7..e59776fe0 100644
--- a/src/App/Styles/Light.xaml
+++ b/src/App/Styles/Light.xaml
@@ -2,9 +2,12 @@
 <ResourceDictionary xmlns="http://xamarin.com/schemas/2014/forms"
                     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                     x:Class="Bit.App.Styles.Light">
-    <Style TargetType="Label"
-           Class="list-header-themed">
-        <Setter Property="TextColor"
-                Value="Blue" />
-    </Style>
+    <Color x:Key="TextColor">#000000</Color>
+    <Color x:Key="PrimaryColor">#3c8dbc</Color>
+    <Color x:Key="DangerColor">#dd4b39</Color>
+    <Color x:Key="SuccessColor">#00a65a</Color>
+    <Color x:Key="InfoColor">#555555</Color>
+    <Color x:Key="WarningColor">#bf7e16</Color>
+
+    <Color x:Key="ListHeaderTextColor">#3c8dbc</Color>
 </ResourceDictionary>
diff --git a/src/App/Styles/Variables.xaml b/src/App/Styles/Variables.xaml
new file mode 100644
index 000000000..49b463edf
--- /dev/null
+++ b/src/App/Styles/Variables.xaml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary xmlns="http://xamarin.com/schemas/2014/forms"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                    x:Class="Bit.App.Styles.Variables">
+
+</ResourceDictionary>
diff --git a/src/App/Styles/Variables.xaml.cs b/src/App/Styles/Variables.xaml.cs
new file mode 100644
index 000000000..214142bde
--- /dev/null
+++ b/src/App/Styles/Variables.xaml.cs
@@ -0,0 +1,12 @@
+using Xamarin.Forms;
+
+namespace Bit.App.Styles
+{
+    public partial class Variables : ResourceDictionary
+    {
+        public Variables()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/App/Utilities/ThemeManager.cs b/src/App/Utilities/ThemeManager.cs
index c8f9548c7..a4f1f3240 100644
--- a/src/App/Utilities/ThemeManager.cs
+++ b/src/App/Utilities/ThemeManager.cs
@@ -30,6 +30,19 @@ namespace Bit.App.Utilities
             Application.Current.Resources.Clear();
             Application.Current.Resources.MergedDictionaries.Clear();
 
+            // Variables
+            Application.Current.Resources.MergedDictionaries.Add(new Variables());
+
+            // Themed variables
+            if(name == "dark")
+            {
+                Application.Current.Resources.MergedDictionaries.Add(new Dark());
+            }
+            else
+            {
+                Application.Current.Resources.MergedDictionaries.Add(new Light());
+            }
+
             // Base styles
             Application.Current.Resources.MergedDictionaries.Add(new Base());
 
@@ -42,16 +55,6 @@ namespace Bit.App.Utilities
             {
                 Application.Current.Resources.MergedDictionaries.Add(new iOS());
             }
-
-            // Theme styles
-            if(name == "dark")
-            {
-                Application.Current.Resources.MergedDictionaries.Add(new Dark());
-            }
-            else
-            {
-                Application.Current.Resources.MergedDictionaries.Add(new Light());
-            }
         }
     }
 }