diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 60a8c29..93f25a7 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -49,10 +49,10 @@
     <color name="spacebar_text_shadow_color_holo">#80000000</color>
     <color name="gesture_floating_preview_color_holo">#C0000000</color>
     <!-- Color resources for KLP theme. Base color = F0F0F0 -->
-    <color name="highlight_color_holo">#FFF0F0F0</color>
-    <color name="typed_word_color_holo">#D8F0F0F0</color>
-    <color name="suggested_word_color_holo">#B2F0F0F0</color>
-    <color name="highlight_translucent_color_holo">#99E0E0E0</color>
+    <color name="highlight_color_klp">#FFF0F0F0</color>
+    <color name="typed_word_color_klp">#D8F0F0F0</color>
+    <color name="suggested_word_color_klp">#B2F0F0F0</color>
+    <color name="highlight_translucent_color_klp">#99E0E0E0</color>
     <!-- Color resources for setup wizard and tutorial -->
     <color name="setup_background">#FFEBEBEB</color>
     <color name="setup_text_dark">#FF707070</color>
diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml
index 787bd6e..298936d 100644
--- a/java/res/values/themes-common.xml
+++ b/java/res/values/themes-common.xml
@@ -30,7 +30,7 @@
         <item name="maxMoreKeysColumn">@integer/config_max_more_keys_column</item>
     </style>
     <style name="KeyboardView">
-        <item name="keyBackground">@drawable/btn_keyboard_key_ics</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_klp</item>
         <item name="keyLetterSize">@fraction/key_letter_ratio</item>
         <item name="keyLargeLetterRatio">@fraction/key_large_letter_ratio</item>
         <item name="keyLabelSize">@fraction/key_label_ratio</item>
diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-klp.xml
similarity index 77%
rename from java/res/values/themes-ics.xml
rename to java/res/values/themes-klp.xml
index 985c082..a373001 100644
--- a/java/res/values/themes-ics.xml
+++ b/java/res/values/themes-klp.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2011, The Android Open Source Project
+** Copyright 2013, 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.
@@ -19,19 +19,19 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="KeyboardTheme.ICS" parent="KeyboardIcons.Holo">
-        <item name="keyboardStyle">@style/Keyboard.ICS</item>
-        <item name="keyboardViewStyle">@style/KeyboardView.ICS</item>
-        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.ICS</item>
-        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.ICS</item>
-        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.ICS</item>
-        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.ICS</item>
-        <item name="moreKeysKeyboardContainerStyle">@style/MoreKeysKeyboardContainer.ICS</item>
-        <item name="suggestionStripViewStyle">@style/SuggestionStripView.ICS</item>
-        <item name="suggestionWordStyle">@style/SuggestionWord.ICS</item>
+    <style name="KeyboardTheme.KLP" parent="KeyboardIcons.Holo">
+        <item name="keyboardStyle">@style/Keyboard.KLP</item>
+        <item name="keyboardViewStyle">@style/KeyboardView.KLP</item>
+        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.KLP</item>
+        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.KLP</item>
+        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.KLP</item>
+        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.KLP</item>
+        <item name="moreKeysKeyboardContainerStyle">@style/MoreKeysKeyboardContainer.KLP</item>
+        <item name="suggestionStripViewStyle">@style/SuggestionStripView.KLP</item>
+        <item name="suggestionWordStyle">@style/SuggestionWord.KLP</item>
     </style>
     <style
-        name="Keyboard.ICS"
+        name="Keyboard.KLP"
         parent="Keyboard"
     >
         <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
@@ -43,11 +43,11 @@
         <item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item>
     </style>
     <style
-        name="KeyboardView.ICS"
+        name="KeyboardView.KLP"
         parent="KeyboardView"
     >
         <item name="android:background">@drawable/keyboard_background_holo</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_ics</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_klp</item>
         <item name="keyTypeface">bold</item>
         <item name="keyTextColor">@color/key_text_color_holo</item>
         <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_holo</item>
