diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981..ba7052b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,17 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/README.md b/README.md
index f2928d8..b801efe 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ allprojects {
 
 ```gradle
 dependencies {
-    compile 'com.github.daniel-stoneuk:material-about-library:2.2.0'
+    compile 'com.github.daniel-stoneuk:material-about-library:2.2.1'
 }
 ```
 
@@ -73,10 +73,10 @@ public class ExampleMaterialAboutActivity extends MaterialAboutActivity {
 
 Ensure that the theme extends either of these themes, and apply primary & accent colours:
 
-- `Theme.Mal.Light` (with dark toolbar)
-- `Theme.Mal.Dark` (with dark toolbar)
-- `Theme.Mal.Light.LightActionBar` (with light toolbar)
-- `Theme.Mal.Dark.LightActionBar` (with light toolbar)
+- `Theme.Mal.Light` (light theme with light toolbar)
+- `Theme.Mal.Light.DarkActionBar` (light theme with dark toolbar)
+- `Theme.Mal.Dark` (dark theme with dark toolbar)
+- `Theme.Mal.Dark.LightActionBar` (dark theme with light toolbar)
 
 ```xml
 <manifest ...>
diff --git a/app/build.gradle b/app/build.gradle
index 8533df0..b61ce09 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 def versionMajor = 2
 def versionMinor = 2
-def versionPatch = 0
+def versionPatch = 1
 def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
 
diff --git a/app/src/main/java/com/danielstone/materialaboutlibrarydemo/ExampleMaterialAboutActivity.java b/app/src/main/java/com/danielstone/materialaboutlibrarydemo/ExampleMaterialAboutActivity.java
index 8321d57..f5677fa 100644
--- a/app/src/main/java/com/danielstone/materialaboutlibrarydemo/ExampleMaterialAboutActivity.java
+++ b/app/src/main/java/com/danielstone/materialaboutlibrarydemo/ExampleMaterialAboutActivity.java
@@ -108,7 +108,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         Log.i("test", "onCreate: " + getIntent().getIntExtra(THEME_EXTRA, THEME_LIGHT_DARKBAR));
         switch (getIntent().getIntExtra(THEME_EXTRA, THEME_LIGHT_DARKBAR)) {
             case THEME_LIGHT_LIGHTBAR:
-                setTheme(R.style.AppTheme_MaterialAboutActivity_Light_LightActionBar);
+                setTheme(R.style.AppTheme_MaterialAboutActivity_Light);
                 colorIcon = R.color.mal_color_icon_light_theme;
                 break;
             case THEME_DARK_LIGHTBAR:
@@ -120,11 +120,11 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 colorIcon = R.color.mal_color_icon_light_theme;
                 break;
             case THEME_DARK_DARKBAR:
-                setTheme(R.style.AppTheme_MaterialAboutActivity_Dark_DarkActionBar);
+                setTheme(R.style.AppTheme_MaterialAboutActivity_Dark);
                 colorIcon = R.color.mal_color_icon_dark_theme;
                 break;
             case THEME_CUSTOM_CARDVIEW:
-                setTheme(R.style.AppTheme_MaterialAboutActivity_Light_CustomCardView);
+                setTheme(R.style.AppTheme_MaterialAboutActivity_Light_DarkActionBar_CustomCardView);
                 colorIcon = R.color.mal_color_icon_dark_theme;
                 break;
         }
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c66c4b1..ef7335e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,7 +13,7 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="AppTheme.MaterialAboutActivity.Dark.DarkActionBar" parent="Theme.Mal.Dark">
+    <style name="AppTheme.MaterialAboutActivity.Dark" parent="Theme.Mal.Dark">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -35,14 +35,14 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
-    <style name="AppTheme.MaterialAboutActivity.Light.DarkActionBar" parent="Theme.Mal.Light">
+    <style name="AppTheme.MaterialAboutActivity.Light.DarkActionBar" parent="Theme.Mal.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
-    <style name="AppTheme.MaterialAboutActivity.Light.CustomCardView" parent="Theme.Mal.Light">
+    <style name="AppTheme.MaterialAboutActivity.Light.DarkActionBar.CustomCardView" parent="Theme.Mal.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -53,7 +53,7 @@
         <item name="mal_color_secondary">#ffe0e0e0</item>
     </style>
 
-    <style name="AppTheme.MaterialAboutActivity.Light.LightActionBar" parent="Theme.Mal.Light.LightActionBar">
+    <style name="AppTheme.MaterialAboutActivity.Light" parent="Theme.Mal.Light">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorLightBar</item>
         <item name="colorPrimaryDark">@color/colorLightStatus</item>
diff --git a/library/build.gradle b/library/build.gradle
index e86d882..8347d69 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -5,7 +5,7 @@ group = 'com.github.daniel-stoneuk'
 
 def versionMajor = 2
 def versionMinor = 2
-def versionPatch = 0
+def versionPatch = 1
 def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
 android {
diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml
index 8162933..3818093 100644
--- a/library/src/main/res/values/styles.xml
+++ b/library/src/main/res/values/styles.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <style name="Theme.Mal.Light" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="mal_toolbarTheme">@style/Theme.Mal.Toolbar.Dark</item>
+        <item name="mal_toolbarTheme">@style/Theme.Mal.Toolbar.Light</item>
         <item name="mal_toolbarPopupTheme">@style/Theme.Mal.Toolbar.Light</item>
         <item name="mal_color_primary">@color/mal_text_primary</item>
         <item name="mal_color_secondary">@color/mal_text_secondary</item>
@@ -21,8 +21,8 @@
         <item name="mal_toolbarTheme">@style/Theme.Mal.Toolbar.Light</item>
     </style>
 
-    <style name="Theme.Mal.Light.LightActionBar">
-        <item name="mal_toolbarTheme">@style/Theme.Mal.Toolbar.Light</item>
+    <style name="Theme.Mal.Light.DarkActionBar">
+        <item name="mal_toolbarTheme">@style/Theme.Mal.Toolbar.Dark</item>
     </style>
 
     <style name="Theme.Mal.Toolbar.Light" parent="ThemeOverlay.AppCompat.Light" />