diff --git a/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java b/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
index 8fa92fbe..7a3300bc 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
@@ -140,7 +140,7 @@ public class AndroidCalculatorDisplayView extends AutoResizeTextView implements
 	}
 
 	private Preferences.Gui.TextColor getTextColor() {
-		return App.getTheme().getTextColor(App.getApplication());
+		return App.getTheme().getTextColor(getContext());
 	}
 
 	@Nonnull
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorEditorView.java b/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorEditorView.java
index 46be8b9d..da773462 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorEditorView.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorEditorView.java
@@ -30,6 +30,8 @@ import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.view.ContextMenu;
 import android.widget.EditText;
+
+import org.solovyev.android.calculator.onscreen.CalculatorOnscreenService;
 import org.solovyev.common.collections.Collections;
 
 import javax.annotation.Nonnull;
@@ -120,7 +122,12 @@ public class AndroidCalculatorEditorView extends EditText implements CalculatorE
 						try {
 							editorView.viewStateChange = true;
 							editorView.viewState = viewState;
-							editorView.setText(viewState.getTextAsCharSequence(), BufferType.EDITABLE);
+							if (App.getTheme().isLight() && getContext() instanceof CalculatorOnscreenService) {
+								// don't need formatting
+								editorView.setText(viewState.getText());
+							} else {
+								editorView.setText(viewState.getTextAsCharSequence(), BufferType.EDITABLE);
+							}
 							final int selection = CalculatorEditorImpl.correctSelection(viewState.getSelection(), editorView.getText());
 							editorView.setSelection(selection);
 						} finally {
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java b/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java
index 3632c58f..88692583 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java
@@ -33,6 +33,7 @@ import jscl.AngleUnit;
 import jscl.NumeralBase;
 import org.solovyev.android.calculator.math.MathType;
 import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
+import org.solovyev.android.calculator.onscreen.CalculatorOnscreenService;
 import org.solovyev.android.calculator.preferences.PurchaseDialogActivity;
 import org.solovyev.android.calculator.wizard.WizardActivity;
 import org.solovyev.android.prefs.*;
@@ -139,6 +140,9 @@ public final class Preferences {
 				if (context instanceof PurchaseDialogActivity) {
 					return dialogThemeId;
 				}
+				if (App.getTheme().isLight() && context instanceof CalculatorOnscreenService) {
+					return R.style.Cpp_Theme_Material;
+				}
 				return themeId;
 			}
 
diff --git a/android-app/src/main/res/layout/onscreen_editor.xml b/android-app/src/main/res/layout/onscreen_editor.xml
index 918b1c31..16d06f7e 100644
--- a/android-app/src/main/res/layout/onscreen_editor.xml
+++ b/android-app/src/main/res/layout/onscreen_editor.xml
@@ -15,7 +15,7 @@
 
 	<org.solovyev.android.calculator.AndroidCalculatorEditorView
 		a:id="@+id/calculator_editor"
-		style="@style/cpp_onscreen_editor_style"
+		style="@style/CppText.Editor.Onscreen"
 		a:textIsSelectable="true" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/styles.xml b/android-app/src/main/res/values/styles.xml
index c6235d9e..74e57fbf 100644
--- a/android-app/src/main/res/values/styles.xml
+++ b/android-app/src/main/res/values/styles.xml
@@ -40,13 +40,14 @@
 		<item name="directionTextColor">@color/cpp_button_text</item>
 	</style>
 
-	<style name="cpp_onscreen_editor_style" parent="CppText.Editor">
+	<style name="CppText.Editor.Onscreen" parent="CppText.Editor">
 		<item name="android:ellipsize">none</item>
 		<item name="android:singleLine">true</item>
 		<item name="android:maxLines">1</item>
 		<item name="android:minLines">1</item>
 		<item name="android:lines">1</item>
 		<item name="android:scrollbars">horizontal</item>
+		<item name="android:textColor">@color/cpp_text</item>
 	</style>
 
 	<style name="CppText.Editor">
@@ -70,6 +71,7 @@
 
 	<style name="CppText.Display.Onscreen" parent="CppText.Display">
 		<item name="android:textSize">@dimen/cpp_onscreen_display_text_size</item>
+		<item name="android:textColor">@color/cpp_text</item>
 	</style>
 
 	<style name="CppText.About">