diff --git a/smali/res/xml/preferences_general.xml b/smali/res/xml/preferences_general.xml
index e453136fe..8a6b528de 100644
--- a/smali/res/xml/preferences_general.xml
+++ b/smali/res/xml/preferences_general.xml
@@ -1,116 +1,120 @@
+ xmlns:custom="http://schemas.android.com/apk/res-auto">
+ android:key="app"
+ android:title="@string/sett_app">
+ android:defaultValue="firstname"
+ android:dialogTitle="@string/sett_flist_sort"
+ android:entries="@array/sett_friends_order"
+ android:entryValues="@array/sett_friends_order_v"
+ android:key="friendsOrderNew"
+ android:textColor="?text_secondary"
+ android:title="@string/sett_flist_sort"/>
+ android:defaultValue="0"
+ android:dialogTitle="@string/sett_font_size"
+ android:entries="@array/sett_font_size_options"
+ android:entryValues="@array/sett_font_size_values"
+ android:key="fontSize"
+ android:title="@string/sett_font_size"/>
+ android:defaultValue="false"
+ android:key="sendByEnter"
+ android:summary="@string/sett_send_by_enter_summary"
+ android:title="@string/sett_send_by_enter"/>
+ android:defaultValue="true"
+ android:key="useChromeCustomTabs"
+ android:summary="@string/sett_chrome_custom_tabs_summary"
+ android:title="@string/sett_chrome_custom_tabs"/>
+ android:defaultValue="true"
+ android:key="trackInstalledApps"
+ android:summary="@string/sett_mytracker_location_crap_summary"
+ android:title="@string/sett_mytracker_apps"/>
-
+ android:defaultValue="false"
+ android:key="isRoamingState"
+ android:summary="@string/sett_roaming_state_submit"
+ android:title="@string/sett_roaming_state"/>
+
+ android:key="multimedia"
+ android:title="@string/sett_media">
+ android:defaultValue="true"
+ android:key="saveProcessedImage"
+ android:title="@string/sett_save_processed_image"
+ custom:singleLine="false"/>
+ android:defaultValue="true"
+ android:key="showMusicSuggestNotification"
+ android:title="@string/sett_show_music_suggestion_notification"
+ custom:singleLine="false"/>
+ android:defaultValue="true"
+ android:key="prefetchAudioMsg"
+ android:title="@string/vkim_settings_prefetch_audiomsg"
+ custom:singleLine="false"/>
+ android:defaultValue="always"
+ android:entries="@array/sett_gif_autoplay_entries"
+ android:entryValues="@array/sett_gif_autoplay_entry_values"
+ android:key="gif_autoplay"
+ android:summary="%s"
+ android:title="@string/sett_gif_autoplay_title"/>
-
+ android:defaultValue="always"
+ android:entries="@array/sett_gif_autoplay_entries"
+ android:entryValues="@array/sett_gif_autoplay_entry_values"
+ android:key="video_autoplay"
+ android:summary="%s"
+ android:title="@string/sett_video_autoplay_title"/>
+
+ android:key="cache"
+ android:title="@string/sett_cache">
+ android:defaultValue="true"
+ android:key="enableAudioCache"
+ android:title="@string/sett_enable_audio_cache"/>
+ android:defaultValue=""
+ android:dialogTitle="@string/sett_cache_location"
+ android:key="audioCacheLocation"
+ android:title="@string/sett_cache_location"/>
+ android:key="downloadAudio"
+ android:title="@string/cache_my_music"/>
+ android:key="clearAudioCache"
+ android:summary=""
+ android:title="@string/sett_clear_audio_cache"/>
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+ android:enabled="false"
+ android:summary="@string/where_is_cache_settings_summ"
+ android:title="@string/where_is_cache_settings"/>
+
\ No newline at end of file
diff --git a/smali/res/xml/preferences_general_milkshake.xml b/smali/res/xml/preferences_general_milkshake.xml
index 2a622f28b..e4fd87c96 100644
--- a/smali/res/xml/preferences_general_milkshake.xml
+++ b/smali/res/xml/preferences_general_milkshake.xml
@@ -1,115 +1,119 @@
+ xmlns:custom="http://schemas.android.com/apk/res-auto">
+ android:key="app"
+ android:title="@string/sett_app">
+ android:defaultValue="firstname"
+ android:dialogTitle="@string/sett_flist_sort"
+ android:entries="@array/sett_friends_order"
+ android:entryValues="@array/sett_friends_order_v"
+ android:key="friendsOrderNew"
+ android:layout="@layout/preference_with_value"
+ android:textColor="?text_secondary"
+ android:title="@string/sett_flist_sort"/>
+ android:defaultValue="0"
+ android:dialogTitle="@string/sett_font_size"
+ android:entries="@array/sett_font_size_options"
+ android:entryValues="@array/sett_font_size_values"
+ android:key="fontSize"
+ android:layout="@layout/preference_with_value"
+ android:title="@string/sett_font_size"/>
+ android:defaultValue="false"
+ android:key="sendByEnter"
+ android:summary="@string/sett_send_by_enter_summary"
+ android:title="@string/sett_send_by_enter"/>
+ android:defaultValue="true"
+ android:key="useChromeCustomTabs"
+ android:summary="@string/sett_chrome_custom_tabs_summary"
+ android:title="@string/sett_chrome_custom_tabs"/>
+ android:defaultValue="true"
+ android:key="trackInstalledApps"
+ android:summary="@string/sett_mytracker_location_crap_summary"
+ android:title="@string/sett_mytracker_apps"/>
+ android:defaultValue="false"
+ android:key="isRoamingState"
+ android:summary="@string/sett_roaming_state_submit"
+ android:title="@string/sett_roaming_state"/>
+ android:key="multimedia"
+ android:title="@string/sett_media">
+ android:defaultValue="true"
+ android:key="saveProcessedImage"
+ android:title="@string/sett_save_processed_image"
+ custom:singleLine="false"/>
+ android:defaultValue="true"
+ android:key="showMusicSuggestNotification"
+ android:title="@string/sett_show_music_suggestion_notification"
+ custom:singleLine="false"/>
+ android:defaultValue="true"
+ android:key="prefetchAudioMsg"
+ android:title="@string/vkim_settings_prefetch_audiomsg"
+ custom:singleLine="false"/>
+ android:defaultValue="always"
+ android:entries="@array/sett_gif_autoplay_entries"
+ android:entryValues="@array/sett_gif_autoplay_entry_values"
+ android:key="gif_autoplay"
+ android:summary="%s"
+ android:title="@string/sett_gif_autoplay_title"/>
+ android:defaultValue="always"
+ android:entries="@array/sett_gif_autoplay_entries"
+ android:entryValues="@array/sett_gif_autoplay_entry_values"
+ android:key="video_autoplay"
+ android:summary="%s"
+ android:title="@string/sett_video_autoplay_title"/>
+ android:key="cache"
+ android:title="@string/sett_cache">
+ android:defaultValue="true"
+ android:key="enableAudioCache"
+ android:title="@string/sett_enable_audio_cache"/>
+ android:defaultValue=""
+ android:dialogTitle="@string/sett_cache_location"
+ android:key="audioCacheLocation"
+ android:title="@string/sett_cache_location"/>
+ android:key="downloadAudio"
+ android:title="@string/cache_my_music"/>
+ android:key="clearAudioCache"
+ android:summary=""
+ android:title="@string/sett_clear_audio_cache"/>
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ android:enabled="false"
+ android:summary="@string/where_is_cache_settings_summ"
+ android:title="@string/where_is_cache_settings"/>
\ No newline at end of file