diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5c392ed8..573234b8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="org.kreed.vanilla"
+	package="ch.blinkenlights.android.vanilla"
 	android:versionName="0.9.10"
 	android:versionCode="0910"
 	android:installLocation="auto">
@@ -126,11 +126,11 @@ THE SOFTWARE.
 		</receiver>
 		<service android:name="PlaybackService">
 			<intent-filter>
-				<action android:name="org.kreed.vanilla.action.PLAY" />
-				<action android:name="org.kreed.vanilla.action.PAUSE" />
-				<action android:name="org.kreed.vanilla.action.TOGGLE_PLAYBACK" />
-				<action android:name="org.kreed.vanilla.action.NEXT_SONG" />
-				<action android:name="org.kreed.vanilla.action.PREVIOUS_SONG" />
+				<action android:name="ch.blinkenlights.android.vanilla.action.PLAY" />
+				<action android:name="ch.blinkenlights.android.vanilla.action.PAUSE" />
+				<action android:name="ch.blinkenlights.android.vanilla.action.TOGGLE_PLAYBACK" />
+				<action android:name="ch.blinkenlights.android.vanilla.action.NEXT_SONG" />
+				<action android:name="ch.blinkenlights.android.vanilla.action.PREVIOUS_SONG" />
 			</intent-filter>
 		</service>
 		<activity
