diff --git a/BoardConfig.mk b/BoardConfig.mk
index ceb666b..330cb9c 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -21,13 +21,22 @@ TARGET_BOOTLOADER_BOARD_NAME := w8
 BOARD_HAS_NO_SELECT_BUTTON := true
 
 # Recovery
+RECOVERY_NAME := ThL W8/W8+ CWM-based Recovery
 TARGET_RECOVERY_FSTAB := device/thl/w8/recovery/recovery.fstab
 TARGET_RECOVERY_INITRC := device/thl/w8/recovery/recovery.rc
 BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/thl/w8/recovery/recovery_keys.c
+BOARD_USE_CUSTOM_RECOVERY_FONT := \"roboto_15x24.h\"
+CWM_EMMC_BOOT_DEVICE_NAME := /dev/bootimg
+CWM_EMMC_BOOT_DEVICE_SIZE := 0x00600000
+CWM_EMMC_RECOVERY_DEVICE_NAME := /dev/recovery
+CWM_EMMC_RECOVERY_DEVICE_SIZE := 0x00600000
+CWM_EMMC_UBOOT_DEVICE_NAME := /dev/uboot
+CWM_EMMC_UBOOT_DEVICE_SIZE := 0x00060000
+TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/devices/platform/mt_usb/gadget/lun%d/file
 
 # Partition sizes
 BOARD_BOOTIMAGE_PARTITION_SIZE := 0x00600000
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x00600000
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 0x28A00000
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 0x40000000
-BOARD_FLASH_BLOCK_SIZE := 131072
+BOARD_FLASH_BLOCK_SIZE := 0
diff --git a/kernel b/kernel
index 4edd6b2..22d17ef 100644
Binary files a/kernel and b/kernel differ
diff --git a/recovery/recovery.fstab b/recovery/recovery.fstab
index 5654d05..2e154d1 100644
--- a/recovery/recovery.fstab
+++ b/recovery/recovery.fstab
@@ -2,6 +2,9 @@
 /system         ext4        /dev/block/mmcblk0p5
 /cache          ext4        /dev/block/mmcblk0p6
 /data           ext4        /dev/block/mmcblk0p7
-/storage        vfat        /dev/block/mmcblk0p8
-/sdcard         vfat        /dev/block/mmcblk1      /dev/block/mmcblk1p1
+/sdcard         vfat        /dev/block/mmcblk0p8
+/external_sd    vfat        /dev/block/mmcblk1p1
 /sd-ext         auto        /dev/block/mmcblk1p2
+/boot           emmc        /dev/bootimg
+/recovery       emmc        /dev/recovery
+/uboot          emmc        /dev/uboot
diff --git a/recovery/recovery.rc b/recovery/recovery.rc
index 972477e..5620d9c 100755
--- a/recovery/recovery.rc
+++ b/recovery/recovery.rc
@@ -12,7 +12,7 @@ on init
     mkdir /boot
     mkdir /storage
     mkdir /sdcard
-    mkdir /sd-ext
+    mkdir /external_sd
     mkdir /datadata
     mkdir /emmc
     mkdir /system
@@ -35,7 +35,6 @@ service ueventd /sbin/ueventd
     critical
 
 service recovery /sbin/recovery
-    oneshot
 
 service adbd /sbin/adbd recovery
     disabled