diff --git a/res/layout/actionbar_controls.xml b/res/layout/actionbar_controls.xml
index 947c64f6..60b40a97 100644
--- a/res/layout/actionbar_controls.xml
+++ b/res/layout/actionbar_controls.xml
@@ -20,7 +20,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
-<org.kreed.vanilla.ActionBarControls
+<ch.blinkenlights.android.vanilla.ActionBarControls
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:background="@drawable/selectable_item_bg"
 	android:clickable="true">
@@ -55,4 +55,4 @@ THE SOFTWARE.
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content" />
 	</LinearLayout>
-</org.kreed.vanilla.ActionBarControls>
+</ch.blinkenlights.android.vanilla.ActionBarControls>
diff --git a/res/layout/full_playback.xml b/res/layout/full_playback.xml
index 31b0503b..309b0e23 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">
-	<org.kreed.vanilla.CoverView
+	<ch.blinkenlights.android.vanilla.CoverView
 		android:id="@+id/cover_view"
 		android:layout_height="fill_parent"
 		android:layout_width="fill_parent" />
diff --git a/res/layout/full_playback_alt.xml b/res/layout/full_playback_alt.xml
index 21c5c441..3b1a5058 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">
-	<org.kreed.vanilla.CoverView
+	<ch.blinkenlights.android.vanilla.CoverView
 		android:id="@+id/cover_view"
 		android:layout_height="fill_parent"
 		android:layout_width="fill_parent" />
diff --git a/res/layout/mini_playback.xml b/res/layout/mini_playback.xml
index 78e45dcc..e0805fa2 100644
--- a/res/layout/mini_playback.xml
+++ b/res/layout/mini_playback.xml
@@ -25,7 +25,7 @@ THE SOFTWARE.
 	android:orientation="vertical"
 	android:layout_height="wrap_content"
 	android:layout_width="wrap_content">
-	<org.kreed.vanilla.CoverView
+	<ch.blinkenlights.android.vanilla.CoverView
 		android:id="@+id/cover_view"
 		android:layout_gravity="center"
 		android:layout_weight="1"
diff --git a/res/layout/playlist_activity.xml b/res/layout/playlist_activity.xml
index 0217910a..b9593a11 100644
--- a/res/layout/playlist_activity.xml
+++ b/res/layout/playlist_activity.xml
@@ -20,7 +20,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
-<org.kreed.vanilla.DragListView
+<ch.blinkenlights.android.vanilla.DragListView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/list"
 	android:fastScrollEnabled="true"
diff --git a/res/layout/playlist_row.xml b/res/layout/playlist_row.xml
index c38189fd..a39bfb3b 100644
--- a/res/layout/playlist_row.xml
+++ b/res/layout/playlist_row.xml
@@ -20,7 +20,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
-<org.kreed.vanilla.DragTextView
+<ch.blinkenlights.android.vanilla.DragTextView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:padding="3dip"
 	android:singleLine="true"
diff --git a/res/layout/tab_order.xml b/res/layout/tab_order.xml
index 42103af9..560ecd42 100644
--- a/res/layout/tab_order.xml
+++ b/res/layout/tab_order.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
 	android:showDividers="middle"
 	android:layout_height="fill_parent"
 	android:layout_width="fill_parent">
-	<org.kreed.vanilla.DragListView
+	<ch.blinkenlights.android.vanilla.DragListView
 		android:id="@+id/list"
 		android:divider="@null"
 		android:layout_height="0px"
diff --git a/res/layout/tab_order_row.xml b/res/layout/tab_order_row.xml
index 3869f5fc..5545341e 100644
--- a/res/layout/tab_order_row.xml
+++ b/res/layout/tab_order_row.xml
@@ -20,7 +20,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
-<org.kreed.vanilla.DragTextView
+<ch.blinkenlights.android.vanilla.DragTextView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:padding="3dip"
 	android:singleLine="true"
