diff --git a/Changelog-SPQRom.txt b/Changelog-SPQRom.txt
index c6a621e..46715c7 100644
--- a/Changelog-SPQRom.txt
+++ b/Changelog-SPQRom.txt
@@ -1,3 +1,56 @@
+0.7:
+-Using layout overrides for QVGA resolution from Wildfire
+-Handling of compcache % settings in CyanogenMod menu
+From Cyanogen changelog:
+* Common: ADWLauncher 1.3.3 - Ander Webbs
+* Common: Optional overscrolling - Google, Arcee, Robert Burns 
+* Common: Messaging/Phone sliders on lockscreen - Rodolfo Hurtado
+* Common: Lockscreen gestures - Michael Webster
+* Common: Bluetooth FTP server profile - CodeAurora
+* Common: New wallpapers - Prash
+* Common: Super duper unified flashlights - Michael Webster
+* Common: Launch applications via DeskClock - Evan Charlton
+
+0.6:
+-Use ARMv6 optimizations
+From Cyanogen changelog:
+* Common: Various bugfixes from AOSP and CodeAurora
+* Common: ADWLauncher 1.2.0 - Ander Webbs
+* Common: Notification category support - Pedlar
+* Common: Galaxy S style power widget in notification bar - Pedlar
+* Common: Autodetect if we should use /cache for system dex files - Kali-
+* Common: Quick PIN unlock - gsarrica
+* Common: Skia performance enhancements - CodeAurora
+* Common: APN list update - Paul Weiss
+* Common: Fix AGPS issues on all platforms
+* Common: Ability to customize location to save attachments in MMS - Wes Garner
+* Common: Dismiss notifications by swiping - Evan Charlton
+* Common: Enabled Sound Recorder app
+* Common: Bluetooth OBEX performance boost - Sony
+* Common: Updated Terminal Emulator app - Jack Palevich
+* Common: Updated headset drawables - blunden
+
+
+0.5:
+-Fixed phone call with bluetooth handsfree/headset
+-Updated to Android 2.2.1 and latest cyanogen 6.1 sources
+From Cyanogen changelog:
+* ADWLauncher 1.1.5 - Ander Webbs
+* Configurable audio focus for music app - Jonas Larsson
+* APN cleanup (fixes many issues with GPS and MMS) - Cyanogen
+* AudioDSP updates - Antti S. Lankila
+* Status bar themes - Michael Webster
+* Email app updates - Michael Webster
+* Notification "quiet hours" - Evan Charlton
+* Superuser 2.3.6 - Adam Shanks (ChainsDD)
+* Control locking of MMS app in memory - Julian J. M
+* Kill foreground app by long-pressing back - Evan Charlton
+* New AppWidgetPicker dialog - boombuler@XDA
+* FileManager app - OpenIntents
+* Anonymous install statistics gathering - Chris Soyars
+* Dual-mode snooze (long press dismiss) - Evan Charlton
+* Compose SMS/MMS via search button long press - Wes Garner
+
 0.4.1:
 -Fixed libGps, should not cause issues anymore.
 
diff --git a/custom/init.d/08compcache b/custom/init.d/08compcache
index 743b1f5..38225c4 100644
--- a/custom/init.d/08compcache
+++ b/custom/init.d/08compcache
@@ -2,6 +2,14 @@
 
 # - load compcache module
 
+MEMTOTAL=$( awk '{ if ($1 eq "MemTotal:") print $2 ;exit }' </proc/meminfo )
+
+if [ `getprop persist.service.compcache` == 1 ];
+then
+  PROP=`getprop ro.compcache.default`
+  setprop persist.service.compcache $PROP
+fi
+
 if [ -e /data/property/persist.service.compcache ];
 then
   PROP=`getprop persist.service.compcache`
@@ -10,9 +18,12 @@ else
   setprop persist.service.compcache $PROP
 fi
 
-if [ $PROP == 1 ]
+if [ $PROP != 0 ]
 then
