diff --git a/app/src/main/java/ru/noties/markwon/MainActivity.java b/app/src/main/java/ru/noties/markwon/MainActivity.java
index f55c3ccc..b50fcbd5 100644
--- a/app/src/main/java/ru/noties/markwon/MainActivity.java
+++ b/app/src/main/java/ru/noties/markwon/MainActivity.java
@@ -6,6 +6,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
 import android.widget.TextView;
@@ -71,7 +72,7 @@ public class MainActivity extends Activity {
             public void apply(final String text) {
                 markdownRenderer.render(MainActivity.this, themes.isLight(), uri(), text, new MarkdownRenderer.MarkdownReadyListener() {
                     @Override
-                    public void onMarkdownReady(@NonNull Markwon markwon, CharSequence markdown) {
+                    public void onMarkdownReady(@NonNull Markwon markwon, Spanned markdown) {
 
                         markwon.setParsedMarkdown(textView, markdown);
 
diff --git a/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java b/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java
index 5c8658e7..c082312a 100644
--- a/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java
+++ b/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java
@@ -6,6 +6,7 @@ import android.os.Handler;
 import android.os.SystemClock;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.text.Spanned;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
@@ -34,7 +35,7 @@ import ru.noties.prism4j.Prism4j;
 public class MarkdownRenderer {
 
     interface MarkdownReadyListener {
-        void onMarkdownReady(@NonNull Markwon markwon, CharSequence markdown);
+        void onMarkdownReady(@NonNull Markwon markwon, Spanned markdown);
     }
 
     @Inject
@@ -105,7 +106,7 @@ public class MarkdownRenderer {
 
                 final long start = SystemClock.uptimeMillis();
 
-                final CharSequence text = markwon.toMarkdown(markdown);
+                final Spanned text = markwon.toMarkdown(markdown);
 
                 final long end = SystemClock.uptimeMillis();
 
diff --git a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TablePlugin.java b/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TablePlugin.java
index b4bbfb00..d9220b01 100644
--- a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TablePlugin.java
+++ b/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TablePlugin.java
@@ -2,6 +2,7 @@ package ru.noties.markwon.ext.tables;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.text.Spanned;
 import android.widget.TextView;
 
 import org.commonmark.ext.gfm.tables.TableBody;
@@ -49,7 +50,7 @@ public class TablePlugin extends AbstractMarkwonPlugin {
     }
 
     @Override
-    public void beforeSetText(@NonNull TextView textView, @NonNull CharSequence markdown) {
+    public void beforeSetText(@NonNull TextView textView, @NonNull Spanned markdown) {
         TableRowsScheduler.unschedule(textView);
     }
 
diff --git a/markwon/src/main/java/ru/noties/markwon/core/MarkwonTheme.java b/markwon/src/main/java/ru/noties/markwon/core/MarkwonTheme.java
index 908e200f..030c0a29 100644
--- a/markwon/src/main/java/ru/noties/markwon/core/MarkwonTheme.java
+++ b/markwon/src/main/java/ru/noties/markwon/core/MarkwonTheme.java
@@ -56,6 +56,7 @@ public class MarkwonTheme {
      * @return {@link Builder instance}
      * @see #builderWithDefaults(Context)
      * @see #builder(MarkwonTheme)
+     * @see #emptyBuilder()
      * @since 1.0.0
      * @deprecated 3.0.0
      */
@@ -75,7 +76,7 @@ public class MarkwonTheme {
      * @since 3.0.0
      */
     @NonNull
-    public static Builder builderNoDefaults() {
+    public static Builder emptyBuilder() {
         return new Builder();
     }