diff --git a/res/xml/preference_audio.xml b/res/xml/preference_audio.xml
index 492227b5..e6cbe89b 100644
--- a/res/xml/preference_audio.xml
+++ b/res/xml/preference_audio.xml
@@ -23,7 +23,7 @@ THE SOFTWARE.
 <PreferenceScreen
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:persistent="true">
-	<org.kreed.vanilla.SeekBarPreference
+	<ch.blinkenlights.android.vanilla.SeekBarPreference
 		android:key="volume_int"
 		android:negativeButtonText="@null"
 		android:dialogLayout="@layout/shake_pref"
diff --git a/res/xml/preference_headers.xml b/res/xml/preference_headers.xml
index 78c72641..3b739f03 100644
--- a/res/xml/preference_headers.xml
+++ b/res/xml/preference_headers.xml
@@ -22,24 +22,24 @@ THE SOFTWARE.
 -->
 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
 	<header
-		android:fragment="org.kreed.vanilla.PreferencesActivity$AudioFragment"
+		android:fragment="ch.blinkenlights.android.vanilla.PreferencesActivity$AudioFragment"
 		android:title="@string/audio" />
 	<header
-		android:fragment="org.kreed.vanilla.PreferencesActivity$PlaybackFragment"
+		android:fragment="ch.blinkenlights.android.vanilla.PreferencesActivity$PlaybackFragment"
 		android:title="@string/playback_screen" />
 	<header
-		android:fragment="org.kreed.vanilla.PreferencesActivity$LibraryFragment"
+		android:fragment="ch.blinkenlights.android.vanilla.PreferencesActivity$LibraryFragment"
 		android:title="@string/library_screen" />
 	<header
-		android:fragment="org.kreed.vanilla.PreferencesActivity$NotificationsFragment"
+		android:fragment="ch.blinkenlights.android.vanilla.PreferencesActivity$NotificationsFragment"
 		android:title="@string/notifications" />
 	<header
-		android:fragment="org.kreed.vanilla.PreferencesActivity$ShakeFragment"
+		android:fragment="ch.blinkenlights.android.vanilla.PreferencesActivity$ShakeFragment"
 		android:title="@string/accelerometer_shake" />
 	<header
-		android:fragment="org.kreed.vanilla.PreferencesActivity$MiscFragment"
+		android:fragment="ch.blinkenlights.android.vanilla.PreferencesActivity$MiscFragment"
 		android:title="@string/misc_features" />
 	<header
-		android:fragment="org.kreed.vanilla.PreferencesActivity$AboutFragment"
+		android:fragment="ch.blinkenlights.android.vanilla.PreferencesActivity$AboutFragment"
 		android:title="@string/about" />
 </preference-headers>
diff --git a/res/xml/preference_library.xml b/res/xml/preference_library.xml
index 001f2882..7cf670c7 100644
--- a/res/xml/preference_library.xml
+++ b/res/xml/preference_library.xml
@@ -32,20 +32,20 @@ THE SOFTWARE.
 		android:title="@string/tabs"
 		android:summary="@string/customize_tab_order">
 		<intent
-			android:targetPackage="org.kreed.vanilla"
-			android:targetClass="org.kreed.vanilla.TabOrderActivity" />
+			android:targetPackage="ch.blinkenlights.android.vanilla"
+			android:targetClass="ch.blinkenlights.android.vanilla.TabOrderActivity" />
 	</PreferenceScreen>
-	<org.kreed.vanilla.ListPreferenceSummary
+	<ch.blinkenlights.android.vanilla.ListPreferenceSummary
 		android:key="default_action_int"
 		android:title="@string/default_action_title"
 		android:entries="@array/default_action_entries"
 		android:entryValues="@array/entry_values"
 		android:defaultValue="7" />
-	<org.kreed.vanilla.ListPreferenceSummary
+	<ch.blinkenlights.android.vanilla.ListPreferenceSummary
 		android:key="default_playlist_action"
 		android:title="@string/default_playlist_action_title"
 		android:entries="@array/default_playlist_action_entries"
 		android:entryValues="@array/entry_values"
 		android:defaultValue="3" />
