diff --git a/res/layout/full_playback.xml b/res/layout/full_playback.xml
index ed06698c..0f6abcf3 100644
--- a/res/layout/full_playback.xml
+++ b/res/layout/full_playback.xml
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:vanilla="http://schemas.android.com/apk/res/ch.blinkenlights.android.vanilla" >
+       xmlns:vanilla="http://schemas.android.com/apk/res-auto" >
 	<ch.blinkenlights.android.vanilla.CoverView
 		android:id="@+id/cover_view"
 		android:layout_height="fill_parent"
diff --git a/res/layout/full_playback_alt.xml b/res/layout/full_playback_alt.xml
index 3d0d15e0..406eb68c 100644
--- a/res/layout/full_playback_alt.xml
+++ b/res/layout/full_playback_alt.xml
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:vanilla="http://schemas.android.com/apk/res/ch.blinkenlights.android.vanilla" >
+       xmlns:vanilla="http://schemas.android.com/apk/res-auto" >
 	<ch.blinkenlights.android.vanilla.CoverView
 		android:id="@+id/cover_view"
 		android:layout_height="fill_parent"
diff --git a/res/layout/library_content.xml b/res/layout/library_content.xml
index 5e3a55c7..f0cae285 100644
--- a/res/layout/library_content.xml
+++ b/res/layout/library_content.xml
@@ -22,7 +22,7 @@ THE SOFTWARE.
 -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:vanilla="http://schemas.android.com/apk/res/ch.blinkenlights.android.vanilla" >
+       xmlns:vanilla="http://schemas.android.com/apk/res-auto" >
 	<LinearLayout
 		xmlns:android="http://schemas.android.com/apk/res/android"
 		android:id="@+id/content"