diff --git a/src/android/support/v4/view/ViewPager.java b/src/android/support/v4/view/ViewPager.java
index b8658454..1a9ace4c 100644
--- a/src/android/support/v4/view/ViewPager.java
+++ b/src/android/support/v4/view/ViewPager.java
@@ -45,8 +45,8 @@ import android.widget.Scroller;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import org.kreed.vanilla.CompatFroyo;
-import org.kreed.vanilla.CompatHoneycomb;
+import ch.blinkenlights.android.vanilla.CompatFroyo;
+import ch.blinkenlights.android.vanilla.CompatHoneycomb;
 
 /**
  * Layout manager that allows the user to flip left and right
diff --git a/src/ch/blinkenlights/android/vanilla/Action.java b/src/ch/blinkenlights/android/vanilla/Action.java
index 4186ed13..c39b39ec 100644
--- a/src/ch/blinkenlights/android/vanilla/Action.java
+++ b/src/ch/blinkenlights/android/vanilla/Action.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.SharedPreferences;
 
diff --git a/src/ch/blinkenlights/android/vanilla/ActionBarControls.java b/src/ch/blinkenlights/android/vanilla/ActionBarControls.java
index 7c9a1020..4d342df7 100644
--- a/src/ch/blinkenlights/android/vanilla/ActionBarControls.java
+++ b/src/ch/blinkenlights/android/vanilla/ActionBarControls.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/ch/blinkenlights/android/vanilla/CompatEq.java b/src/ch/blinkenlights/android/vanilla/CompatEq.java
index 56974331..b0266aff 100644
--- a/src/ch/blinkenlights/android/vanilla/CompatEq.java
+++ b/src/ch/blinkenlights/android/vanilla/CompatEq.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.annotation.TargetApi;
 import android.media.MediaPlayer;
diff --git a/src/ch/blinkenlights/android/vanilla/CompatFroyo.java b/src/ch/blinkenlights/android/vanilla/CompatFroyo.java
index 0c18d7e8..3e85981c 100644
--- a/src/ch/blinkenlights/android/vanilla/CompatFroyo.java
+++ b/src/ch/blinkenlights/android/vanilla/CompatFroyo.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.annotation.TargetApi;
 import android.app.backup.BackupManager;
diff --git a/src/ch/blinkenlights/android/vanilla/CompatHoneycomb.java b/src/ch/blinkenlights/android/vanilla/CompatHoneycomb.java
index d25a96b7..67dfab50 100644
--- a/src/ch/blinkenlights/android/vanilla/CompatHoneycomb.java
+++ b/src/ch/blinkenlights/android/vanilla/CompatHoneycomb.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.annotation.TargetApi;
 import android.app.ActionBar;
diff --git a/src/ch/blinkenlights/android/vanilla/CompatIcs.java b/src/ch/blinkenlights/android/vanilla/CompatIcs.java
index 3cabc4cd..781fd18e 100644
--- a/src/ch/blinkenlights/android/vanilla/CompatIcs.java
+++ b/src/ch/blinkenlights/android/vanilla/CompatIcs.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.annotation.TargetApi;
 import android.app.PendingIntent;
diff --git a/src/ch/blinkenlights/android/vanilla/CompatMetadata.java b/src/ch/blinkenlights/android/vanilla/CompatMetadata.java
index 67da4933..15b7625a 100644
--- a/src/ch/blinkenlights/android/vanilla/CompatMetadata.java
+++ b/src/ch/blinkenlights/android/vanilla/CompatMetadata.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.annotation.TargetApi;
 import android.media.MediaMetadataRetriever;
diff --git a/src/ch/blinkenlights/android/vanilla/CoverBitmap.java b/src/ch/blinkenlights/android/vanilla/CoverBitmap.java
index f8e58bb0..d95e2228 100644
--- a/src/ch/blinkenlights/android/vanilla/CoverBitmap.java
+++ b/src/ch/blinkenlights/android/vanilla/CoverBitmap.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/src/ch/blinkenlights/android/vanilla/CoverView.java b/src/ch/blinkenlights/android/vanilla/CoverView.java
index e70aa3db..e54ff6c9 100644
--- a/src/ch/blinkenlights/android/vanilla/CoverView.java
+++ b/src/ch/blinkenlights/android/vanilla/CoverView.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/src/ch/blinkenlights/android/vanilla/DragListView.java b/src/ch/blinkenlights/android/vanilla/DragListView.java
index d57fc11a..affe7f42 100644
--- a/src/ch/blinkenlights/android/vanilla/DragListView.java
+++ b/src/ch/blinkenlights/android/vanilla/DragListView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/src/ch/blinkenlights/android/vanilla/DragTextView.java b/src/ch/blinkenlights/android/vanilla/DragTextView.java
index e7c770f0..db71203a 100644
--- a/src/ch/blinkenlights/android/vanilla/DragTextView.java
+++ b/src/ch/blinkenlights/android/vanilla/DragTextView.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java b/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java
index 4d351418..46c126df 100644
--- a/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/ch/blinkenlights/android/vanilla/FourLongWidget.java b/src/ch/blinkenlights/android/vanilla/FourLongWidget.java
index 2b665ee8..8a837241 100644
--- a/src/ch/blinkenlights/android/vanilla/FourLongWidget.java
+++ b/src/ch/blinkenlights/android/vanilla/FourLongWidget.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
diff --git a/src/ch/blinkenlights/android/vanilla/FourSquareWidget.java b/src/ch/blinkenlights/android/vanilla/FourSquareWidget.java
index 8628c8cd..e6f2b9ce 100644
--- a/src/ch/blinkenlights/android/vanilla/FourSquareWidget.java
+++ b/src/ch/blinkenlights/android/vanilla/FourSquareWidget.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
diff --git a/src/ch/blinkenlights/android/vanilla/FourWhiteWidget.java b/src/ch/blinkenlights/android/vanilla/FourWhiteWidget.java
index a6a63263..cc40d01d 100644
--- a/src/ch/blinkenlights/android/vanilla/FourWhiteWidget.java
+++ b/src/ch/blinkenlights/android/vanilla/FourWhiteWidget.java
@@ -21,7 +21,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
diff --git a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
index 46f737b6..2a50b6df 100644
--- a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
diff --git a/src/ch/blinkenlights/android/vanilla/IdlePreference.java b/src/ch/blinkenlights/android/vanilla/IdlePreference.java
index e83a8cc2..80c23c6d 100644
--- a/src/ch/blinkenlights/android/vanilla/IdlePreference.java
+++ b/src/ch/blinkenlights/android/vanilla/IdlePreference.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.AlertDialog.Builder;
 import android.content.Context;
diff --git a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
index e4046777..41b86bec 100644
--- a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.AlertDialog;
 import android.content.ContentResolver;
diff --git a/src/ch/blinkenlights/android/vanilla/LibraryAdapter.java b/src/ch/blinkenlights/android/vanilla/LibraryAdapter.java
index 385fc7ff..3ffb1688 100644
--- a/src/ch/blinkenlights/android/vanilla/LibraryAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/LibraryAdapter.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Intent;
 import android.view.View;
diff --git a/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java b/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
index 4e73b9f6..5b1c141c 100644
--- a/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
diff --git a/src/ch/blinkenlights/android/vanilla/Limiter.java b/src/ch/blinkenlights/android/vanilla/Limiter.java
index c6a0016c..139be6e0 100644
--- a/src/ch/blinkenlights/android/vanilla/Limiter.java
+++ b/src/ch/blinkenlights/android/vanilla/Limiter.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import java.io.Serializable;
 
diff --git a/src/ch/blinkenlights/android/vanilla/ListPreferenceSummary.java b/src/ch/blinkenlights/android/vanilla/ListPreferenceSummary.java
index 300f6cfa..3a22f15d 100644
--- a/src/ch/blinkenlights/android/vanilla/ListPreferenceSummary.java
+++ b/src/ch/blinkenlights/android/vanilla/ListPreferenceSummary.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.preference.ListPreference;
diff --git a/src/ch/blinkenlights/android/vanilla/MediaAdapter.java b/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
index 36b220c1..c7d5a0b8 100644
--- a/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/ch/blinkenlights/android/vanilla/MediaButtonReceiver.java b/src/ch/blinkenlights/android/vanilla/MediaButtonReceiver.java
index 9ea7d2ba..c0c0f84a 100644
--- a/src/ch/blinkenlights/android/vanilla/MediaButtonReceiver.java
+++ b/src/ch/blinkenlights/android/vanilla/MediaButtonReceiver.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -87,7 +87,7 @@ public class MediaButtonReceiver extends BroadcastReceiver {
 		if (sBeep == 1) {
 			if (sBeepPlayer == null) {
 				sBeepPlayer = new AsyncPlayer("BeepPlayer");
-				sBeepSound = Uri.parse("android.resource://org.kreed.vanilla/raw/beep");
+				sBeepSound = Uri.parse("android.resource://ch.blinkenlights.android.vanilla/raw/beep");
 			}
 			sBeepPlayer.play(context, sBeepSound, false, AudioManager.STREAM_MUSIC);
 		}
diff --git a/src/ch/blinkenlights/android/vanilla/MediaUtils.java b/src/ch/blinkenlights/android/vanilla/MediaUtils.java
index bc53dbf9..1ee81900 100644
--- a/src/ch/blinkenlights/android/vanilla/MediaUtils.java
+++ b/src/ch/blinkenlights/android/vanilla/MediaUtils.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.ContentResolver;
 import android.database.Cursor;
diff --git a/src/ch/blinkenlights/android/vanilla/MiniPlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/MiniPlaybackActivity.java
index 51084577..ac0f96ff 100644
--- a/src/ch/blinkenlights/android/vanilla/MiniPlaybackActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/MiniPlaybackActivity.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/src/ch/blinkenlights/android/vanilla/MusicAlphabetIndexer.java b/src/ch/blinkenlights/android/vanilla/MusicAlphabetIndexer.java
index 9a2a3fb7..0581e523 100644
--- a/src/ch/blinkenlights/android/vanilla/MusicAlphabetIndexer.java
+++ b/src/ch/blinkenlights/android/vanilla/MusicAlphabetIndexer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.database.Cursor;
 import android.provider.MediaStore;
diff --git a/src/ch/blinkenlights/android/vanilla/NewPlaylistDialog.java b/src/ch/blinkenlights/android/vanilla/NewPlaylistDialog.java
index 7852af60..e1329465 100644
--- a/src/ch/blinkenlights/android/vanilla/NewPlaylistDialog.java
+++ b/src/ch/blinkenlights/android/vanilla/NewPlaylistDialog.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.Dialog;
 import android.content.ContentResolver;
diff --git a/src/ch/blinkenlights/android/vanilla/OneCellWidget.java b/src/ch/blinkenlights/android/vanilla/OneCellWidget.java
index 06c1159e..549bd8bc 100644
--- a/src/ch/blinkenlights/android/vanilla/OneCellWidget.java
+++ b/src/ch/blinkenlights/android/vanilla/OneCellWidget.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
index 47ad4f46..53faaa0a 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackService.java b/src/ch/blinkenlights/android/vanilla/PlaybackService.java
index 2d37edf7..d5e340a1 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaybackService.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaybackService.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -96,15 +96,15 @@ public final class PlaybackService extends Service
 	/**
 	 * Action for startService: toggle playback on/off.
 	 */
-	public static final String ACTION_TOGGLE_PLAYBACK = "org.kreed.vanilla.action.TOGGLE_PLAYBACK";
+	public static final String ACTION_TOGGLE_PLAYBACK = "ch.blinkenlights.android.vanilla.action.TOGGLE_PLAYBACK";
 	/**
 	 * Action for startService: start playback if paused.
 	 */
-	public static final String ACTION_PLAY = "org.kreed.vanilla.action.PLAY";
+	public static final String ACTION_PLAY = "ch.blinkenlights.android.vanilla.action.PLAY";
 	/**
 	 * Action for startService: pause playback if playing.
 	 */
-	public static final String ACTION_PAUSE = "org.kreed.vanilla.action.PAUSE";
+	public static final String ACTION_PAUSE = "ch.blinkenlights.android.vanilla.action.PAUSE";
 	/**
 	 * Action for startService: toggle playback on/off.
 	 *
@@ -113,18 +113,18 @@ public final class PlaybackService extends Service
 	 * actions are received within 400 ms, the playback activity is opened
 	 * instead.
 	 */
-	public static final String ACTION_TOGGLE_PLAYBACK_DELAYED = "org.kreed.vanilla.action.TOGGLE_PLAYBACK_DELAYED";
+	public static final String ACTION_TOGGLE_PLAYBACK_DELAYED = "ch.blinkenlights.android.vanilla.action.TOGGLE_PLAYBACK_DELAYED";
 	/**
 	 * Action for startService: toggle playback on/off.
 	 *
 	 * This works the same way as ACTION_PLAY_PAUSE but prevents the notification
 	 * from being hidden regardless of notification visibility settings.
 	 */