-	<org.kreed.vanilla.ScanPreference />
+	<ch.blinkenlights.android.vanilla.ScanPreference />
 </PreferenceScreen>
diff --git a/res/xml/preference_misc.xml b/res/xml/preference_misc.xml
index 326dd797..ce72b96b 100644
--- a/res/xml/preference_misc.xml
+++ b/res/xml/preference_misc.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
 		android:title="@string/use_idle_timeout_title"
 		android:summary="@string/use_idle_timeout_summary"
 		android:defaultValue="false" />
-	<org.kreed.vanilla.IdlePreference
+	<ch.blinkenlights.android.vanilla.IdlePreference
 		android:key="idle_timeout"
 		android:title="@string/idle_timeout_title"
 		android:dependency="use_idle_timeout" />
diff --git a/res/xml/preference_notifications.xml b/res/xml/preference_notifications.xml
index 92efb70e..0093f4c4 100644
--- a/res/xml/preference_notifications.xml
+++ b/res/xml/preference_notifications.xml
@@ -23,13 +23,13 @@ THE SOFTWARE.
 <PreferenceScreen
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:persistent="true">
-	<org.kreed.vanilla.ListPreferenceSummary
+	<ch.blinkenlights.android.vanilla.ListPreferenceSummary
 		android:key="notification_mode"
 		android:title="@string/notification_mode_title"
 		android:entries="@array/notification_mode_entries"
 		android:entryValues="@array/entry_values"
 		android:defaultValue="1" />
-	<org.kreed.vanilla.ListPreferenceSummary
+	<ch.blinkenlights.android.vanilla.ListPreferenceSummary
 		android:key="notification_action"
 		android:title="@string/notification_action_title"
 		android:entries="@array/notification_action_entries"
diff --git a/res/xml/preference_playback.xml b/res/xml/preference_playback.xml
index 722f16fb..ed2c95b2 100644
--- a/res/xml/preference_playback.xml
+++ b/res/xml/preference_playback.xml
@@ -28,31 +28,31 @@ THE SOFTWARE.
 		android:title="@string/playback_on_startup_title"
 		android:summary="@string/playback_on_startup_summary"
 		android:defaultValue="false" />
-	<org.kreed.vanilla.ListPreferenceSummary
+	<ch.blinkenlights.android.vanilla.ListPreferenceSummary
 		android:key="display_mode"
 		android:title="@string/display_mode_title"
 		android:entries="@array/display_mode_entries"
 		android:entryValues="@array/entry_values"
 		android:defaultValue="2" />
-	<org.kreed.vanilla.ListPreferenceSummary
+	<ch.blinkenlights.android.vanilla.ListPreferenceSummary
 		android:key="swipe_up_action"
 		android:title="@string/swipe_up_action_title"
 		android:entries="@array/swipe_action_entries"
 		android:entryValues="@array/swipe_action_values"
 		android:defaultValue="Nothing" />
-	<org.kreed.vanilla.ListPreferenceSummary
+	<ch.blinkenlights.android.vanilla.ListPreferenceSummary
 		android:key="swipe_down_action"
 		android:title="@string/swipe_down_action_title"
 		android:entries="@array/swipe_action_entries"
 		android:entryValues="@array/swipe_action_values"
 		android:defaultValue="Nothing" />
-	<org.kreed.vanilla.ListPreferenceSummary
+	<ch.blinkenlights.android.vanilla.ListPreferenceSummary
 		android:key="cover_press_action"
 		android:title="@string/cover_press_action_title"
 		android:entries="@array/swipe_action_entries"
 		android:entryValues="@array/swipe_action_values"
 		android:defaultValue="ToggleControls" />
-	<org.kreed.vanilla.ListPreferenceSummary
+	<ch.blinkenlights.android.vanilla.ListPreferenceSummary
 		android:key="cover_longpress_action"
 		android:title="@string/cover_longpress_action_title"
 		android:entries="@array/swipe_action_entries"
