diff --git a/BoardConfig.mk b/BoardConfig.mk
index c63a29b..421ae95 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -86,6 +86,8 @@ TARGET_LIBAGL_USE_GRALLOC_COPYBITS := true
 
 BOARD_NO_RGBX_8888 := true
 
+TARGET_ELECTRONBEAM_FRAMES := 10
+
 # WITH_DEXPREOPT := true
 JS_ENGINE := v8
 
diff --git a/click.mk b/click.mk
index 378e7bf..65a5200 100644
--- a/click.mk
+++ b/click.mk
@@ -22,7 +22,6 @@ PRODUCT_COPY_FILES += \
 
 # Libs to be added to this ROM
 PRODUCT_PACKAGES += \
-    librs_jni \
     sensors.bahamas \
     lights.bahamas \
     copybit.bahamas \
@@ -35,6 +34,7 @@ PRODUCT_PACKAGES += \
     librpc \
     dhcpcd.conf \
     rzscontrol \
+    com.android.future.usb.accessory \
     dexpreopt
 
 DISABLE_DEXPREOPT := false
@@ -70,7 +70,9 @@ PRODUCT_COPY_FILES += \
     frameworks/base/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
     frameworks/base/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
     frameworks/base/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
-    frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml
+    frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
+    frameworks/base/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
+    frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
 
 # keychars and keylayout files
 PRODUCT_COPY_FILES += \
diff --git a/custom/kernel b/custom/kernel
index 749164e..0b142e8 100644
Binary files a/custom/kernel and b/custom/kernel differ
diff --git a/custom/modules/wlan.ko b/custom/modules/wlan.ko
index d28174a..e12ff03 100644
Binary files a/custom/modules/wlan.ko and b/custom/modules/wlan.ko differ
diff --git a/init.bahamas.rc b/init.bahamas.rc
index ec217e0..3dea4c3 100644
--- a/init.bahamas.rc
+++ b/init.bahamas.rc
@@ -100,6 +100,10 @@ service dhcpcd_tiwlan0 /system/bin/dhcpcd -ABKL
     disabled
     oneshot
 
+service iprenew_tiwlan0 /system/bin/dhcpcd -n
+    disabled
+    oneshot
+
 service hciattach /system/bin/hciattach \
     -n -s 115200 /dev/ttyHS0 texasalt 4000000 flow
     user bluetooth
diff --git a/libcamera/QualcommCameraHardware.cpp b/libcamera/QualcommCameraHardware.cpp
index 2198241..abec21f 100644
--- a/libcamera/QualcommCameraHardware.cpp
+++ b/libcamera/QualcommCameraHardware.cpp
@@ -13,7 +13,7 @@
 ** See the License for the specific language governing permissions and
 ** limitations under the License.
 */
-#define REVISION_C "CM.7.0.1."
+#define REVISION_C "CM.7.1.0."
 // #define LOG_NDEBUG 0
 
 #define LOG_TAG "QualcommCameraHardware"
@@ -973,7 +973,6 @@ void QualcommCameraHardware::runJpegEncodeThread(void *data)
     camera_position_type *npt = &pt;
     if(!encode_location) {
         npt = NULL;
-
     }
 
     int jpeg_quality = mParameters.getInt("jpeg-quality");