-	public static final String ACTION_TOGGLE_PLAYBACK_NOTIFICATION = "org.kreed.vanilla.action.TOGGLE_PLAYBACK_NOTIFICATION";
+	public static final String ACTION_TOGGLE_PLAYBACK_NOTIFICATION = "ch.blinkenlights.android.vanilla.action.TOGGLE_PLAYBACK_NOTIFICATION";
 	/**
 	 * Action for startService: advance to the next song.
 	 */
-	public static final String ACTION_NEXT_SONG = "org.kreed.vanilla.action.NEXT_SONG";
+	public static final String ACTION_NEXT_SONG = "ch.blinkenlights.android.vanilla.action.NEXT_SONG";
 	/**
 	 * Action for startService: advance to the next song.
 	 *
@@ -133,37 +133,37 @@ public final class PlaybackService extends Service
 	 * actions are received within 400 ms, the playback activity is opened
 	 * instead.
 	 */
-	public static final String ACTION_NEXT_SONG_DELAYED = "org.kreed.vanilla.action.NEXT_SONG_DELAYED";
+	public static final String ACTION_NEXT_SONG_DELAYED = "ch.blinkenlights.android.vanilla.action.NEXT_SONG_DELAYED";
 	/**
 	 * Action for startService: advance to the next song.
 	 *
 	 * Like ACTION_NEXT_SONG, but starts playing automatically if paused
 	 * when this is called.
 	 */
-	public static final String ACTION_NEXT_SONG_AUTOPLAY = "org.kreed.vanilla.action.NEXT_SONG_AUTOPLAY";
+	public static final String ACTION_NEXT_SONG_AUTOPLAY = "ch.blinkenlights.android.vanilla.action.NEXT_SONG_AUTOPLAY";
 	/**
 	 * Action for startService: go back to the previous song.
 	 */
-	public static final String ACTION_PREVIOUS_SONG = "org.kreed.vanilla.action.PREVIOUS_SONG";
+	public static final String ACTION_PREVIOUS_SONG = "ch.blinkenlights.android.vanilla.action.PREVIOUS_SONG";
 	/**
 	 * Action for startService: go back to the previous song.
 	 *
 	 * Like ACTION_PREVIOUS_SONG, but starts playing automatically if paused
 	 * when this is called.
 	 */
-	public static final String ACTION_PREVIOUS_SONG_AUTOPLAY = "org.kreed.vanilla.action.PREVIOUS_SONG_AUTOPLAY";
+	public static final String ACTION_PREVIOUS_SONG_AUTOPLAY = "ch.blinkenlights.android.vanilla.action.PREVIOUS_SONG_AUTOPLAY";
 	/**
 	 * Change the shuffle mode.
 	 */
-	public static final String ACTION_CYCLE_SHUFFLE = "org.kreed.vanilla.CYCLE_SHUFFLE";
+	public static final String ACTION_CYCLE_SHUFFLE = "ch.blinkenlights.android.vanilla.CYCLE_SHUFFLE";
 	/**
 	 * Change the repeat mode.
 	 */
-	public static final String ACTION_CYCLE_REPEAT = "org.kreed.vanilla.CYCLE_REPEAT";
+	public static final String ACTION_CYCLE_REPEAT = "ch.blinkenlights.android.vanilla.CYCLE_REPEAT";
 	/**
 	 * Pause music and hide the notifcation.
 	 */
-	public static final String ACTION_CLOSE_NOTIFICATION = "org.kreed.vanilla.CLOSE_NOTIFICATION";
+	public static final String ACTION_CLOSE_NOTIFICATION = "ch.blinkenlights.android.vanilla.CLOSE_NOTIFICATION";
 
 	public static final int NEVER = 0;
 	public static final int WHEN_PLAYING = 1;
diff --git a/src/ch/blinkenlights/android/vanilla/Playlist.java b/src/ch/blinkenlights/android/vanilla/Playlist.java
index 384a60ff..98cbaee9 100644
--- a/src/ch/blinkenlights/android/vanilla/Playlist.java
+++ b/src/ch/blinkenlights/android/vanilla/Playlist.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.ContentResolver;
 import android.content.ContentUris;
diff --git a/src/ch/blinkenlights/android/vanilla/PlaylistActivity.java b/src/ch/blinkenlights/android/vanilla/PlaylistActivity.java
index 7d3a97b9..131941fc 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaylistActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaylistActivity.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/src/ch/blinkenlights/android/vanilla/PlaylistAdapter.java b/src/ch/blinkenlights/android/vanilla/PlaylistAdapter.java
index b72d2946..55f74fe2 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaylistAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaylistAdapter.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.ContentResolver;
 import android.content.ContentUris;