diff --git a/res/xml/preference_shake.xml b/res/xml/preference_shake.xml
index 3e7e29d5..920e9b53 100644
--- a/res/xml/preference_shake.xml
+++ b/res/xml/preference_shake.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
 		android:title="@string/enable_shake_title"
 		android:summary="@string/enable_shake_summary"
 		android:defaultValue="false" />
-	<org.kreed.vanilla.ListPreferenceSummary
+	<ch.blinkenlights.android.vanilla.ListPreferenceSummary
 		android:key="shake_action"
 		android:title="@string/shake_action_title"
 		android:entries="@array/swipe_action_entries"
@@ -36,7 +36,7 @@ THE SOFTWARE.
 		android:defaultValue="NextSong"
 		android:dependency="enable_shake" />
 	<!-- Might be nice to show something indicating the current shake force for this preference. -->
-	<org.kreed.vanilla.SeekBarPreference
+	<ch.blinkenlights.android.vanilla.SeekBarPreference
 		android:key="shake_threshold"
 		android:negativeButtonText="@null"
 		android:dialogLayout="@layout/shake_pref"
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 29d025ac..322f0850 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -24,43 +24,43 @@ THE SOFTWARE.
 	<PreferenceScreen
 		android:title="@string/audio">
 		<intent
-			android:targetPackage="org.kreed.vanilla"
-			android:targetClass="org.kreed.vanilla.PreferencesActivity$AudioActivity" />
+			android:targetPackage="ch.blinkenlights.android.vanilla"
+			android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$AudioActivity" />
 	</PreferenceScreen>
 	<PreferenceScreen
 		android:title="@string/playback_screen">
 		<intent
-			android:targetPackage="org.kreed.vanilla"
-			android:targetClass="org.kreed.vanilla.PreferencesActivity$PlaybackActivity" />
+			android:targetPackage="ch.blinkenlights.android.vanilla"
+			android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$PlaybackActivity" />
 	</PreferenceScreen>
 	<PreferenceScreen
 		android:title="@string/library_screen">
 		<intent
-			android:targetPackage="org.kreed.vanilla"
-			android:targetClass="org.kreed.vanilla.PreferencesActivity$LibraryActivity" />
+			android:targetPackage="ch.blinkenlights.android.vanilla"
+			android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$LibraryActivity" />
 	</PreferenceScreen>
 	<PreferenceScreen
 		android:title="@string/notifications">
 		<intent
-			android:targetPackage="org.kreed.vanilla"
-			android:targetClass="org.kreed.vanilla.PreferencesActivity$NotificationsActivity" />
+			android:targetPackage="ch.blinkenlights.android.vanilla"
+			android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$NotificationsActivity" />
 	</PreferenceScreen>
 	<PreferenceScreen
 		android:title="@string/accelerometer_shake">
 		<intent
-			android:targetPackage="org.kreed.vanilla"
-			android:targetClass="org.kreed.vanilla.PreferencesActivity$ShakeActivity" />
+			android:targetPackage="ch.blinkenlights.android.vanilla"
+			android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$ShakeActivity" />
 	</PreferenceScreen>
 	<PreferenceScreen
 		android:title="@string/misc_features">
 		<intent
-			android:targetPackage="org.kreed.vanilla"
-			android:targetClass="org.kreed.vanilla.PreferencesActivity$MiscActivity" />
+			android:targetPackage="ch.blinkenlights.android.vanilla"
+			android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$MiscActivity" />
 	</PreferenceScreen>
 	<PreferenceScreen
 		android:title="@string/about">
 		<intent
-			android:targetPackage="org.kreed.vanilla"
-			android:targetClass="org.kreed.vanilla.PreferencesActivity$AboutActivity" />
+			android:targetPackage="ch.blinkenlights.android.vanilla"
+			android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$AboutActivity" />
 	</PreferenceScreen>
 </PreferenceScreen>