diff --git a/README.md b/README.md
index 9993a9d6f..9641ae22d 100644
--- a/README.md
+++ b/README.md
@@ -55,9 +55,9 @@ dependencies {
 # Submodules 
 (linked to their respective Docs)
 
-## [Core](core#readme)
+## [Core](core#readme)****
 * Collection of extension functions and small helper methods applicable in almost any application.
-* Notable features: KPrefs, Changelog XML, Ripple Canvas, Extensions, Email Builder
+* Notable features: KPrefs, Changelog XML, Kotterknife, Ripple Canvas, Delegates, Lazy Resettables, Extensions, Email Builder
 * Includes 
 [`AppCompat`](https://developer.android.com/topic/libraries/support-library/index.html), 
 [`Material Dialogs (core)`](https://github.com/afollestad/material-dialogs),
diff --git a/docs/Changelog.md b/docs/Changelog.md
index af26ff9b4..9a1ec8239 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -12,7 +12,7 @@
 * :core: Create lazy resettable registry
 * :core: Add more transitions and anims
 * :kpref-activity: Reduce alpha color for desc
-* :imagepicker: [breaking] Rename to mediapicker and add support for videos
+* :imagepicker: [breaking] Rename to mediapicker and add support for videos (alpha)
 
 ## v3.2.0
 * :adapter: Make KauAnimator extensible
diff --git a/mediapicker/src/main/AndroidManifest.xml b/mediapicker/src/main/AndroidManifest.xml
index 89dccc25a..01eea8484 100644
--- a/mediapicker/src/main/AndroidManifest.xml
+++ b/mediapicker/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="ca.allanwang.kau.imagepicker" />
+<manifest package="ca.allanwang.kau.mediapicker" />
diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/BlurredImageView.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/BlurredImageView.kt
similarity index 99%
rename from mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/BlurredImageView.kt
rename to mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/BlurredImageView.kt
index 0dcd7a27e..9e83d84c9 100644
--- a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/BlurredImageView.kt
+++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/BlurredImageView.kt
@@ -1,4 +1,4 @@
-package ca.allanwang.kau.imagepicker
+package ca.allanwang.kau.mediapicker
 
 import android.content.Context
 import android.graphics.Color
diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaItem.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaItem.kt
similarity index 98%
rename from mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaItem.kt
rename to mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaItem.kt
index 4b70638fe..394780993 100644
--- a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaItem.kt
+++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaItem.kt
@@ -1,4 +1,4 @@
-package ca.allanwang.kau.imagepicker
+package ca.allanwang.kau.mediapicker
 
 import android.graphics.drawable.Drawable
 import android.support.v7.widget.RecyclerView
diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaItemBasic.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaItemBasic.kt
similarity index 98%
rename from mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaItemBasic.kt
rename to mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaItemBasic.kt
index 7a1ebf7a3..4fbe95551 100644
--- a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaItemBasic.kt
+++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaItemBasic.kt
@@ -1,4 +1,4 @@
-package ca.allanwang.kau.imagepicker
+package ca.allanwang.kau.mediapicker
 
 import android.annotation.SuppressLint
 import android.app.Activity
diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaModel.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaModel.kt
similarity index 98%
rename from mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaModel.kt
rename to mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaModel.kt
index c384d48a0..9188dd695 100644
--- a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaModel.kt
+++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaModel.kt
@@ -1,4 +1,4 @@
-package ca.allanwang.kau.imagepicker
+package ca.allanwang.kau.mediapicker
 
 import android.database.Cursor
 import android.database.SQLException
diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaPickerActivityBase.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityBase.kt
similarity index 99%
rename from mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaPickerActivityBase.kt
rename to mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityBase.kt
index ee68f4296..2ba6b43ca 100644
--- a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaPickerActivityBase.kt
+++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityBase.kt
@@ -1,4 +1,4 @@
-package ca.allanwang.kau.imagepicker
+package ca.allanwang.kau.mediapicker
 
 import android.content.Intent
 import android.database.Cursor
diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaPickerActivityOverlayBase.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityOverlayBase.kt
similarity index 97%
rename from mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaPickerActivityOverlayBase.kt
rename to mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityOverlayBase.kt
index 5161c0822..b5da34543 100644
--- a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaPickerActivityOverlayBase.kt
+++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityOverlayBase.kt
@@ -1,4 +1,4 @@
-package ca.allanwang.kau.imagepicker
+package ca.allanwang.kau.mediapicker
 
 import android.os.Build
 import android.os.Bundle
diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaPickerBinder.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerBinder.kt
similarity index 96%
rename from mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaPickerBinder.kt
rename to mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerBinder.kt
index e423e8469..bdd25ba20 100644
--- a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaPickerBinder.kt
+++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerBinder.kt
@@ -1,4 +1,4 @@
-package ca.allanwang.kau.imagepicker
+package ca.allanwang.kau.mediapicker
 
 import android.app.Activity
 import android.content.Intent
diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaPickerCore.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt
similarity index 99%
rename from mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaPickerCore.kt
rename to mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt
index 4b922f9dd..255cec470 100644
--- a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaPickerCore.kt
+++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt
@@ -1,4 +1,4 @@
-package ca.allanwang.kau.imagepicker
+package ca.allanwang.kau.mediapicker
 
 import android.Manifest
 import android.app.Activity
diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaType.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaType.kt
similarity index 91%
rename from mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaType.kt
rename to mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaType.kt
index c934e04b2..cfec3318f 100644
--- a/mediapicker/src/main/kotlin/ca/allanwang/kau/imagepicker/MediaType.kt
+++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaType.kt
@@ -1,4 +1,4 @@
-package ca.allanwang.kau.imagepicker
+package ca.allanwang.kau.mediapicker
 
 import android.net.Uri
 import android.provider.MediaStore
diff --git a/mediapicker/src/main/res/layout/kau_iitem_image.xml b/mediapicker/src/main/res/layout/kau_iitem_image.xml
index 9d51d77c0..ed230dd8d 100644
--- a/mediapicker/src/main/res/layout/kau_iitem_image.xml
+++ b/mediapicker/src/main/res/layout/kau_iitem_image.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ca.allanwang.kau.imagepicker.BlurredImageView xmlns:android="http://schemas.android.com/apk/res/android"
+<ca.allanwang.kau.mediapicker.BlurredImageView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/kau_image"
     android:layout_width="match_parent"
diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt
index 0cc41fb15..4c9107cba 100644
--- a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt
+++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt
@@ -6,8 +6,9 @@ import android.view.Menu
 import android.view.MenuItem
 import ca.allanwang.kau.about.kauLaunchAbout
 import ca.allanwang.kau.email.sendEmail
-import ca.allanwang.kau.imagepicker.kauLaunchMediaPicker
-import ca.allanwang.kau.imagepicker.kauOnMediaPickerResult
+
+import ca.allanwang.kau.mediapicker.kauLaunchMediaPicker
+import ca.allanwang.kau.mediapicker.kauOnMediaPickerResult
 import ca.allanwang.kau.kpref.activity.CoreAttributeContract
 import ca.allanwang.kau.kpref.activity.KPrefActivity
 import ca.allanwang.kau.kpref.activity.KPrefAdapterBuilder
diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/ImagePicker.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/MediaPicker.kt
similarity index 69%
rename from sample/src/main/kotlin/ca/allanwang/kau/sample/ImagePicker.kt
rename to sample/src/main/kotlin/ca/allanwang/kau/sample/MediaPicker.kt
index eebc5cae9..7aac0ef9e 100644
--- a/sample/src/main/kotlin/ca/allanwang/kau/sample/ImagePicker.kt
+++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/MediaPicker.kt
@@ -1,8 +1,8 @@
 package ca.allanwang.kau.sample
 
-import ca.allanwang.kau.imagepicker.MediaPickerActivityBase
-import ca.allanwang.kau.imagepicker.MediaPickerActivityOverlayBase
-import ca.allanwang.kau.imagepicker.MediaType
+import ca.allanwang.kau.mediapicker.MediaPickerActivityBase
+import ca.allanwang.kau.mediapicker.MediaPickerActivityOverlayBase
+import ca.allanwang.kau.mediapicker.MediaType
 
 /**
  * Created by Allan Wang on 2017-07-23.
diff --git a/sample/src/main/res/xml/kau_changelog.xml b/sample/src/main/res/xml/kau_changelog.xml
index b7bb8e4d7..59d51c2dd 100644
--- a/sample/src/main/res/xml/kau_changelog.xml
+++ b/sample/src/main/res/xml/kau_changelog.xml
@@ -18,11 +18,7 @@
     <item text=":core: Create lazy resettable registry" />
     <item text=":core: Add more transitions and anims" />
     <item text=":kpref-activity: Reduce alpha color for desc" />
-    <item text=":imagepicker: [breaking] Rename to mediapicker and add support for videos" />
-    <item text="" />
-    <item text="" />
-    <item text="" />
-    <item text="" />
+    <item text=":imagepicker: [breaking] Rename to mediapicker and add support for videos (alpha)" />
 	
 	<version title="v3.2.0"/>
 	<item text=":adapter: Make KauAnimator extensible" />