diff --git a/java/res/values-sw540dp/config-per-form-factor.xml b/java/res/values-sw430dp/config-per-form-factor.xml
similarity index 76%
rename from java/res/values-sw540dp/config-per-form-factor.xml
rename to java/res/values-sw430dp/config-per-form-factor.xml
index 7f898e017..8868081c3 100644
--- a/java/res/values-sw540dp/config-per-form-factor.xml
+++ b/java/res/values-sw430dp/config-per-form-factor.xml
@@ -20,13 +20,14 @@
 
 <!-- Configuration values for Large Phone. -->
 <resources>
-    <bool name="config_enable_show_key_preview_popup_option">false</bool>
+    <bool name="config_enable_show_key_preview_popup_option">true</bool>
     <!-- Whether or not Popup on key press is enabled by default -->
-    <bool name="config_default_key_preview_popup">false</bool>
-    <bool name="config_default_sound_enabled">true</bool>
+    <bool name="config_default_key_preview_popup">true</bool>
+    <bool name="config_default_sound_enabled">false</bool>
     <bool name="config_enable_show_voice_key_option">true</bool>
-    <bool name="config_key_selection_by_dragging_finger">false</bool>
+    <bool name="config_key_selection_by_dragging_finger">true</bool>
     <!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if
          false -->
     <bool name="config_show_more_keys_keyboard_at_touched_point">false</bool>
+    <bool name="config_use_fullscreen_mode">false</bool>
 </resources>
diff --git a/java/res/values-sw540dp/config-screen-metrics.xml b/java/res/values-sw430dp/config-screen-metrics.xml
similarity index 100%
rename from java/res/values-sw540dp/config-screen-metrics.xml
rename to java/res/values-sw430dp/config-screen-metrics.xml
diff --git a/java/res/values-sw540dp-land/config.xml b/java/res/values-sw600dp-land/config.xml
similarity index 96%
rename from java/res/values-sw540dp-land/config.xml
rename to java/res/values-sw600dp-land/config.xml
index f4785e721..bd123c499 100644
--- a/java/res/values-sw540dp-land/config.xml
+++ b/java/res/values-sw600dp-land/config.xml
@@ -18,10 +18,8 @@
 */
 -->
 
-<!-- Configuration values for Large Phone and Small Tablet Landscape. -->
+<!-- Configuration values for Small Tablet Landscape. -->
 <resources>
-    <bool name="config_use_fullscreen_mode">false</bool>
-
     <!-- Preferable keyboard height in absolute scale: 45.0mm -->
     <!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
     <dimen name="config_default_keyboard_height">283.5dp</dimen>
diff --git a/java/res/values-sw600dp/config-per-form-factor.xml b/java/res/values-sw600dp/config-per-form-factor.xml
index 1c7e677a9..aa9a05482 100644
--- a/java/res/values-sw600dp/config-per-form-factor.xml
+++ b/java/res/values-sw600dp/config-per-form-factor.xml
@@ -29,4 +29,5 @@
     <!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if
          false -->
     <bool name="config_show_more_keys_keyboard_at_touched_point">false</bool>
+    <bool name="config_use_fullscreen_mode">false</bool>
 </resources>
diff --git a/java/res/values-sw540dp/config.xml b/java/res/values-sw600dp/config.xml
similarity index 98%
rename from java/res/values-sw540dp/config.xml
rename to java/res/values-sw600dp/config.xml
index 8637d6bab..700350c36 100644
--- a/java/res/values-sw540dp/config.xml
+++ b/java/res/values-sw600dp/config.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<!-- Configuration values for Large Phone and Small Tablet Portrait. -->
+<!-- Configuration values for Small Tablet Portrait. -->
 <resources>
     <dimen name="config_key_hysteresis_distance">40.0dp</dimen>
 
diff --git a/java/res/values-sw540dp/touch-position-correction.xml b/java/res/values-sw600dp/touch-position-correction.xml
similarity index 100%
rename from java/res/values-sw540dp/touch-position-correction.xml
rename to java/res/values-sw600dp/touch-position-correction.xml
diff --git a/java/res/values-sw768dp-land/config.xml b/java/res/values-sw768dp-land/config.xml
index b97872f54..4040e29f7 100644
--- a/java/res/values-sw768dp-land/config.xml
+++ b/java/res/values-sw768dp-land/config.xml
@@ -20,8 +20,6 @@
 
 <!-- Configuration values for Large Tablet Landscape. -->
 <resources>
-    <bool name="config_use_fullscreen_mode">false</bool>
-
     <!-- Preferable keyboard height in absolute scale: 58.0mm -->
     <!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
     <dimen name="config_default_keyboard_height">365.4dp</dimen>
diff --git a/java/res/values-sw768dp/config-per-form-factor.xml b/java/res/values-sw768dp/config-per-form-factor.xml
index 136f41567..b90fbaea5 100644
--- a/java/res/values-sw768dp/config-per-form-factor.xml
+++ b/java/res/values-sw768dp/config-per-form-factor.xml
@@ -29,4 +29,5 @@
     <!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if
          false -->
     <bool name="config_show_more_keys_keyboard_at_touched_point">true</bool>
+    <bool name="config_use_fullscreen_mode">false</bool>
 </resources>