diff --git a/res/drawable/dialog_bubble_step02.9.png b/res/drawable/dialog_bubble_step02.9.png
index 62386f2..d77f85f 100755
--- a/res/drawable/dialog_bubble_step02.9.png
+++ b/res/drawable/dialog_bubble_step02.9.png
Binary files differ
diff --git a/res/drawable/dialog_bubble_step03.9.png b/res/drawable/dialog_bubble_step03.9.png
deleted file mode 100755
index 16b4d02..0000000
--- a/res/drawable/dialog_bubble_step03.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/dialog_bubble_step04.9.png b/res/drawable/dialog_bubble_step04.9.png
deleted file mode 100755
index a24012d..0000000
--- a/res/drawable/dialog_bubble_step04.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/dialog_bubble_step07.9.png b/res/drawable/dialog_bubble_step07.9.png
new file mode 100755
index 0000000..80f4a0e
--- /dev/null
+++ b/res/drawable/dialog_bubble_step07.9.png
Binary files differ
diff --git a/res/layout/bubble_text.xml b/res/layout/bubble_text.xml
index eae3ab6..c3957b6 100644
--- a/res/layout/bubble_text.xml
+++ b/res/layout/bubble_text.xml
@@ -25,4 +25,6 @@
     android:textColor="?android:attr/textColorPrimary"
     android:minWidth="32dip"
     android:gravity="center"
+    android:shadowRadius="2.75"
+    android:shadowColor="#BB000000"
     />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 41809c1..25d990e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -70,6 +70,21 @@
     <!-- Description for auto punctuate -->
     <string name="auto_punctuate_summary"></string>
     
+    <!-- Option to enable quick fixes -->
+    <string name="quick_fixes">Quick fixes</string>
+    <!-- Description for quick fixes -->
+    <string name="quick_fixes_summary">Corrects commonly typed mistakes</string>
+    
+    <!-- Option to enable showing suggestions -->
+    <string name="show_suggestions">Show suggestions</string>
+    <!-- Description for show suggestions -->
+    <string name="show_suggestions_summary">Display suggested words while typing</string>
+    
+    <!-- Option to enable auto completion -->
+    <string name="auto_complete">Auto-complete</string>
+    <!-- Description for auto completion -->
+    <string name="auto_complete_summary">Spacebar and punctuation automatically insert highlighted word</string>
+    
     <!-- Array of prediction modes -->
     <string-array name="prediction_modes">
         <item>None</item>
@@ -122,7 +137,33 @@
     <!-- Tip to long press on typed word to add to dictionary -->
     <string name="tip_add_to_dictionary">Press and hold the left-most word to add it to the dictionary
         </string>
-
+        
+    <!-- Instruction to touch the bubble to continue -->
+    <string name="touch_to_continue">Touch this hint to continue »</string>
+    
+    <!-- Instruction to touch the bubble to start typing -->
+    <string name="touch_to_finish">Touch here to close this hint and start typing!</string>
+    
+    <!-- Tutorial tip 1 - The keyboard opens any time you touch a text field -->
+    <string name="tip_to_open_keyboard"><b>The keyboard opens any time you touch a text field</b></string>
+    
+    <!-- Tutorial tip 2 - Touch and hold a key to view accents (examples) -->
+    <string name="tip_to_view_accents"><b>Touch &amp; hold a key to view accents\n(ø, ö, ô, ó, and so on)</b>
+    </string>
+    
+    <!-- Tutorial tip 3 - How to switch to number/symbol keyboard -->
+    <string name="tip_to_open_symbols"><b>Switch to numbers and symbols by touching this key</b></string>
+    
+    <!-- Tutorial tip 4 - How to switch back to alphabet keyboard -->
+    <string name="tip_to_close_symbols"><b>Go back to letters by touching this key again</b></string>
+    
+    <!-- Tutorial tip 5 - How to launch keyboard settings -->
+    <string name="tip_to_launch_settings"><b>Touch &amp; hold this key to change keyboard settings, like auto complete</b></string>
+    
+    <!-- Tutorial tip 6 - Done with the tutorial -->
+    <string name="tip_to_start_typing"><b>Try it!</b></string>
+    
+    
     <!-- Label for soft enter key when it performs GO action.  Must be short to fit on key! -->
     <string name="label_go_key">Go</string>
     <!-- Label for soft enter key when it performs NEXT action.  Must be short to fit on key! -->
diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
index 037d5ff..8652699 100644
--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -37,44 +37,34 @@
             android:defaultValue="true"
             />
 
-    <!--CheckBoxPreference
-            android:key="auto_punctuate"
-            android:title="@string/auto_punctuate"
-            android:persistent="true"
-            android:defaultValue="true"
-            android:visible="false"
-            /-->
-
-    <ListPreference
-            android:key="prediction_mode"
-            android:title="@string/prediction"
-            android:dialogTitle="@string/auto_complete_dialog_title"
-            android:summary="@string/prediction_summary"
-            android:persistent="true" 
-            android:entries="@array/prediction_modes"
-            android:entryValues="@array/prediction_modes_values"
-            android:defaultValue="@string/prediction_basic"
-            />
-
     <PreferenceCategory
             android:title="@string/prediction_category"
             android:key="prediction_settings">
-            
+
         <CheckBoxPreference
-            android:key="hit_correction"
-            android:title="@string/hit_correction"
-            android:summary="@string/hit_correction_summary"
-            android:persistent="true" 
+            android:key="quick_fixes"
+            android:title="@string/quick_fixes"
+            android:summary="@string/quick_fixes_summary"
+            android:persistent="true"
             android:defaultValue="true"
             />
 
         <CheckBoxPreference
-            android:key="prediction_landscape"
-            android:title="@string/prediction_landscape"
-            android:summary="@string/prediction_landscape_summary"
+            android:key="show_suggestions"
+            android:title="@string/show_suggestions"
+            android:summary="@string/show_suggestions_summary"
+            android:persistent="true"
+            android:defaultValue="true"
+            />
+
+        <CheckBoxPreference
+            android:key="auto_complete"
+            android:title="@string/auto_complete"
+            android:summary="@string/auto_complete_summary"
             android:persistent="true" 
-            android:defaultValue="false"
+            android:defaultValue="true"
+            android:dependency="show_suggestions"
             />
             
     </PreferenceCategory>            
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>