diff --git a/android-app/src/main/java/org/solovyev/android/calculator/release/ChooseThemeReleaseNoteFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/release/ChooseThemeReleaseNoteFragment.java
new file mode 100644
index 00000000..51aa99a9
--- /dev/null
+++ b/android-app/src/main/java/org/solovyev/android/calculator/release/ChooseThemeReleaseNoteFragment.java
@@ -0,0 +1,18 @@
+package org.solovyev.android.calculator.release;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+import org.solovyev.android.calculator.R;
+import org.solovyev.android.calculator.wizard.ChooseThemeWizardStep;
+
+public class ChooseThemeReleaseNoteFragment extends ChooseThemeWizardStep {
+
+	@Override
+	public void onViewCreated(View root, Bundle savedInstanceState) {
+		super.onViewCreated(root, savedInstanceState);
+
+		final TextView title = (TextView) root.findViewById(R.id.wizard_theme_title);
+		title.setText(R.string.release_notes_choose_theme);
+	}
+}
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorWizards.java b/android-app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorWizards.java
index 84d9cc93..86156d76 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorWizards.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorWizards.java
@@ -3,6 +3,8 @@ package org.solovyev.android.calculator.wizard;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import org.solovyev.android.calculator.release.ChooseThemeReleaseNoteFragment;
 import org.solovyev.android.calculator.release.ReleaseNoteStep;
 import org.solovyev.android.calculator.release.ReleaseNotes;
 import org.solovyev.android.wizard.*;
@@ -88,7 +90,13 @@ public class CalculatorWizards implements Wizards {
 		for (Integer version : versions) {
 			switch (version) {
 				case 136:
-					wizardSteps.add(CalculatorWizardStep.choose_theme);
+					wizardSteps.add(new ReleaseNoteStep(version) {
+						@Nonnull
+						@Override
+						public Class<? extends Fragment> getFragmentClass() {
+							return ChooseThemeReleaseNoteFragment.class;
+						}
+					});
 					break;
 				default:
 					wizardSteps.add(new ReleaseNoteStep(version));
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java
index 5a3c9f1c..3d55222d 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java
@@ -114,7 +114,7 @@ public class WizardActivity extends BaseActivity implements WizardsAware {
 
 			final AlertDialog.Builder b = new AlertDialog.Builder(this);
 			b.setTitle(getString(R.string.wizard_finish_confirmation_title)).
-					setMessage(R.string.acl_wizard_finish_confirmation).
+					setMessage(R.string.cpp_wizard_finish_confirmation).
 					setNegativeButton(R.string.c_no, dialogListener).
 					setPositiveButton(R.string.c_yes, dialogListener).
 					setOnCancelListener(dialogListener);
diff --git a/android-app/src/main/res/layout/cpp_wizard_step_choose_theme.xml b/android-app/src/main/res/layout/cpp_wizard_step_choose_theme.xml
index 798aa352..6febe723 100644
--- a/android-app/src/main/res/layout/cpp_wizard_step_choose_theme.xml
+++ b/android-app/src/main/res/layout/cpp_wizard_step_choose_theme.xml
@@ -30,6 +30,7 @@
 
 	<TextView
 		a:layout_width="wrap_content"
+		a:id="@+id/wizard_theme_title"
 		a:layout_height="wrap_content"
 		a:textAppearance="@android:style/TextAppearance.Large"
 		style="@style/WizardLabel"
diff --git a/android-app/src/main/res/values-el/text_wizard.xml b/android-app/src/main/res/values-el/text_wizard.xml
index 1ecd0b8d..9ddbbfa6 100644
--- a/android-app/src/main/res/values-el/text_wizard.xml
+++ b/android-app/src/main/res/values-el/text_wizard.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="cpp_wizard_next">Επόμενο</string>
-  <string name="cpp_wizard_back">Πίσω</string>
-  <string name="cpp_wizard_finish">Τέλος</string>
-  <string name="cpp_wizard_start">Έναρξη οδηγού</string>
   <string name="cpp_wizard_layout_optimized">Optimized</string>
   <string name="cpp_wizard_layout_big_buttons">Μεγάλα κουμπιά</string>
   <string name="cpp_wizard_mode_simple">Απλό</string>
diff --git a/android-app/src/main/res/values-ru/strings.xml b/android-app/src/main/res/values-ru/strings.xml
index 808e4532..bc88d3c4 100644
--- a/android-app/src/main/res/values-ru/strings.xml
+++ b/android-app/src/main/res/values-ru/strings.xml
@@ -3,16 +3,20 @@
 	<string name="acl_wizard_finish_confirmation">Вы действительно хотите завершить визард?</string>
 	<string name="acl_wizard_next">Далее</string>
 	<string name="acl_wizard_back">Назад</string>
-	<string name="acl_wizard_finish">Завершить</string>
+	<string name="acl_wizard_finish">Готово</string>
 	<string name="acl_wizard_start">Начать визард</string>
 	<string name="cpp_clear_history">Отчистить</string>
 	<string name="cpp_clear_history_message">Вся история будет отчищена</string>
 	<string name="cpp_clear_history_title">Отчистить историю?</string>
 	<string name="wizard_start">Начать визард</string>
 	<string name="wizard_skip">Пропустить</string>
-	<string name="wizard_finish">Закончить</string>
+	<string name="wizard_finish">Готово</string>
 	<string name="wizard_next">Далее</string>
 	<string name="wizard_prev">Назад</string>
 	<string name="wizard_final">Приложение настроено и готово к использованию.</string>
 	<string name="wizard_finish_confirmation_title">Закончить?</string>
+	<string name="cpp_new_in_version">Новое в версии %1$s</string>
+	<string name="release_notes_choose_theme">Хотите попробовать новые темы в стиле Material? Выберите их из списка:</string>
+	<string name="cpp_wizard_theme_title">Выберите тему</string>
+
 </resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/strings.xml b/android-app/src/main/res/values/strings.xml
index 85481516..7ecd2bcb 100644
--- a/android-app/src/main/res/values/strings.xml
+++ b/android-app/src/main/res/values/strings.xml
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="acl_wizard_finish_confirmation">Do you really want to finish wizard?</string>
 	<string name="wizard_finish_confirmation_title">Finish?</string>
 	<string name="acl_wizard_next">Next</string>
 	<string name="acl_wizard_back">Back</string>
-	<string name="acl_wizard_finish">Finish</string>
+	<string name="acl_wizard_finish">Done</string>
 	<string name="acl_wizard_start">Start wizard</string>
 	<string name="cpp_clear_history_title">Clear history?</string>
 	<string name="cpp_clear_history_message">All history will be cleared.</string>
 	<string name="cpp_clear_history">Clear</string>
-	<string name="wizard_start">Start wizard</string>
-	<string name="wizard_next">Next</string>
-	<string name="wizard_prev">Back</string>
-	<string name="wizard_final">The app is set up and ready to use.</string>
 	<string name="wizard_skip">Skip</string>
-	<string name="wizard_finish">Finish</string>
 	<string name="cpp_new_in_version">New in %1$s version</string>
+	<string name="release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
 </resources>
\ No newline at end of file