diff --git a/overlay/packages/apps/ADWLauncher/res/values/config.xml b/overlay/packages/apps/ADWLauncher/res/values/config.xml
deleted file mode 100644
index 5792ca6..0000000
--- a/overlay/packages/apps/ADWLauncher/res/values/config.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <string name="rom_mod_string">KalimAz</string>
-    <bool name="force_hidden_settings">true</bool>
-    <bool name="config_desktopRotation">true</bool>
-    <integer name="config_desktopSpeed">600</integer>
-    <integer name="config_desktopBounce">30</integer>
-    <integer name="config_pageHorizontalMargin">10</integer>
-    <integer name="config_drawerColumnsPortrait">4</integer>
-    <integer name="config_drawerRowsPortrait">3</integer>
-    <integer name="config_drawerColumnsLandscape">4</integer>
-    <integer name="config_drawerRowsLandscape">3</integer>
-    <string name="config_homeBinding">1</string>
-    <string name="config_swipedown_actions">0</string>
-    <string name="config_swipeup_actions">0</string>
-    <bool name="config_drawerAnimated">true</bool>
-    <!-- config_desktopScreens min value is 1, so it will add 1 to whatever value you set here -->
-    <integer name="config_desktopScreens">4</integer>
-    <integer name="config_defaultScreen">2</integer>
-    <bool name="config_hideStatusbar">false</bool>
-    <bool name="config_previewsNew">true</bool>
-    <bool name="config_uiDots">true</bool>
-    <bool name="config_uiDockbar">true</bool>
-    <bool name="config_uiCloseDockbar">false</bool>
-    <bool name="config_uiCloseFolder">false</bool>
-    <bool name="config_uiABBg">false</bool>
-    <!-- config_zoomSpeed min is 300, so it will add 300 to whatever value you set here -->
-    <integer name="config_zoomSpeed">100</integer>
-    <!-- config_uiScaleAB is a float value between 0.1 and 1.0. Set here the default .X-->
-    <integer name="config_uiScaleAB">7</integer>
-    <bool name="config_uiHideLabels">false</bool>
-    <bool name="config_wallpaperHack">true</bool>
-    <integer name="config_highlights_color">0xa0000000</integer>
-    <integer name="config_highlights_color_focus">0xa0000000</integer>
-    <bool name="config_new_selectors">true</bool>
-    <integer name="config_drawer_color">0x80000000</integer>
-    <!-- config_desktopColumns/Rows min value is 3, so it will add 3 to whatever value you set here -->
-    <integer name="config_desktopColumns">1</integer>
-    <integer name="config_desktopRows">1</integer>
-    <bool name="config_autosizeIcons">false</bool>
-    <bool name="config_drawerLabels">true</bool>
-    <bool name="config_fadeDrawerLabels">true</bool>
-    <bool name="config_desktop_indicator">true</bool>
-    <bool name="config_desktop_indicator_autohide">true</bool>
-    <!-- 1=top dots, 2=top slider, 3=bottom slider -->
-    <string name="config_desktop_indicator_type">1</string>
-    <bool name="config_system_persistent">true</bool>
-    <!-- 1=sensor, 2=portrait, 3=landscape -->
-    <string name="config_orientation_default">1</string>
-    <!-- 1=low quality,2=auto, 3=disabled -->
-    <string name="config_screenCache">2</string>
-    <bool name="config_nagScreen">false</bool>
-    <bool name="config_drawer_navigate_catalogs">true</bool>
-    <bool name="config_notif_receiver">true</bool>
-    <!-- config_notif_size min is 10, so it will add 10 to whatever value you set here -->
-    <integer name="config_notif_size">4</integer>
-    <string name="config_main_dock_style">1</string>
-    <string name="config_drawer_style">0</string>
-    <bool name="config_ab_tint">false</bool>
-    <integer name="config_ab_tint_color">0xffffffff</integer>
-    <bool name="config_wallpaper_scroll">true</bool>
-    <string name="config_deletezone_style">1</string>
-    <bool name="config_close_apps_dockbar">true</bool>
-</resources>
diff --git a/overlay/packages/inputmethods/LatinIME/java/res/layout/input_gingerbread.xml b/overlay/packages/inputmethods/LatinIME/java/res/layout/input_gingerbread.xml
new file mode 100644
index 0000000..29a835b
--- /dev/null
+++ b/overlay/packages/inputmethods/LatinIME/java/res/layout/input_gingerbread.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<com.android.inputmethod.latin.LatinKeyboardView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+        android:id="@+id/LatinkeyboardBaseView"
+        android:layout_alignParentBottom="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="@dimen/keyboard_bottom_padding"
+        android:paddingTop="0in"
+        android:background="@drawable/keyboard_dark_background"
+        android:textStyle="bold"
+
+        latin:keyBackground="@drawable/btn_keyboard_key_gingerbread"
+        latin:keyTextStyle="@integer/text_style_bold"
+        />