@@ -60,15 +60,15 @@
         <item name="keyTextShadowRadius">0.0</item>
     </style>
     <style
-        name="MainKeyboardView.ICS"
-        parent="KeyboardView.ICS"
+        name="MainKeyboardView.KLP"
+        parent="KeyboardView.KLP"
     >
-        <item name="keyPreviewLayout">@layout/key_preview_ics</item>
+        <item name="keyPreviewLayout">@layout/key_preview_klp</item>
         <item name="keyPreviewOffset">@dimen/key_preview_offset_holo</item>
-        <item name="gestureFloatingPreviewTextColor">@color/highlight_color_holo</item>
+        <item name="gestureFloatingPreviewTextColor">@color/highlight_color_klp</item>
         <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item>
-        <item name="gestureTrailColor">@color/highlight_color_holo</item>
-        <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_holo</item>
+        <item name="gestureTrailColor">@color/highlight_color_klp</item>
+        <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_klp</item>
         <item name="autoCorrectionSpacebarLedEnabled">false</item>
         <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>
         <item name="spacebarTextColor">@color/spacebar_text_color_holo</item>
@@ -77,15 +77,15 @@
     <!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it,
          for instance delete button, need themed {@link KeyboardView} attributes. -->
     <style
-        name="EmojiPalettesView.ICS"
-        parent="KeyboardView.ICS"
+        name="EmojiPalettesView.KLP"
+        parent="KeyboardView.KLP"
     >
-        <item name="keyBackgroundEmojiFunctional">@drawable/btn_keyboard_key_functional_ics</item>
+        <item name="keyBackgroundEmojiFunctional">@drawable/btn_keyboard_key_functional_klp</item>
         <item name="emojiTabLabelColor">@color/emoji_tab_label_color_holo</item>
     </style>
     <style
-        name="MoreKeysKeyboard.ICS"
-        parent="Keyboard.ICS"
+        name="MoreKeysKeyboard.KLP"
+        parent="Keyboard.KLP"
     >
         <item name="keyboardTopPadding">0%p</item>
         <item name="keyboardBottomPadding">0%p</item>
@@ -93,32 +93,32 @@
         <item name="touchPositionCorrectionData">@null</item>
     </style>
     <style
-        name="MoreKeysKeyboardView.ICS"
-        parent="KeyboardView.ICS"
+        name="MoreKeysKeyboardView.KLP"
+        parent="KeyboardView.KLP"
     >
         <item name="android:background">@null</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_popup_klp</item>
         <item name="keyTypeface">normal</item>
         <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_holo</item>
     </style>
     <style
-        name="MoreKeysKeyboardContainer.ICS"
+        name="MoreKeysKeyboardContainer.KLP"
     >
-        <item name="android:background">@drawable/keyboard_popup_panel_background_holo</item>
+        <item name="android:background">@drawable/keyboard_popup_panel_background_klp</item>
     </style>
     <style
-        name="SuggestionStripView.ICS"
+        name="SuggestionStripView.KLP"
         parent="SuggestionStripView"
     >
         <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
         <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item>
-        <item name="colorValidTypedWord">@color/typed_word_color_holo</item>
-        <item name="colorTypedWord">@color/typed_word_color_holo</item>
-        <item name="colorAutoCorrect">@color/highlight_color_holo</item>
-        <item name="colorSuggested">@color/suggested_word_color_holo</item>
+        <item name="colorValidTypedWord">@color/typed_word_color_klp</item>
+        <item name="colorTypedWord">@color/typed_word_color_klp</item>
+        <item name="colorAutoCorrect">@color/highlight_color_klp</item>
+        <item name="colorSuggested">@color/suggested_word_color_klp</item>
         <item name="alphaObsoleted">70%</item>
     </style>
-    <style name="SuggestionWord.ICS">
-        <item name="android:background">@drawable/btn_suggestion_ics</item>
+    <style name="SuggestionWord.KLP">
+        <item name="android:background">@drawable/btn_suggestion_klp</item>
     </style>
 </resources>