-  insmod /system/lib/modules/ramzswap.ko disksize_kb=30720
+  CCSIZE=$(($(($MEMTOTAL * $PROP)) / 100))
+  echo 3 > /proc/sys/vm/drop_caches
+  echo 30 > /proc/sys/vm/swappiness  
+  insmod /system/lib/modules/ramzswap.ko disksize_kb=$CCSIZE
   busybox swapon /dev/block/ramzswap0
 fi
 
diff --git a/extract-files.sh b/extract-files.sh
new file mode 100755
index 0000000..19da341
--- /dev/null
+++ b/extract-files.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# Copyright (C) 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.
+
+mkdir proprietary
+adb pull /system/etc/agps_rm proprietary
+adb pull /system/bin/akm8973 proprietary
+adb pull /system/etc/AudioFilter.csv proprietary
+adb pull /system/etc/AudioPara4.csv proprietary
+adb pull /system/etc/AudioPreProcess.csv proprietary
+adb pull /system/usr/keylayout/AVRCP.kl proprietary
+adb pull /system/usr/keylayout/bahamas-keypad.kl proprietary
+adb pull /system/usr/keylayout/h2w_headset.kl proprietary
+adb pull /system/usr/keylayout/qwerty.kl proprietary
+adb pull /system/etc/firmware/brf6300.bin proprietary
+adb pull /system/etc/firmware/brf6350.bin proprietary
+adb pull /system/etc/wifi/Fw1251r1c.bin proprietary
+adb pull /system/etc/wifi/tiwlan.ini proprietary
+adb pull /system/lib/libA2DP.so proprietary
+adb pull /system/lib/libaudioeq.so proprietary
+adb pull /system/lib/egl/libGLES_qcom.so proprietary
+adb pull /system/lib/libgps.so proprietary
+adb pull /system/lib/libhtc_acoustic.so proprietary
+adb pull /system/lib/libhtc_ril.so proprietary
+adb pull /system/lib/libmm-adspsvc.so proprietary
+adb pull /system/lib/liboemcamera.so proprietary
+adb pull /system/lib/libOmxH264Dec.so proprietary
+adb pull /system/lib/libOmxMpeg4Dec.so proprietary
+adb pull /system/lib/libOmxVidEnc.so proprietary
+adb pull /system/lib/libt9.so proprietary
+adb pull /system/usr/keychars/qwerty.kcm.bin proprietary
+adb pull /system/usr/keychars/qwerty2.kcm.bin proprietary
+adb pull /system/lib/hw/sensors.bahamas.so proprietary
+adb pull /system/etc/spn-conf.xml proprietary
+adb pull /system/etc/voicemail-conf.xml proprietary
diff --git a/overlay/frameworks/base/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml b/overlay/frameworks/base/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
old mode 100644
new mode 100755
diff --git a/overlay/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml b/overlay/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
deleted file mode 100644
index 18ee43c..0000000
--- a/overlay/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 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.
-*/
--->
-
-<!-- This is the general lock screen which shows information about the
-  state of the device, as well as instructions on how to get past it
-  depending on the state of the device.  It is the same for landscape
-  and portrait.-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tabunlock="http://schemas.android.com/apk/res/com.android.tabunlock"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#70000000"
-    android:gravity="center_horizontal"
-    android:id="@+id/root">
-
-    <TextView
-        android:id="@+id/carrier"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="10dip"
-        android:layout_marginRight="8dip"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:gravity="right|bottom"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="22sp"
-        />
-
-    <!-- "emergency calls only" shown when sim is missing or PUKd -->
-    <TextView
-        android:id="@+id/emergencyCallText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/carrier"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="0dip"
-        android:layout_marginRight="8dip"
-        android:text="@string/emergency_calls_only"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="@color/white"
-       />
-
-    <!-- time and date -->
-    <com.android.internal.widget.DigitalClock android:id="@+id/time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/carrier"
-        android:layout_marginTop="20dip"
-        android:layout_marginLeft="20dip"
-        android:paddingBottom="8dip"
-        >
-
-        <TextView android:id="@+id/timeDisplay"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="none"
-            android:textSize="72sp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:shadowColor="#C0000000"
-            android:shadowDx="0"
-            android:shadowDy="0"
-            android:shadowRadius="3.0"
-            android:layout_marginBottom="10dip"
-            />
-
-
-        <TextView android:id="@+id/am_pm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/timeDisplay"
-            android:layout_alignBaseline="@id/timeDisplay"
-            android:singleLine="true"
-            android:ellipsize="none"
-            android:textSize="22sp"
-            android:layout_marginLeft="8dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:shadowColor="#C0000000"
-            android:shadowDx="0"
-            android:shadowDy="0"
-            android:shadowRadius="3.0"
-            />
-
-    </com.android.internal.widget.DigitalClock>
-
-    <TextView
-        android:id="@+id/date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/time"
-        android:layout_marginLeft="24dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        />
-
-    <TextView
-        android:id="@+id/status1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/date"
-        android:layout_marginTop="4dip"
-        android:layout_marginLeft="24dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:drawablePadding="4dip"
-        />
-
-    <TextView
-        android:id="@+id/status2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/status1"
-        android:layout_marginTop="4dip"
-        android:layout_marginLeft="24dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:drawablePadding="4dip"
-        />
-        
-    <TextView
-        android:id="@+id/customMsg"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4.0dip"
-        android:layout_marginLeft="24dip"
-        android:layout_marginRight="24dip"
-        android:layout_below="@id/status2"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        />
-
-    <TextView
-        android:id="@+id/screenLocked"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/customMsg"
-        android:layout_marginLeft="24dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_marginTop="4.0dip"
-        android:drawablePadding="4dip"
-        />
-
-    <com.android.internal.widget.SlidingTab
-        android:id="@+id/tab_selector"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="55dip"
-        />
-
-    <!-- emergency call button shown when sim is PUKd and tab_selector is
-         hidden -->
-    <Button
-        android:id="@+id/emergencyCallButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:drawableLeft="@drawable/ic_emergency"
-        android:layout_centerInParent="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="55dip"
-        style="@style/Widget.Button.Transparent"
-        android:drawablePadding="8dip"
-        android:visibility="gone"
-        />
-
-    <!-- music control buttons -->
-    <ImageButton
-        android:id="@+id/musicControlPlay"
-        android:src="@drawable/ic_media_play"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:layout_alignParentBottom="true"
-        android:padding="10px"
-        android:background="@color/transparent"
-        android:visibility="gone"
-        />
-    <ImageButton
-        android:id="@+id/musicControlPause"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_media_pause"
-        android:layout_centerInParent="true"
-        android:layout_alignParentBottom="true"
-        android:padding="10px"
-        android:background="@color/transparent"
-        android:visibility="gone"
-        />
-    <ImageButton
-        android:id="@+id/musicControlPrevious"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_media_previous"
-        android:layout_alignParentBottom="true"
-        android:padding="10px"
-        android:layout_toLeftOf="@+id/musicControlPause"
-        android:background="@color/transparent"
-        android:visibility="gone"
-        />
-    <ImageButton
-        android:id="@+id/musicControlNext"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_media_next"
-        android:layout_alignParentBottom="true"
-        android:padding="10px"
-        android:layout_toRightOf="@+id/musicControlPause"
-        android:background="@color/transparent"
-        android:visibility="gone"
-        />
-        
-
-</RelativeLayout>
-
diff --git a/overlay/frameworks/base/core/res/res/layout/twelve_key_entry.xml b/overlay/frameworks/base/core/res/res/layout/twelve_key_entry.xml
old mode 100644
new mode 100755
diff --git a/overlay/frameworks/base/core/res/res/layout/usb_storage_activity.xml b/overlay/frameworks/base/core/res/res/layout/usb_storage_activity.xml
old mode 100644
new mode 100755
diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/overlay/frameworks/base/core/res/res/values/dimens.xml
old mode 100644
new mode 100755
diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
new file mode 100644
index 0000000..1dbf813
--- /dev/null
+++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -0,0 +1,22 @@
+<?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>
+    <bool name="def_accelerometer_rotation">true</bool>
+    <bool name="def_screen_brightness_automatic_mode">true</bool>
+</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/ADWLauncher/res/xml/default_workspace.xml b/overlay/packages/apps/ADWLauncher/res/xml/default_workspace.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/CMParts/res/values/config.xml b/overlay/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 0000000..05a8ff9
--- /dev/null
+++ b/overlay/packages/apps/CMParts/res/values/config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <!-- Whether or not to display the trackball settings -->
+    <bool name="has_trackball">true</bool>
+    <bool name="has_rgb_notification_led">false</bool>
+
+    <!-- LED Flashlight -->
+    <bool name="has_led_flash">true</bool>
+</resources>
diff --git a/overlay/packages/apps/Camera/res/values/config.xml b/overlay/packages/apps/Camera/res/values/config.xml
index 2f7c41d..6734bf3 100644
--- a/overlay/packages/apps/Camera/res/values/config.xml
+++ b/overlay/packages/apps/Camera/res/values/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
 ** Copyright 2009, The Android Open Source Project
