diff --git a/Wink/build.gradle b/Wink/build.gradle
index 7fdeab5..8a96ecd 100644
--- a/Wink/build.gradle
+++ b/Wink/build.gradle
@@ -5,16 +5,15 @@ repositories {
 }
 
 android {
-    compileSdkVersion 18
-    buildToolsVersion "18.1.0"
+    compileSdkVersion 19
+    buildToolsVersion "19.0.3"
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 18
+        targetSdkVersion 19
     }
 }
 
 dependencies {
-	compile 'com.android.support:appcompat-v7:18.0.0'
-    compile 'com.android.support:support-v4:18.0.0'
+	compile 'com.android.support:appcompat-v7:19.1.0'
 }
diff --git a/WinkDemo/build.gradle b/WinkDemo/build.gradle
index 9a366fb..6eabfb8 100644
--- a/WinkDemo/build.gradle
+++ b/WinkDemo/build.gradle
@@ -1,23 +1,21 @@
 apply plugin: 'android'
 
 repositories {
-    mavenLocal()
     mavenCentral()
 }
 
 android {
-    compileSdkVersion 18
-    buildToolsVersion "18.1.0"
+    compileSdkVersion 19
+    buildToolsVersion "19.0.3"
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 18
+        targetSdkVersion 19
     }
 }
 
 dependencies {
-	compile 'com.android.support:appcompat-v7:18.0.0'
-    compile 'com.android.support:support-v4:18.0.0'
-    compile 'com.larswerkman:colorpicker:1.0'
+	compile 'com.android.support:appcompat-v7:19.1.0'
+    compile 'com.larswerkman:HoloColorPicker:1.4'
     compile project(':Wink')
 }
diff --git a/WinkDemo/src/main/AndroidManifest.xml b/WinkDemo/src/main/AndroidManifest.xml
index 8c397eb..8eeacfd 100644
--- a/WinkDemo/src/main/AndroidManifest.xml
+++ b/WinkDemo/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.codeandmagic.android.wink"
+    package="org.codeandmagic.android.wink.demo"
     android:versionCode="1"
     android:versionName="1.0">
 