diff --git a/src/ch/blinkenlights/android/vanilla/PrefKeys.java b/src/ch/blinkenlights/android/vanilla/PrefKeys.java
index 333e1147..0650d4b6 100644
--- a/src/ch/blinkenlights/android/vanilla/PrefKeys.java
+++ b/src/ch/blinkenlights/android/vanilla/PrefKeys.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 /**
  * SharedPreference keys. Must be kept in sync with keys in res/xml/prefs_*.xml.
diff --git a/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java b/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java
index 6baf53df..1c9d30d8 100644
--- a/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
diff --git a/src/ch/blinkenlights/android/vanilla/PreferencesBackupAgent.java b/src/ch/blinkenlights/android/vanilla/PreferencesBackupAgent.java
index 16dd68f5..dfb40ea0 100644
--- a/src/ch/blinkenlights/android/vanilla/PreferencesBackupAgent.java
+++ b/src/ch/blinkenlights/android/vanilla/PreferencesBackupAgent.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.annotation.TargetApi;
 import android.app.backup.BackupAgentHelper;
diff --git a/src/ch/blinkenlights/android/vanilla/QueryTask.java b/src/ch/blinkenlights/android/vanilla/QueryTask.java
index 4aa18c5f..f9abdede 100644
--- a/src/ch/blinkenlights/android/vanilla/QueryTask.java
+++ b/src/ch/blinkenlights/android/vanilla/QueryTask.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.ContentResolver;
 import android.database.Cursor;
diff --git a/src/ch/blinkenlights/android/vanilla/ScanPreference.java b/src/ch/blinkenlights/android/vanilla/ScanPreference.java
index f107a3ca..769988d8 100644
--- a/src/ch/blinkenlights/android/vanilla/ScanPreference.java
+++ b/src/ch/blinkenlights/android/vanilla/ScanPreference.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java b/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java
index e34a98f3..ddb9ea73 100644
--- a/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java
+++ b/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/src/ch/blinkenlights/android/vanilla/Song.java b/src/ch/blinkenlights/android/vanilla/Song.java
index 129471f2..3d8824f9 100644
--- a/src/ch/blinkenlights/android/vanilla/Song.java
+++ b/src/ch/blinkenlights/android/vanilla/Song.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.ContentResolver;
 import android.content.Context;
diff --git a/src/ch/blinkenlights/android/vanilla/SongTimeline.java b/src/ch/blinkenlights/android/vanilla/SongTimeline.java
index 1a2dd734..8fb16c2e 100644
--- a/src/ch/blinkenlights/android/vanilla/SongTimeline.java
+++ b/src/ch/blinkenlights/android/vanilla/SongTimeline.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.ContentResolver;
 import android.content.Context;
diff --git a/src/ch/blinkenlights/android/vanilla/TabOrderActivity.java b/src/ch/blinkenlights/android/vanilla/TabOrderActivity.java
index 774616e5..26bb0dca 100644
--- a/src/ch/blinkenlights/android/vanilla/TabOrderActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/TabOrderActivity.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
diff --git a/src/ch/blinkenlights/android/vanilla/TabOrderAdapter.java b/src/ch/blinkenlights/android/vanilla/TabOrderAdapter.java
index 12871b0c..954da167 100644
--- a/src/ch/blinkenlights/android/vanilla/TabOrderAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/TabOrderAdapter.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.view.LayoutInflater;
diff --git a/src/ch/blinkenlights/android/vanilla/WidgetD.java b/src/ch/blinkenlights/android/vanilla/WidgetD.java
index 7f088918..c1233839 100644
--- a/src/ch/blinkenlights/android/vanilla/WidgetD.java
+++ b/src/ch/blinkenlights/android/vanilla/WidgetD.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
diff --git a/src/ch/blinkenlights/android/vanilla/WidgetE.java b/src/ch/blinkenlights/android/vanilla/WidgetE.java
index 159049d4..75311cff 100644
--- a/src/ch/blinkenlights/android/vanilla/WidgetE.java
+++ b/src/ch/blinkenlights/android/vanilla/WidgetE.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
diff --git a/src/com/viewpagerindicator/TabPageIndicator.java b/src/com/viewpagerindicator/TabPageIndicator.java
index 64088906..b304c3a0 100644
--- a/src/com/viewpagerindicator/TabPageIndicator.java
+++ b/src/com/viewpagerindicator/TabPageIndicator.java
@@ -30,7 +30,7 @@ import android.view.ViewGroup;
 import android.widget.HorizontalScrollView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import org.kreed.vanilla.R;
+import ch.blinkenlights.android.vanilla.R;
 
 /**
  * This widget implements the dynamic action bar tab behavior that can change