@@ -23,4 +23,4 @@
 	<!-- set this to true if the device doesn't have a GPU, or an EGL
 	     library is for some reason unavailable -->
 	<bool name="softwareGLOnly">true</bool>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Contacts/res/layout-finger/dialpad.xml b/overlay/packages/apps/Contacts/res/layout-finger/dialpad.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Contacts/res/layout-finger/twelve_key_dialer.xml b/overlay/packages/apps/Contacts/res/layout-finger/twelve_key_dialer.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/DeskClock/res/layout-land/desk_clock.xml b/overlay/packages/apps/DeskClock/res/layout-land/desk_clock.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/DeskClock/res/layout/desk_clock.xml b/overlay/packages/apps/DeskClock/res/layout/desk_clock.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/DeskClock/res/layout/desk_clock_time_date.xml b/overlay/packages/apps/DeskClock/res/layout/desk_clock_time_date.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Launcher2/res/layout/all_apps.xml b/overlay/packages/apps/Launcher2/res/layout/all_apps.xml
new file mode 100755
index 0000000..14f42c0
--- /dev/null
+++ b/overlay/packages/apps/Launcher2/res/layout/all_apps.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+-->
+
+<!-- This file is generated by device/htc/buzz/setup-makefiles.sh -->
+
+<!-- switch to all_apps_3d on devices that support RenderScript -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <include layout="@layout/all_apps_3d" />
+</merge>
diff --git a/overlay/packages/apps/Launcher2/res/values/config.xml b/overlay/packages/apps/Launcher2/res/values/config.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Phone/res/layout-finger/dialpad.xml b/overlay/packages/apps/Phone/res/layout-finger/dialpad.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Phone/res/layout-finger/dtmf_twelve_key_dialer.xml b/overlay/packages/apps/Phone/res/layout-finger/dtmf_twelve_key_dialer.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Phone/res/layout-finger/emergency_dialer.xml b/overlay/packages/apps/Phone/res/layout-finger/emergency_dialer.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Phone/res/layout-finger/non_drawer_dialpad.xml b/overlay/packages/apps/Phone/res/layout-finger/non_drawer_dialpad.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Phone/res/layout/call_card.xml b/overlay/packages/apps/Phone/res/layout/call_card.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Phone/res/layout/call_card_person_info.xml b/overlay/packages/apps/Phone/res/layout/call_card_person_info.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Phone/res/layout/incall_touch_ui.xml b/overlay/packages/apps/Phone/res/layout/incall_touch_ui.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Phone/res/values/styles.xml b/overlay/packages/apps/Phone/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Settings/res/layout/choose_lock_password.xml b/overlay/packages/apps/Settings/res/layout/choose_lock_password.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Settings/res/layout/choose_lock_pattern.xml b/overlay/packages/apps/Settings/res/layout/choose_lock_pattern.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Settings/res/layout/choose_lock_pattern_example.xml b/overlay/packages/apps/Settings/res/layout/choose_lock_pattern_example.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Settings/res/layout/confirm_lock_password.xml b/overlay/packages/apps/Settings/res/layout/confirm_lock_password.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Settings/res/layout/confirm_lock_pattern.xml b/overlay/packages/apps/Settings/res/layout/confirm_lock_pattern.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Stk/res/drawable-mdpi/ic_launcher_sim_toolkit.png b/overlay/packages/apps/Stk/res/drawable-mdpi/ic_launcher_sim_toolkit.png
old mode 100644
new mode 100755
diff --git a/overlay/packages/apps/Torch/res/layout/mainnew.xml b/overlay/packages/apps/Torch/res/layout/mainnew.xml
new file mode 100755
index 0000000..da3d4b7
--- /dev/null
+++ b/overlay/packages/apps/Torch/res/layout/mainnew.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+
+    <Button
+        android:id="@+id/buttonOn"
+        android:layout_width="30mm"
+        android:layout_height="15mm"
+        android:layout_marginTop="9mm"
+                android:layout_marginBottom="5mm"
+
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:text="@string/label_on"
+        android:textSize="18pt"
+        />
+    <View
+        android:id="@+id/ruler1"
+        android:layout_height="1dp"
+                android:layout_marginTop="3mm"
+
+        android:layout_width="fill_parent"
+        android:background="#555"
+        android:layout_below="@id/buttonOn"
+    />
+    <RelativeLayout
+        android:id="@+id/brightRow"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="1mm"
+        android:layout_marginTop="1mm"
+
+        android:orientation="horizontal"
+        android:layout_below="@id/ruler1"
+        >
+    <TextView
+        android:id="@+id/brightLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/label_high"
+        android:textStyle="bold"
+        android:textColor="#fff"
+        android:textSize="18dp"
+        android:layout_marginLeft="3mm"
+        android:layout_marginTop="2mm"
+        android:layout_centerVertical="true"
+        android:layout_alignParentLeft="true"
+        />
+
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:id="@+id/bright"
+        android:layout_alignParentRight="true"
+        />
+    </RelativeLayout>
+    <View
+        android:id="@+id/ruler2"
+        android:layout_height="1dp"
+        android:layout_width="fill_parent"
+        android:background="#555"
+        android:layout_below="@id/brightRow"
+    />
+        <RelativeLayout
+        android:id="@+id/strobeRow"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_below="@id/ruler2"
+        >
+    <TextView
+        android:id="@+id/strobeLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#fff"
+        android:layout_marginLeft="3mm"
+        android:textSize="18dp"
+        android:layout_marginTop="2mm"
+        android:text="@string/label_strobe"
+        android:textStyle="bold"
+        android:layout_alignParentLeft="true"
+        />
+        <TextView
+            android:id="@+id/strobeTimeLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="3mm"
+
+        android:text="@string/label_frequency"
+            android:layout_below="@id/strobeLabel"
+           />
+
+        <SeekBar
+            android:id="@+id/slider"
+            android:layout_width="300dip"
+            android:layout_height="30dip"
+            android:max="400"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_marginTop="1mm"
+            android:layout_below="@+id/strobeTimeLabel"
+            android:layout_centerHorizontal="true" />
+
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/strobe"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="1mm"
+        />
+    </RelativeLayout>
+
+    <View
+        android:id="@+id/ruler3"
+        android:layout_height="1dp"
+        android:layout_width="fill_parent"
+        android:layout_marginTop="2mm"
+        android:background="#555"
+        android:layout_below="@id/strobeRow"
+    />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/label_info"
+        android:textColor="#ffffd0"
+        android:background="#000040"
+        android:layout_centerHorizontal="true"
+        />
+
+</RelativeLayout>
diff --git a/overlay/packages/inputmethods/LatinIME/java/res/values-land/dimens.xml b/overlay/packages/inputmethods/LatinIME/java/res/values-land/dimens.xml
old mode 100644
new mode 100755
diff --git a/overlay/packages/inputmethods/LatinIME/java/res/values/dimens.xml b/overlay/packages/inputmethods/LatinIME/java/res/values/dimens.xml
old mode 100644
new mode 100755