diff --git a/WinkDemo/src/main/java/org/codeandmagic/android/wink/ActivityDemo.java b/WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/ActivityDemo.java
similarity index 98%
rename from WinkDemo/src/main/java/org/codeandmagic/android/wink/ActivityDemo.java
rename to WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/ActivityDemo.java
index 41ef671..505ddfa 100644
--- a/WinkDemo/src/main/java/org/codeandmagic/android/wink/ActivityDemo.java
+++ b/WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/ActivityDemo.java
@@ -1,4 +1,4 @@
-package org.codeandmagic.android.wink;
+package org.codeandmagic.android.wink.demo;
 
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -15,6 +15,8 @@
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
+import org.codeandmagic.android.wink.demo.R;
+
 public class ActivityDemo extends ActionBarActivity implements AdapterView.OnItemClickListener {
 
     private ListView drawerList;
diff --git a/WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentHoloThemeDemo.java b/WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/FragmentHoloThemeDemo.java
similarity index 90%
rename from WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentHoloThemeDemo.java
rename to WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/FragmentHoloThemeDemo.java
index be9753f..3b23410 100644
--- a/WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentHoloThemeDemo.java
+++ b/WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/FragmentHoloThemeDemo.java
@@ -1,4 +1,4 @@
-package org.codeandmagic.android.wink;
+package org.codeandmagic.android.wink.demo;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -8,11 +8,16 @@
 import android.view.ViewGroup;
 import android.widget.RadioGroup;
 
+import com.larswerkman.holocolorpicker.ColorPicker;
+import com.larswerkman.holocolorpicker.OpacityBar;
+import com.larswerkman.holocolorpicker.SVBar;
+
+import org.codeandmagic.android.wink.IWink;
+import org.codeandmagic.android.wink.WinkButtonCallback;
+import org.codeandmagic.android.wink.WinkViewCreatedCallback;
+import org.codeandmagic.android.wink.demo.R;
 import org.codeandmagic.android.wink.support.Wink;
 
-import com.larswerkman.colorpicker.ColorPicker;
-import com.larswerkman.colorpicker.OpacityBar;
-import com.larswerkman.colorpicker.SVBar;
 
 /**
  * Created by evelyne24 on 09/10/2013.
diff --git a/WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentListDemo.java b/WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/FragmentListDemo.java
similarity index 95%
rename from WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentListDemo.java
rename to WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/FragmentListDemo.java
index 2dd2dd5..be19484 100644
--- a/WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentListDemo.java
+++ b/WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/FragmentListDemo.java
@@ -1,4 +1,4 @@
-package org.codeandmagic.android.wink;
+package org.codeandmagic.android.wink.demo;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -10,6 +10,9 @@
 import android.widget.ListView;
 import android.widget.RadioGroup;
 
+import org.codeandmagic.android.wink.IWink;
+import org.codeandmagic.android.wink.WinkListCallback;
+import org.codeandmagic.android.wink.demo.R;
 import org.codeandmagic.android.wink.support.Wink;
 
 /**
diff --git a/WinkDemo/src/main/res/layout/fragment_holo_theme_demo.xml b/WinkDemo/src/main/res/layout/fragment_holo_theme_demo.xml
index 93f7568..fd73af2 100644
--- a/WinkDemo/src/main/res/layout/fragment_holo_theme_demo.xml
+++ b/WinkDemo/src/main/res/layout/fragment_holo_theme_demo.xml
@@ -36,20 +36,20 @@
         </RadioGroup>
 
         <!-- Lars's very beautiful HoloColorPicker https://github.com/LarsWerkman/HoloColorPicker -->
-        <com.larswerkman.colorpicker.ColorPicker
+        <com.larswerkman.holocolorpicker.ColorPicker
             android:id="@+id/color_picker"
             android:layout_width="200dp"
             android:layout_height="200dp"
             android:layout_marginTop="@dimen/spacing_normal"
             android:layout_gravity="center" />
 
-        <com.larswerkman.colorpicker.SVBar
+        <com.larswerkman.holocolorpicker.SVBar
             android:id="@+id/color_picker_saturation"
             android:layout_width="322dp"
             android:layout_height="112dp"
             android:layout_gravity="center" />
 
-        <com.larswerkman.colorpicker.OpacityBar
+        <com.larswerkman.holocolorpicker.OpacityBar
             android:id="@+id/color_picker_opacity"
             android:layout_width="322dp"
             android:layout_height="112dp"
diff --git a/WinkDemo/src/main/res/layout/fragment_list_demo.xml b/WinkDemo/src/main/res/layout/fragment_list_demo.xml
index e0f783d..fd3c73f 100644
--- a/WinkDemo/src/main/res/layout/fragment_list_demo.xml
+++ b/WinkDemo/src/main/res/layout/fragment_list_demo.xml
@@ -60,20 +60,20 @@
         </RadioGroup>
 
         <!-- Lars's very beautiful HoloColorPicker https://github.com/LarsWerkman/HoloColorPicker -->
-        <com.larswerkman.colorpicker.ColorPicker
+        <com.larswerkman.holocolorpicker.ColorPicker
             android:id="@+id/color_picker"
             android:layout_width="200dp"
             android:layout_height="200dp"
             android:layout_marginTop="@dimen/spacing_normal"
             android:layout_gravity="center" />
 
-        <com.larswerkman.colorpicker.SVBar
+        <com.larswerkman.holocolorpicker.SVBar
             android:id="@+id/color_picker_saturation"
             android:layout_width="322dp"
             android:layout_height="112dp"
             android:layout_gravity="center" />
 
-        <com.larswerkman.colorpicker.OpacityBar
+        <com.larswerkman.holocolorpicker.OpacityBar
             android:id="@+id/color_picker_opacity"
             android:layout_width="322dp"
             android:layout_height="112dp"
diff --git a/build.gradle b/build.gradle
index bd6967f..920da41 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,6 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.+'
+        classpath 'com.android.tools.build:gradle:0.9.+'
     }
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ce067bd..d5e20cb 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.7-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip