diff --git a/device.mk b/device.mk
index 065629f..343c852 100644
--- a/device.mk
+++ b/device.mk
@@ -87,9 +87,11 @@ PRODUCT_PACKAGES += libCedarA \
 PRODUCT_COPY_FILES += device/allwinner/common/postrecoveryboot.sh:recovery/root/sbin/postrecoveryboot.sh
 
 # and let's get booting!
-PRODUCT_COPY_FILES += device/allwinner/common/ueventd.sun4i.rc:root/ueventd.sun4i.rc \
-	device/allwinner/common/init.sun4i.rc:root/init.sun4i.rc \
-	device/allwinner/common/init.sun4i.usb.rc:root/init.sun4i.usb.rc \
+PRODUCT_COPY_FILES += device/allwinner/common/ueventd.sunxi.rc:root/ueventd.sun4i.rc \
+	device/allwinner/common/ueventd.sunxi.rc:root/ueventd.sun5i.rc \
+	device/allwinner/common/init.sunxi.rc:root/init.sun4i.rc \
+	device/allwinner/common/init.sunxi.rc:root/init.sun5i.rc \
+	device/allwinner/common/init.sunxi.usb.rc:root/init.sunxi.usb.rc \
 #
 
 # let us use the storage
diff --git a/init.sun4i.rc b/init.sunxi.rc
old mode 100755
new mode 100644
similarity index 98%
rename from init.sun4i.rc
rename to init.sunxi.rc
index 40a8a81..4f74598
--- a/init.sun4i.rc
+++ b/init.sunxi.rc
@@ -1,5 +1,5 @@
-import init.sun4i.usb.rc
-import init.sun4i.modules.rc
+import init.sunxi.usb.rc
+import init.${ro.hardware}.modules.rc
 
 on early-init
 
diff --git a/init.sun4i.usb.rc b/init.sunxi.usb.rc
similarity index 100%
rename from init.sun4i.usb.rc
rename to init.sunxi.usb.rc
diff --git a/init.sun4i_sdcard.rc b/init.sunxi_sdcard.rc
similarity index 97%
rename from init.sun4i_sdcard.rc
rename to init.sunxi_sdcard.rc
index c9f749d..9b6ec6d 100755
--- a/init.sun4i_sdcard.rc
+++ b/init.sunxi_sdcard.rc
@@ -1,5 +1,5 @@
-import init.sun4i.usb.rc
-import init.sun4i.modules.rc
+import init.sunxi.usb.rc
+import init.${ro.hardware}.modules.rc
 
 on early-init
 
diff --git a/recovery_keys.c b/recovery_keys.c
index 3aac57b..82b0d61 100644
--- a/recovery_keys.c
+++ b/recovery_keys.c
@@ -15,11 +15,15 @@ int device_handle_key(int key_code, int visible) {
             case KEY_3:
             case KEY_ENTER:
             case KEY_SEARCH:
+            case KEY_DOWN:
+            case KEY_VOLUMEDOWN:
                 return HIGHLIGHT_DOWN;
 
             case KEY_4:
             case KEY_HOME:
             case KEY_MENU:
+            case KEY_UP:
+            case KEY_VOLUMEUP:
                 return HIGHLIGHT_UP;
 
             case KEY_2:
@@ -28,7 +32,7 @@ int device_handle_key(int key_code, int visible) {
             
             case KEY_1:
             case KEY_ESC:
-                if (ui_menu_level > 0) {
+                if (!ui_root_menu) {
                     return GO_BACK;
                 }
         }
diff --git a/ueventd.sun4i.rc b/ueventd.sunxi.rc
similarity index 100%
rename from ueventd.sun4i.rc
rename to ueventd.sunxi.rc