diff --git a/etc/init.htc.rc b/etc/init.htc.rc
index 360b3af..43d31d6 100644
--- a/etc/init.htc.rc
+++ b/etc/init.htc.rc
@@ -31,18 +31,25 @@ service ueventd /sbin/ueventd
     critical
 
 service choice_fn /sbin/choice_fn
-    oneshot
+oneshot
 
 service recovery /sbin/recovery
-    disabled
+disabled
 
 service power_test /sbin/power_test
-    disabled
-    oneshot
+disabled
+oneshot
 
 service offmode_charging /sbin/offmode_charging
+disabled
+oneshot
 
 service detect_key /sbin/detect_key
+disabled
+oneshot
+
+service htcbatt /sbin/htcbatt
+oneshot
 
 service adbd /sbin/adbd recovery
     disabled
diff --git a/htc/res/offmode_charging_images/battery_error.png b/htc/res/offmode_charging_images/battery_error.png
deleted file mode 100644
index fdc837e..0000000
Binary files a/htc/res/offmode_charging_images/battery_error.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/battery_left_0.png b/htc/res/offmode_charging_images/battery_left_0.png
deleted file mode 100644
index 86a57db..0000000
Binary files a/htc/res/offmode_charging_images/battery_left_0.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/battery_left_100.png b/htc/res/offmode_charging_images/battery_left_100.png
deleted file mode 100644
index aa6a234..0000000
Binary files a/htc/res/offmode_charging_images/battery_left_100.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/battery_left_20.png b/htc/res/offmode_charging_images/battery_left_20.png
deleted file mode 100644
index 86d9568..0000000
Binary files a/htc/res/offmode_charging_images/battery_left_20.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/battery_left_40.png b/htc/res/offmode_charging_images/battery_left_40.png
deleted file mode 100644
index d524f93..0000000
Binary files a/htc/res/offmode_charging_images/battery_left_40.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/battery_left_60.png b/htc/res/offmode_charging_images/battery_left_60.png
deleted file mode 100644
index d1de603..0000000
Binary files a/htc/res/offmode_charging_images/battery_left_60.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/battery_left_80.png b/htc/res/offmode_charging_images/battery_left_80.png
deleted file mode 100644
index f79dd30..0000000
Binary files a/htc/res/offmode_charging_images/battery_left_80.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/battery_right_0.png b/htc/res/offmode_charging_images/battery_right_0.png
deleted file mode 100644
index 00394a9..0000000
Binary files a/htc/res/offmode_charging_images/battery_right_0.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/battery_right_100.png b/htc/res/offmode_charging_images/battery_right_100.png
deleted file mode 100644
index deace01..0000000
Binary files a/htc/res/offmode_charging_images/battery_right_100.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/battery_right_20.png b/htc/res/offmode_charging_images/battery_right_20.png
deleted file mode 100644
index 01cf0d3..0000000
Binary files a/htc/res/offmode_charging_images/battery_right_20.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/battery_right_40.png b/htc/res/offmode_charging_images/battery_right_40.png
deleted file mode 100644
index f9f1a51..0000000
Binary files a/htc/res/offmode_charging_images/battery_right_40.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/battery_right_60.png b/htc/res/offmode_charging_images/battery_right_60.png
deleted file mode 100644
index efdefd1..0000000
Binary files a/htc/res/offmode_charging_images/battery_right_60.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/battery_right_80.png b/htc/res/offmode_charging_images/battery_right_80.png
deleted file mode 100644
index 9de0462..0000000
Binary files a/htc/res/offmode_charging_images/battery_right_80.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/battery_shell.png b/htc/res/offmode_charging_images/battery_shell.png
deleted file mode 100644
index befc6bf..0000000
Binary files a/htc/res/offmode_charging_images/battery_shell.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00031.png b/htc/res/offmode_charging_images/charging_full_00031.png
deleted file mode 100644
index 5bb3bfa..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00031.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00035.png b/htc/res/offmode_charging_images/charging_full_00035.png
deleted file mode 100644
index cfd2e21..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00035.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00041.png b/htc/res/offmode_charging_images/charging_full_00041.png
deleted file mode 100644
index b0b39af..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00041.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00043.png b/htc/res/offmode_charging_images/charging_full_00043.png
deleted file mode 100644
index 5ad3d1d..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00043.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00047.png b/htc/res/offmode_charging_images/charging_full_00047.png
deleted file mode 100644
index 54387dd..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00047.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00049.png b/htc/res/offmode_charging_images/charging_full_00049.png
deleted file mode 100644
index 9d201ed..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00049.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00053.png b/htc/res/offmode_charging_images/charging_full_00053.png
deleted file mode 100644
index 4ece618..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00053.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00055.png b/htc/res/offmode_charging_images/charging_full_00055.png
deleted file mode 100644
index f66e4bc..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00055.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00059.png b/htc/res/offmode_charging_images/charging_full_00059.png
deleted file mode 100644
index f2a4502..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00059.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00061.png b/htc/res/offmode_charging_images/charging_full_00061.png
deleted file mode 100644
index 6945438..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00061.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00065.png b/htc/res/offmode_charging_images/charging_full_00065.png
deleted file mode 100644
index b17d986..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00065.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00067.png b/htc/res/offmode_charging_images/charging_full_00067.png
deleted file mode 100644
index 429abf2..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00067.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00071.png b/htc/res/offmode_charging_images/charging_full_00071.png
deleted file mode 100644
index 651e373..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00071.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00073.png b/htc/res/offmode_charging_images/charging_full_00073.png
deleted file mode 100644
index 7913713..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00073.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00077.png b/htc/res/offmode_charging_images/charging_full_00077.png
deleted file mode 100644
index bb81c6c..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00077.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00079.png b/htc/res/offmode_charging_images/charging_full_00079.png
deleted file mode 100644
index 1eddfc2..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00079.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00083.png b/htc/res/offmode_charging_images/charging_full_00083.png
deleted file mode 100644
index 9a3544c..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00083.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00085.png b/htc/res/offmode_charging_images/charging_full_00085.png
deleted file mode 100644
index b899e77..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00085.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00089.png b/htc/res/offmode_charging_images/charging_full_00089.png
deleted file mode 100644
index fd72420..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00089.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00091.png b/htc/res/offmode_charging_images/charging_full_00091.png
deleted file mode 100644
index 5599a2d..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00091.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00095.png b/htc/res/offmode_charging_images/charging_full_00095.png
deleted file mode 100644
index c69b754..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00095.png and /dev/null differ
diff --git a/htc/res/offmode_charging_images/charging_full_00099.png b/htc/res/offmode_charging_images/charging_full_00099.png
deleted file mode 100644
index 9c98cbc..0000000
Binary files a/htc/res/offmode_charging_images/charging_full_00099.png and /dev/null differ
diff --git a/utilities/Android.mk b/utilities/Android.mk
index 79201a3..badd25e 100755
--- a/utilities/Android.mk
+++ b/utilities/Android.mk
@@ -84,6 +84,14 @@ LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
 LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := htcbatt
+LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
+LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
 endif
 
 endif
diff --git a/utilities/choice_fn b/utilities/choice_fn
index 9af6061..aa79c0a 100755
Binary files a/utilities/choice_fn and b/utilities/choice_fn differ
diff --git a/utilities/htcbatt b/utilities/htcbatt
new file mode 100644
index 0000000..d6ddec3
Binary files /dev/null and b/utilities/htcbatt differ
diff --git a/utilities/offmode_charging b/utilities/offmode_charging
index 48da64c..5937612 100755
Binary files a/utilities/offmode_charging and b/utilities/offmode_charging differ