diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 638fb6b5..0084ba74 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,7 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="USE_SAME_INDENTS" value="true" />
-    <option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true" />
     <option name="OTHER_INDENT_OPTIONS">
       <value>
         <option name="INDENT_SIZE" value="2" />
@@ -9,12 +7,12 @@
         <option name="TAB_SIZE" value="2" />
       </value>
     </option>
-    <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
-    <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
     <option name="KEEP_LINE_BREAKS" value="false" />
-    <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+    <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+    <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+    <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
     <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
     <option name="ALIGN_MULTILINE_FOR" value="false" />
@@ -87,15 +85,6 @@
           <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
@@ -103,9 +92,6 @@
     <MarkdownNavigatorCodeStyleSettings>
       <option name="RIGHT_MARGIN" value="72" />
     </MarkdownNavigatorCodeStyleSettings>
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
     <ADDITIONAL_INDENT_OPTIONS fileType="php">
       <option name="INDENT_SIZE" value="2" />
       <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea5..00000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4264f45b..e3ba9f6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,67 @@
 Change Log
 ==========
 
+Version 3.0.4 *(2025-05-07)*
+----------------------------
+
+Bugfix:
+- Layout fixes for 35
+- callback not working (href needs to start with "http://)
+
+Feature:
+- better logging
+
+Update:
+- gradle-lib:8.10.0
+
+Version 3.0.3 *(2024-12-08)*
+----------------------------
+
+Bugfix:
+
+Feature:
+
+Update:
+- gradle-lib:8.7.3
+- gradle:8.11.1
+- appcompat:1.7.0
+- kotlin-bom:2.0.2
+- COMPILE_SDK_VERSION=35
+- TARGET_SDK_VERSION=35
+
+Version 3.0.2 *(2024-04-15)*
+----------------------------
+
+Bugfix:
+- add onWindowFocusChanged() by IntuzMayurS
+
+Feature:
+- setTextColor("initial") resets to default text color
+- setBackgroundColor("initial") resets to default background color
+
+Update:
+- gradle:8.3.2
+- openjdk17 from 21 for jitpack
+- gradle-8.7
+
+
+Version 3.0.1 *(2024-02-26)*
+----------------------------
+
+Bugfix:
+- insertHTML now according to setHTML
+
+Update:
+- gradle:8.2.2
+- Compile / Target SDK Version 3x -> 34
+
+
+Version 3.0.0 *(2024-01-11)*
+----------------------------
+
+Feature:
+- New version, new author: lots of changes
+
 Version 2.0.0 *(2020-09-16)*
 ----------------------------
 
@@ -14,7 +75,7 @@ Update:
 
 Bugfix:
 - Fixed placeholder [#240](https://github.com/wasabeef/richeditor-android/pull/240)
-- Fixed typp [#194](https://github.com/wasabeef/richeditor-android/pull/194)
+- Fixed typo [#194](https://github.com/wasabeef/richeditor-android/pull/194)
 - Fixed Url decoding [#123](https://github.com/wasabeef/richeditor-android/pull/123)
 - Fixed shouldOverrideUrlLoading [#133](https://github.com/wasabeef/richeditor-android/pull/133)
 - Use encodeURIComponent() [#145](https://github.com/wasabeef/richeditor-android/pull/145)
diff --git a/README.md b/README.md
index 7760395f..5c5abdf6 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,19 @@
-<p align="center">
-  <a href="https://pub.dev/packages/flutter_gen">
-    <img src="https://github.com/wasabeef/richeditor-android/raw/master/art/logo.png" width="480px"/>
-  </a>
+<p style="text-align: center;">
+  <img src="https://github.com/niendo1/richeditor-android/raw/master/art/logo.png" width="480px" alt="Logo"/>
 </p>
-<p align="center">
-  <a href="https://android-arsenal.com/details/1/1696">
-    <img src="https://img.shields.io/badge/Android%20Arsenal-richeditor--android-brightgreen.svg?style=flat">
-  </a>
-  <a href="https://www.apache.org/licenses/LICENSE-2.0">
-    <img src="https://img.shields.io/badge/license-Apache%202-blue.svg" />
-  </a>
-  <a href="https://search.maven.org/artifact/jp.wasabeef/richeditor-android">
-    <img src="https://maven-badges.herokuapp.com/maven-central/jp.wasabeef/richeditor-android/badge.svg" />
-  </a>
+<p style="text-align: center;">
+<a href="https://www.apache.org/licenses/LICENSE-2.0"><img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="License Apache 2.0"/></a>
+<a href="https://jitpack.io/#niendo1/richeditor-android"><img src="https://jitpack.io/v/niendo1/richeditor-android.svg" alt="JitPack-Lib"/></a>
+<a href="https://javadoc.jitpack.io/com/github/niendo1/richeditor-android/latest/javadoc/"><img src="https://github.com/niendo1/richeditor-android/raw/master/art/javadoc.svg" alt="JavaDoc"/></a>
 </p>
 
-`RichEditor for Android` is a beautiful Rich Text `WYSIWYG Editor` for `Android`.
+---
+
+This is a fork, which tries to merge changes from [Andrew-Chen-Wang/RichEditorView](https://github.com/Andrew-Chen-Wang/RichEditorView)
+
+---
+
+`RichEditor for Android` is a beautiful HTML `WYSIWYG Editor` for `Android` based on webview.
 
 - _Looking for iOS? Check out_ [cjwirth/RichEditorView](https://github.com/cjwirth/RichEditorView)
 
@@ -24,6 +22,7 @@ Supported Functions
 
 ![Toolbar](./art/demo.gif)
 
+- [x] (new?) Remove Format
 - [x] Bold
 - [x] Italic
 - [x] Subscript
@@ -34,6 +33,7 @@ Supported Functions
 - [x] Justify Center
 - [x] Justify Right
 - [x] Blockquote
+- [x] (new) Pre-Section
 - [x] Heading 1
 - [x] Heading 2
 - [x] Heading 3
@@ -44,17 +44,29 @@ Supported Functions
 - [x] Redo
 - [x] Indent
 - [x] Outdent
+- [x] (new) Insert HTML Code
+- [x] (new) Insert Horizontal Line
 - [x] Insert Image
+- [x] (new) Insert Inline Image
 - [x] Insert Youtube
+- [x] Insert iframe (new)
 - [x] Insert Video
 - [x] Insert Audio
 - [x] Insert Link
 - [x] Checkbox
 - [x] Text Color
+- [x] (new) Text Color (String)
 - [x] Text Background Color
+- [x] (new) Text Background Color (String)
+- [x] (new) Font Family
 - [x] Text Font Size
 - [x] Unordered List (Bullets)
 - [x] Ordered List (Numbers)
+- [x] (new) Get Selected Text
+- [x] (new) Get Selected Href
+- [x] (new) Table
+- [x] (new) Collapsible Section
+- [x] (new) Run and acquire data direct from JavaScript (requestJSData)
 
 Attribute change of editor
 ---
@@ -64,11 +76,9 @@ Attribute change of editor
 - [x] Height
 - [x] Placeholder
 - [x] Load CSS
-- [x] State Callback
-
-**Milestone**
-
-- [ ] Font Family
+- [x] (new) Load Font
+- [x] (new) getFontFamily
+- [x] State Callback 
 
 Demo
 ---
@@ -81,15 +91,56 @@ How do I use it?
 ### Setup
 
 ##### Gradle
-```groovy
+
+```gradle
 repositories {
-  mavenCentral()
+   mavenCentral()
+   maven { url "https://jitpack.io" }
 }
 
 dependencies {
-  implementation 'jp.wasabeef:richeditor-android:2.0.0'
+  implementation 'com.github.niendo1:richeditor-android:3.0.2'
 }
 ```
+
+##### Maven
+
+```xml
+<repositories>
+  <repository>
+  <id>jitpack.io</id>
+		    <url>https://jitpack.io</url>
+		</repository>
+  </repositories>
+```
+
+```xml
+<dependency>
+	    <groupId>com.github.niendo1</groupId>
+        <artifactId>richeditor-android</artifactId>
+	    <version>3.0.2</version>
+</dependency>
+
+```
+
+##### leiningen
+
+```leiningen
+
+:repositories [["jitpack" "https://jitpack.io"]]
+:dependencies [[com.github.niendo1/richeditor-android "3.0.2"]]
+
+```
+
+##### sbt
+
+```sbt
+
+resolvers += "jitpack" at "https://jitpack.io"
+libraryDependencies += "com.github.niendo1" % "richeditor-android" % "3.0.2"
+
+```
+
 ### Default Setting for Editor
 ---
 
@@ -102,6 +153,8 @@ editor.setEditorHeight(200);
 ```java
 editor.setEditorFontSize(22);
 editor.setEditorFontColor(Color.RED);
+editor.setTextColor("initial");
+editor.setFontFamily("fantasy");
 ```
 
 **Background**
@@ -123,7 +176,9 @@ editor.setPlaceholder("Insert text here...");
 ```
 
 **Others**  
-Please refer the [samples](https://github.com/wasabeef/richeditor-android/blob/master/sample/src/main/java/jp/wasabeef/sample/MainActivity.java) for usage.
+Please refer
+the [samples](https://github.com/niendo1/richeditor-android/blob/master/sample/src/main/java/jp/wasabeef/sample/MainActivity.java)
+for usage.
 
 ### Functions for ContentEditable
 ---
@@ -146,7 +201,7 @@ editor.insertImage("https://raw.githubusercontent.com/wasabeef/art/master/twitte
 **Text Change Listener**
 ```java
 RichEditor editor = (RichEditor) findViewById(R.id.editor);
-editor. setOnTextChangeListener(new RichEditor.OnTextChangeListener() {
+editor.setOnTextChangeListener(new RichEditor.OnTextChangeListener() {
   @Override
   public void onTextChange(String text) {
     // Do Something
@@ -156,31 +211,35 @@ editor. setOnTextChangeListener(new RichEditor.OnTextChangeListener() {
 ```
 
 **Others**  
-Please refer the [samples](https://github.com/wasabeef/richeditor-android/blob/master/sample/src/main/java/jp/wasabeef/sample/MainActivity.java) for usage.
+Please refer
+the [samples](https://github.com/niendo1/richeditor-android/blob/master/sample/src/main/java/jp/wasabeef/sample/MainActivity.java)
+for usage.
 
 Requirements
 --------------
-Android 4+
+Android 7+ (Level 24)
 
 Applications using RichEditor for Android
 ---
 
-Please [ping](mailto:dadadada.chop@gmail.com) me or send a pull request if you would like to be added here.
+Please [ping](mailto:peter@niendo.de) me or send a pull request if you would like to be added here.
 
-Icon | Application
------------- | -------------
-<img src="https://lh6.ggpht.com/6zKH_uQY1bxCwXL4DLo_uoFEOXdShi3BgmN6XRHlaJ-oA1svmq6y1PZkmO50nWQn2Lg=w300-rw" width="48" height="48" /> | [Ameba Ownd](https://play.google.com/store/apps/details?id=jp.co.cyberagent.madrid)
-<img src="https://lh3.googleusercontent.com/st_DiIlM148vzG23ccujtBzx0tMeb7cDC5fDmLSERS-Nr8M_F-PTw4W_jWJsH9mO_b4=w300-rw" width="48" height="48" /> | [ScorePal](https://play.google.com/store/apps/details?id=com.hfd.scorepal)
+| Icon                                                                                                                                               | Application                                                                         |
+|----------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------|
+| <img src="https://lh6.ggpht.com/6zKH_uQY1bxCwXL4DLo_uoFEOXdShi3BgmN6XRHlaJ-oA1svmq6y1PZkmO50nWQn2Lg=w300-rw" width="48" height="48" />             | [Ameba Ownd](https://play.google.com/store/apps/details?id=jp.co.cyberagent.madrid) |
+| <img src="https://lh3.googleusercontent.com/st_DiIlM148vzG23ccujtBzx0tMeb7cDC5fDmLSERS-Nr8M_F-PTw4W_jWJsH9mO_b4=w300-rw" width="48" height="48" /> | [ScorePal](https://play.google.com/store/apps/details?id=com.hfd.scorepal)          |
+| <img src="https://github.com/niendo1/ImapNotes3/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="48" height="48" />             | [ImapNotes3](https://f-droid.org/packages/de.niendo.ImapNotes3/)                    |
 
 Developed By
 -------
 Daichi Furiya (Wasabeef) - <dadadada.chop@gmail.com>
 
 <a href="https://twitter.com/wasabeef_jp">
-<img alt="Follow me on Twitter"
-src="https://raw.githubusercontent.com/wasabeef/art/master/twitter.png" width="75"/>
+<img alt="Follow me on Twitter" src="https://raw.githubusercontent.com/wasabeef/art/master/twitter.png" width="75"/>
 </a>
 
+Peter Korf (niendo) - <peter@niendo.de>
+
 Thanks
 -------
 
@@ -189,6 +248,7 @@ Thanks
 License
 -------
 
+    Copyright (C) 2022-2024 niendo
     Copyright (C) 2020 Wasabeef
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/art/javadoc.svg b/art/javadoc.svg
new file mode 100644
index 00000000..eafab317
--- /dev/null
+++ b/art/javadoc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="92" height="20" role="img" aria-label="javadoc: 3.0.0"><title>javadoc: 6.1.2</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="92" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="53" height="20" fill="#555"/><rect x="53" width="39" height="20" fill="#4c1"/><rect width="92" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="275" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">javadoc</text><text x="275" y="140" transform="scale(.1)" fill="#fff" textLength="430">javadoc</text><text aria-hidden="true" x="715" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="290">3.0.0</text><text x="715" y="140" transform="scale(.1)" fill="#fff" textLength="290">3.0.0</text></g></svg>
diff --git a/build.gradle b/build.gradle
index d8af90f7..2097e99f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,23 +1,29 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
+
+
 buildscript {
+  ext.kotlin_version = "2.0.20"
   repositories {
     google()
-    jcenter()
+    mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.2.0-beta04'
-
-    // TODO: Close JCenter on May 1st https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/
-//    classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
-//    classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+     classpath 'com.android.tools.build:gradle:8.10.0'
+     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
 }
 
+plugins {
+  id 'maven-publish'
+  id 'org.jetbrains.kotlin.android' version '2.0.20' apply false
+  id 'org.jetbrains.kotlin.multiplatform' version '2.0.20' apply false
+}
+
 allprojects {
   repositories {
     google()
     mavenCentral()
-    jcenter()
   }
 }
+
diff --git a/gradle.properties b/gradle.properties
index 145e04cd..d6915c35 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
@@ -14,16 +14,19 @@ org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.caching=true
-android.enableBuildCache=true
+#android.enableBuildCache=true
 android.useAndroidX=true
 android.enableJetifier=true
 android.enableR8.fullMode=true
 
-VERSION_NAME=2.0.0
-VERSION_CODE=200
+VERSION_NAME=3.0.4
+VERSION_CODE=304
 GROUP=jp.wasabeef
 ARTIFACT_ID=richeditor-android
-COMPILE_SDK_VERSION=30
-TARGET_SDK_VERSION=30
-MIN_SDK_VERSION=14
+COMPILE_SDK_VERSION=35
+TARGET_SDK_VERSION=35
+MIN_SDK_VERSION=24
+#android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c0..2c352119 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5a491c54..e2847c82 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c..f5feea6d 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,69 +15,104 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +122,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f9..9b42019c 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 00000000..f82bf6ab
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,4 @@
+jdk:
+  - openjdk17
+before_install:
+  - ./scripts/prepareJitpackEnvironment.sh
diff --git a/richeditor/build.gradle b/richeditor/build.gradle
index 12327487..734971a8 100644
--- a/richeditor/build.gradle
+++ b/richeditor/build.gradle
@@ -1,44 +1,54 @@
-apply plugin: 'com.android.library'
+plugins {
+  id 'com.android.library'
+  id 'maven-publish'
+}
 
 android {
-  compileSdkVersion COMPILE_SDK_VERSION as int
-
+  compileSdk COMPILE_SDK_VERSION as int
   defaultConfig {
     minSdkVersion MIN_SDK_VERSION as int
     targetSdkVersion TARGET_SDK_VERSION as int
-    versionCode VERSION_CODE as int
-    versionName VERSION_NAME
   }
-}
-
+  namespace 'jp.wasabeef.richeditor'
+  publishing {
+    singleVariant("release") {
+      withSourcesJar()
+      withJavadocJar()
+    }
+  }
 
-dependencies {
-  testImplementation "junit:junit:4.13"
-  testImplementation "org.robolectric:robolectric:4.3.1"
+  buildTypes {
+    release {
+      minifyEnabled false
+    }
+  }
 }
 
-ext {
-  bintrayRepo = 'maven'
-  bintrayName = 'richeditor-android'
-  bintrayUserOrg = 'wasabeef'
-  publishedGroupId = 'jp.wasabeef'
-  libraryName = 'richeditor-android'
-  artifact = 'richeditor-android'
-  libraryDescription = 'RichEditor for Android is a beautiful Rich Text WYSIWYG Editor'
-  siteUrl = 'https://github.com/richeditor-android'
-  gitUrl = 'https://github.com/richeditor-android.git'
-  issueUrl = 'https://github.com/richeditor-android/issues'
-  libraryVersion = VERSION_NAME
-  developerId = 'wasabeef'
-  developerName = 'Wasabeef'
-  developerEmail = 'dadadada.chop@gmail.com'
-  licenseName = 'The Apache Software License, Version 2.0'
-  licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-  allLicenses = ["Apache-2.0"]
+dependencies {
+  testImplementation 'junit:junit:4.13.2'
+  //testImplementation 'org.robolectric:robolectric:4.9.2'
 }
 
-// TODO: Close JCenter on May 1st https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/
-// apply from: 'https://gist.githubusercontent.com/wasabeef/cf14805bee509baf7461974582f17d26/raw/bintray-v1.gradle'
-// apply from: 'https://gist.githubusercontent.com/wasabeef/cf14805bee509baf7461974582f17d26/raw/install-v1.gradle'
+afterEvaluate {
+  publishing {
+    publications {
+      release(MavenPublication) {
+        from components.release
+        groupId = 'com.github.niendo1' //This should be the name of the publishing account
+        artifactId = ARTIFACT_ID as String //'richeditor-android' //This is the name you want to use for the published library.
+        version = VERSION_NAME as String
+        repositories {
+          maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/niendo1/richeditor-android")
+            credentials {
+              username = "unused" //project.findProperty("gpr.user") ?: System.getenv("USERNAME")
+              password = "unused" //project.findProperty("gpr.key") ?: System.getenv("TOKEN")
+            }
+          }
+          }
+        }
+      }
+    }
+  }
 
-apply from: 'https://gist.githubusercontent.com/wasabeef/2f2ae8d97b429e7d967128125dc47854/raw/maven-central-v1.gradle'
diff --git a/richeditor/src/androidTest/java/jp/wasabeef/richeditor/ApplicationTest.java b/richeditor/src/androidTest/java/jp/wasabeef/richeditor/ApplicationTest.java
index 1bdd9795..854f48cb 100644
--- a/richeditor/src/androidTest/java/jp/wasabeef/richeditor/ApplicationTest.java
+++ b/richeditor/src/androidTest/java/jp/wasabeef/richeditor/ApplicationTest.java
@@ -1,14 +1,11 @@
 package jp.wasabeef.richeditor;
 
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
 /**
  * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
  */
-public class ApplicationTest extends ApplicationTestCase<Application> {
+public class ApplicationTest  {
 
   public ApplicationTest() {
-    super(Application.class);
+
   }
-}
\ No newline at end of file
+}
diff --git a/richeditor/src/main/AndroidManifest.xml b/richeditor/src/main/AndroidManifest.xml
index 78a9b042..cc947c56 100644
--- a/richeditor/src/main/AndroidManifest.xml
+++ b/richeditor/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="jp.wasabeef.richeditor" />
+<manifest />
diff --git a/richeditor/src/main/assets/Alita Brush.ttf b/richeditor/src/main/assets/Alita Brush.ttf
new file mode 100644
index 00000000..1dc4ac5a
Binary files /dev/null and b/richeditor/src/main/assets/Alita Brush.ttf differ
diff --git a/richeditor/src/main/assets/assert.js b/richeditor/src/main/assets/assert.js
new file mode 100644
index 00000000..f4af7f01
--- /dev/null
+++ b/richeditor/src/main/assets/assert.js
@@ -0,0 +1,27 @@
+//worlds smallest unit testing framework
+var Assert = (Assert = function() {
+    var AssertException = function(message) {
+        this.message = message;
+    };
+
+    AssertException.prototype.toString = function() {
+        return 'AssertException: ' + this.message;
+    };
+
+    this.assert = this.that = function(exp, message) {
+
+        if (!exp) {
+            throw new AssertException(message);
+        }
+    }
+
+    this.equals = function(expected, actual, detail) {
+        this.assert(expected == actual, 'Failed asserting that ' + expected + '===' + actual + ' :: ' + detail);
+    }
+
+    this.type = function(expectedType, actual) {
+            this.assert(expectedType === actual.constructor.name, 'Failed asserting that types match: ' + expectedType + ' ===  ' + actual.constructor.name);
+        }
+        //end worlds smallest unit testing framework
+    return this;
+}());
\ No newline at end of file
diff --git a/richeditor/src/main/assets/editor.html b/richeditor/src/main/assets/editor.html
deleted file mode 100644
index 5357fe3f..00000000
--- a/richeditor/src/main/assets/editor.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta name="viewport" content="user-scalable=no">
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <link rel="stylesheet" type="text/css" href="normalize.css">
-  <link rel="stylesheet" type="text/css" href="style.css">
-</head>
-<body>
-<div id="editor" contenteditable="true"></div>
-<script type="text/javascript" src="rich_editor.js"></script>
-</body>
-</html>
diff --git a/richeditor/src/main/assets/rich_editor.html b/richeditor/src/main/assets/rich_editor.html
new file mode 100644
index 00000000..3bfcb593
--- /dev/null
+++ b/richeditor/src/main/assets/rich_editor.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no">
+        <meta name="supported-color-schemes" content="light dark">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <link rel="stylesheet" type="text/css" href="normalize.css">
+        <link rel="stylesheet" type="text/css" href="style.css">
+    </head>
+    
+    <body>
+        <div id="container">
+            <div id="editor" contentEditable="true" placeholder="" class="placeholder"></div>
+        </div>
+        <script type="text/javascript" src="rich_editor.js"></script>
+    </body>
+</html>
diff --git a/richeditor/src/main/assets/rich_editor.js b/richeditor/src/main/assets/rich_editor.js
index cf456205..f0096c4b 100644
--- a/richeditor/src/main/assets/rich_editor.js
+++ b/richeditor/src/main/assets/rich_editor.js
@@ -1,5 +1,7 @@
 /**
- * Copyright (C) 2020 Wasabeef
+ * Copyright (C) 2022-2025 peter@niendo.de
+ * Copyright (C) 2017 Kishan Jadav
+ * Copyright (C) 2015 Wasabeef
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,42 +16,133 @@
  * limitations under the License.
  */
 
-/**
- * See about document.execCommand: https://developer.mozilla.org/en-US/docs/Web/API/Document/execCommand
- */
+ /**
+  * See about document.execCommand: https://developer.mozilla.org/en-US/docs/Web/API/Document/execCommand
+  */
 
-var RE = {};
+ "use strict";
 
-RE.currentSelection = {
-    "startContainer": 0,
-    "startOffset": 0,
-    "endContainer": 0,
-    "endOffset": 0};
+var RE = {};
 
 RE.editor = document.getElementById('editor');
 
-document.addEventListener("selectionchange", function() { RE.backuprange(); });
+// Not universally supported, but seems to work in iOS 7 and 8
+document.addEventListener("selectionchange", function() {
+    RE.backuprange();
+});
+
+//looks specifically for a Range selection and not a Caret selection
+RE.rangeSelectionExists = function() {
+    //!! coerces a null to bool
+    var sel = document.getSelection();
+    if (sel && sel.type == "Range") {
+        return true;
+    }
+    return false;
+};
+
+RE.rangeOrCaretSelectionExists = function() {
+    //!! coerces a null to bool
+    var sel = document.getSelection();
+    if (sel && (sel.type == "Range" || sel.type == "Caret")) {
+        return true;
+    }
+    return false;
+};
+
+
+RE.selectedHtml = function() {
+    // https://stackoverflow.com/questions/5643635/how-to-get-selected-html-text-with-javascript
+    var html = "";
+    if (typeof window.getSelection != "undefined") {
+        var sel = window.getSelection();
+        if (sel.rangeCount) {
+            var container = document.createElement("div");
+            for (var i = 0, len = sel.rangeCount; i < len; ++i) {
+                container.appendChild(sel.getRangeAt(i).cloneContents());
+            }
+            html = container.innerHTML;
+        }
+    } else if (typeof document.selection != "undefined") {
+        if (document.selection.type == "Text") {
+            html = document.selection.createRange().htmlText;
+        }
+    }
+    return encodeURIComponent(html);
+}
+
+// Returns selected text range
+RE.selectedText = function() {
+    if (RE.rangeSelectionExists() == true) {
+        return encodeURIComponent(document.getSelection().toString());
+    }
+    return "";
+};
+
+RE.editor.addEventListener("input", function() {
+    RE.updatePlaceholder();
+    RE.backuprange();
+    RE.callback("input");
+});
+
+RE.editor.addEventListener("focus", function() {
+    RE.backuprange();
+    RE.callback("focus");
+});
+
+RE.editor.addEventListener("blur", function() {
+    RE.callback("blur");
+});
+
+RE.customAction = function(action) {
+    RE.callback("action/" + action);
+};
 
-// Initializations
-RE.callback = function() {
-    window.location.href = "re-callback://" + encodeURIComponent(RE.getHtml());
+RE.updateHeight = function() {
+    RE.callback("updateHeight");
 }
 
+RE.callbackQueue = [];
+RE.runCallbackQueue = function() {
+    if (RE.callbackQueue.length === 0) {
+        return;
+    }
+
+    setTimeout(function() {
+            RE.setCallBack("callback", RE.callbackQueue);
+    }, 0);
+};
+
+
+
+RE.callback = function(method) {
+    RE.callbackQueue.push(method);
+    RE.runCallbackQueue();
+};
+
 RE.setHtml = function(contents) {
     RE.editor.innerHTML = decodeURIComponent(contents.replace(/\+/g, '%20'));
-}
+    var images = RE.editor.querySelectorAll("img");
+
+    for (var i = 0; i < images.length; i++) {
+        images[i].onload = RE.updateHeight;
+    }
+    RE.setElementListener("");
+    RE.updatePlaceholder();
+    RE.callback("loaded");
+};
 
 RE.getHtml = function() {
-    return RE.editor.innerHTML;
-}
+   return encodeURIComponent(RE.editor.innerHTML);
+};
 
 RE.getText = function() {
-    return RE.editor.innerText;
-}
+   return encodeURIComponent(RE.editor.innerText);
+};
 
 RE.setBaseTextColor = function(color) {
     RE.editor.style.color  = color;
-}
+};
 
 RE.setBaseFontSize = function(size) {
     RE.editor.style.fontSize = size;
@@ -62,21 +155,30 @@ RE.setPadding = function(left, top, right, bottom) {
   RE.editor.style.paddingBottom = bottom;
 }
 
-RE.setBackgroundColor = function(color) {
-    document.body.style.backgroundColor = color;
-}
+RE.setPlaceholderText = function(text) {
+    RE.editor.setAttribute("placeholder", text);
+};
 
-RE.setBackgroundImage = function(image) {
-    RE.editor.style.backgroundImage = image;
-}
+RE.updatePlaceholder = function() {
+    if (RE.editor.innerHTML.indexOf('img') !== -1 || (RE.editor.textContent.length > 0 && RE.editor.innerHTML.length > 0)) {
+        RE.editor.classList.remove("placeholder");
+    } else {
+        RE.editor.classList.add("placeholder");
+    }
+};
 
-RE.setWidth = function(size) {
-    RE.editor.style.minWidth = size;
-}
+RE.setFontSize = function(fontSize) {
+    document.execCommand("fontSize", false, fontSize);
+    //RE.editor.style.fontSize = size;
+};
+
+RE.setBackgroundColor = function(color) {
+    RE.editor.style.backgroundColor = color;
+};
 
 RE.setHeight = function(size) {
     RE.editor.style.height = size;
-}
+};
 
 RE.setTextAlign = function(align) {
     RE.editor.style.textAlign = align;
@@ -86,27 +188,65 @@ RE.setVerticalAlign = function(align) {
     RE.editor.style.verticalAlign = align;
 }
 
-RE.setPlaceholder = function(placeholder) {
-    RE.editor.setAttribute("placeholder", placeholder);
-}
-
 RE.setInputEnabled = function(inputEnabled) {
     RE.editor.contentEditable = String(inputEnabled);
 }
 
 RE.undo = function() {
     document.execCommand('undo', false, null);
-}
+};
 
 RE.redo = function() {
     document.execCommand('redo', false, null);
+};
+
+RE.setBold = function(shouldEnable) {
+    let isBold = document.queryCommandState('bold');
+
+    if (!isBold && shouldEnable)
+    {
+        // Enable bold formatting
+        // -----------------------------
+        // If bold formatting is not enabled
+        // then toggle it to enable.
+        RE.toggleBold();
+
+    } else if (isBold && !shouldEnable)
+    {
+        // Disable bold formatting
+        // -----------------------------
+        // If bold formatting is enabled
+        // then toggle it to disable.
+        RE.toggleBold();
+    }
 }
 
-RE.setBold = function() {
+RE.toggleBold = function() {
     document.execCommand('bold', false, null);
 }
 
-RE.setItalic = function() {
+RE.setItalic = function(shouldEnable) {
+    let isItalic = document.queryCommandState('italic');
+
+    if (!isItalic && shouldEnable)
+    {
+        // Enable italic formatting
+        // -----------------------------
+        // If italic formatting is not enabled
+        // then toggle it to enable.
+        RE.toggleItalic();
+
+    } else if (isItalic && !shouldEnable)
+    {
+        // Disable italic formatting
+        // -----------------------------
+        // If italic formatting is enabled
+        // then toggle it to disable.
+        RE.toggleItalic();
+    }
+}
+
+RE.toggleItalic = function() {
     document.execCommand('italic', false, null);
 }
 
@@ -118,151 +258,403 @@ RE.setSuperscript = function() {
     document.execCommand('superscript', false, null);
 }
 
-RE.setStrikeThrough = function() {
-    document.execCommand('strikeThrough', false, null);
+RE.setStrikeThrough = function(shouldEnable) {
+    let isStrikeThrough = document.queryCommandState('strikeThrough');
+
+    if (!isStrikeThrough && shouldEnable)
+    {
+        // Enable strikethrough formatting
+        // -----------------------------
+        // If strikethrough formatting is not enabled
+        // then toggle it to enable.
+        RE.toggleStrikeThrough();
+
+    } else if (isStrikeThrough && !shouldEnable)
+    {
+
+   // Disable strikethrough formatting
+        // -----------------------------
+        // If strikethrough formatting is enabled
+        // then toggle it to disable.
+        RE.toggleStrikeThrough();
+    }
 }
 
-RE.setUnderline = function() {
-    document.execCommand('underline', false, null);
+RE.toggleStrikeThrough = function() {
+    document.execCommand('strikeThrough', false, null);
 }
 
-RE.setBullets = function() {
-    document.execCommand('insertUnorderedList', false, null);
+RE.setUnderline = function(shouldEnable) {
+    let isUnderline = document.queryCommandState('underline');
+
+    if (!isUnderline && shouldEnable)
+    {
+        // Enable underline formatting
+        // -----------------------------
+        // If underline formatting is not enabled
+        // then toggle it to enable.
+        RE.toggleUnderline();
+
+    } else if (isUnderline && !shouldEnable)
+    {
+        // Disable underline formatting
+        // -----------------------------
+        // If underline formatting is enabled
+        // then toggle it to disable.
+        RE.toggleUnderline();
+    }
 }
 
-RE.setNumbers = function() {
-    document.execCommand('insertOrderedList', false, null);
+RE.toggleUnderline = function() {
+    document.execCommand('underline', false, null);
 }
 
 RE.setTextColor = function(color) {
     RE.restorerange();
+    if(color == "initial") color = RE.editor.style.color;
     document.execCommand("styleWithCSS", null, true);
     document.execCommand('foreColor', false, color);
     document.execCommand("styleWithCSS", null, false);
-}
+};
 
 RE.setTextBackgroundColor = function(color) {
     RE.restorerange();
     document.execCommand("styleWithCSS", null, true);
     document.execCommand('hiliteColor', false, color);
     document.execCommand("styleWithCSS", null, false);
+};
+
+RE.setFontFamily = function(fontName){
+    document.execCommand('fontName', false, fontName);
+}
+
+RE.LoadFont = function LoadFont(name, url) {
+  let font = new FontFace(name, 'url("'+ url +'")');
+  font.load().then(function(loadedFont)
+  {
+      document.fonts.add(loadedFont);
+      //do something after the font is loaded
+  }).catch(function(error) {
+      RE._insertHTML(error)
+      // error occurred
+  });
+}
+RE.getFontFamily = function getFontFamily() {
+   var arr = [];
+   var it = document.fonts.entries();
+
+  var arr = [];
+  let done = false;
+
+  while (!done) {
+    const font = it.next();
+    if (!font.done) {
+      arr.push(font.value[0].family);
+    } else {
+      done = font.done;
+    }
+  }
+    arr.push('monospace');
+    arr.push('sans-serif');
+    arr.push('serif');
+    arr.push('cursive');
+    arr.push('fantasy');
+  // converted to set then arr to filter repetitive values
+  return String(arr);
 }
 
-RE.setFontSize = function(fontSize){
-    document.execCommand("fontSize", false, fontSize);
+RE.setPre = function() {
+      document.execCommand('formatBlock', false, '<pre>');
+      RE.setNewParagraph();
+
 }
 
-RE.setHeading = function(heading) {
-    document.execCommand('formatBlock', false, '<h'+heading+'>');
+RE.setNewParagraph = function() {
+        var elements = document.querySelectorAll(":hover");
+        var e=document.createElement("p");
+        e.innerHTML = '<br>';
+        elements[elements.length - 1].appendChild(e);
 }
 
+RE.setHeading = function(heading) {
+    var sel = document.getSelection().getRangeAt(0).startContainer.parentNode;
+    document.execCommand('formatBlock', false, sel.tagName === `H${heading}` ? '<p>' : `<h${heading}>`);
+};
+
 RE.setIndent = function() {
     document.execCommand('indent', false, null);
-}
+};
 
 RE.setOutdent = function() {
     document.execCommand('outdent', false, null);
-}
+};
+
+RE.setOrderedList = function() {
+    // setNumbers
+    document.execCommand('insertOrderedList', false, null);
+};
+
+RE.setUnorderedList = function() {
+    // setBullets
+    document.execCommand('insertUnorderedList', false, null);
+};
+
+function createCheckbox(node) {
+    var d = document.createElement("input");
+    d.setAttribute("type", "checkbox");
+    if(node.checked) {
+        d.setAttribute("checked", true);
+    }
+    d.addEventListener("change", function() {createCheckbox(this);});
+
+    node.parentNode.insertBefore(d, node);
+    node.parentNode.removeChild(node);
+};
+
+RE.setCheckbox = function() {
+  var el = document.createElement("input");
+    el.setAttribute("type", "checkbox");
+    RE._insertHTML("&nbsp;" + el.outerHTML + "&nbsp;");
+    RE.setElementListener("checkbox");
+    //RE.callback("input");
+};
 
 RE.setJustifyLeft = function() {
     document.execCommand('justifyLeft', false, null);
-}
+};
 
 RE.setJustifyCenter = function() {
     document.execCommand('justifyCenter', false, null);
-}
+};
 
 RE.setJustifyRight = function() {
     document.execCommand('justifyRight', false, null);
-}
-
-RE.setBlockquote = function() {
-    document.execCommand('formatBlock', false, '<blockquote>');
-}
-
-RE.insertImage = function(url, alt) {
-    var html = '<img src="' + url + '" alt="' + alt + '" />';
-    RE.insertHTML(html);
-}
+};
 
-RE.insertImageW = function(url, alt, width) {
-    var html = '<img src="' + url + '" alt="' + alt + '" width="' + width + '"/>';
-    RE.insertHTML(html);
-}
-
-RE.insertImageWH = function(url, alt, width, height) {
-    var html = '<img src="' + url + '" alt="' + alt + '" width="' + width + '" height="' + height +'"/>';
-    RE.insertHTML(html);
-}
-
-RE.insertVideo = function(url, alt) {
-    var html = '<video src="' + url + '" controls></video><br>';
-    RE.insertHTML(html);
-}
+RE.getLineHeight = function() {
+    return RE.editor.style.lineHeight;
+};
 
-RE.insertVideoW = function(url, width) {
-    var html = '<video src="' + url + '" width="' + width + '" controls></video><br>';
-    RE.insertHTML(html);
-}
-
-RE.insertVideoWH = function(url, width, height) {
-    var html = '<video src="' + url + '" width="' + width + '" height="' + height + '" controls></video><br>';
-    RE.insertHTML(html);
-}
+RE.setLineHeight = function(height) {
+    RE.editor.style.lineHeight = height;
+};
 
-RE.insertAudio = function(url, alt) {
-    var html = '<audio src="' + url + '" controls></audio><br>';
-    RE.insertHTML(html);
-}
+RE.setBlockquote = function() {
+    document.execCommand('formatBlock', false, '<blockquote>');
+    RE.setNewParagraph();
+};
+
+RE.insertImage = function(url, alt="", width="", height="", relative="false") {
+    var img = document.createElement('img');
+    img.setAttribute("src", url);
+    if (alt != "") img.setAttribute("alt", alt);
+    if (relative == "true") {
+       if (width == "") width = "100%";
+         if (height == "")
+             img.setAttribute("style","width: "+width+";");
+         else
+             img.setAttribute("style","width: "+width+"; height: "+height+";");
+    } else {
+       // for % of image size, width must be empty!
+       if ((width.search("%") != -1) && (height == "")) {
+          height = width;
+          width = "";
+       }
+       img.setAttribute("width", width);
+       img.setAttribute("height", height);
+    }
+    img.onload = RE.updateHeight;
+    RE._insertHTML(img.outerHTML);
+    //RE.callback("input");
+};
+
+RE.insertVideo = function(src, alt="", width="", height="", relative="false", optProperties="") {
+   if (optProperties == "") {
+      optProperties = "controls muted";
+   }
+   var size = "";
+   if (relative == "true") {
+       if (width == "") width = "100%";
+         if (height == "")
+             size = 'style="width:'+width+';"';
+         else
+             size = 'style="width:'+width+'; height: '+height+';"';
+    } else {
+       if (width != "")
+          size = 'width="' + width + '"';
+       if(height != "")
+          size = size + ' height="' + height + '"';
+    }
 
-RE.insertYoutubeVideo = function(url) {
-    var html = '<iframe width="100%" height="100%" src="' + url + '" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe><br>'
-    RE.insertHTML(html);
-}
+    var html = '<video alt="' + alt + '" '+ size + ' src="' + src + '" ' + optProperties + '></video><br>'
+    RE._insertHTML(html);
+
+/*    var video = document.createElement('video');
+    video.setAttribute("src", src );
+    video.controls = true;
+    video.muted = false;
+    //video.autoplay = true;
+    if (alt != "") video.setAttribute("alt", alt);
+    if (relative == "true") {
+       if (width == "") width = "100%";
+         if (height == "")
+             video.setAttribute("style","width: "+width+";");
+         else
+             video.setAttribute("style","width: "+width+"; height: "+height+"");
+    } else {
+       if (width != "")
+          video.setAttribute("width", width);
+       if(height != "")
+          video.setAttribute("height", height);
+    }
+//    if (width == "auto")
+//          video.setAttribute("width", "responsive-image");
+//    else if (width != "") {
+//          video.setAttribute("width", width);
+//          if (height != "") video.setAttribute("height", height);
+//    }
+    video.onload = RE.updateHeight;
+
+    //RE._insertHTML(video.outerHTML);
+    var elements = document.querySelectorAll(":hover");
+      elements[elements.length - 1].appendChild(video);
+    //RE.callback("input");
+*/
+}
+
+RE.insertAudio = function(url, optProperties="") {
+   if (optProperties == "") {
+      optProperties = "controls";
+   }
+    var html = '<audio src="' + url + '" ' + optProperties +'></audio><br>';
+    RE._insertHTML(html);
+}
+
+RE.insertIFrame = function(src, name="", width="", height="", relative="false", optProperties="") {
+   var size = ''
+   if (relative == "true") {
+       if (width == "") width = "100%";
+         if (height == "")
+             size = 'style="width:'+width+';"';
+         else
+             size = 'style="width:'+width+"; height: "+height+';"';
+    } else {
+       if (width != "")
+          size = 'width="' + width + '"';
+       if(height != "")
+          size = size + ' height="' + height + '"';
+    }
 
-RE.insertYoutubeVideoW = function(url, width) {
-    var html = '<iframe width="' + width + '" src="' + url + '" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe><br>'
-    RE.insertHTML(html);
-}
+    var html = '<iframe name="' + name + '" '+ size + ' src="' + src + '" ' + optProperties + '></iframe><br>'
+    RE._insertHTML(html);
+}
+
+RE.setElementListener = function(element) {
+if (element=="section" || element=="") {
+  var coll = document.getElementsByClassName("collapsible");
+  var i;
+
+  for (i = 0; i < coll.length; i++) {
+      coll[i].addEventListener("click", function() {CollapsibleSection(this);});
+  }
+}
+
+if (element=="checkbox" || element=="") {
+  var coll = document.querySelectorAll('input[type=checkbox]');
+  var i;
+
+  for (i = 0; i < coll.length; i++) {
+     coll[i].addEventListener("change", function() {createCheckbox(this);});
+  }
+}
+
+if (element=="link" || element=="") {
+  var coll = document.querySelectorAll('a');
+  var i;
+
+  for (i = 0; i < coll.length; i++) {
+     coll[i].addEventListener("click", function() {
+        var ret = [];
+        ret.push({"tagName":this.tagName});
+        ret.push({"href":this.href});
+        ret.push({"text":this.innerHTML});
+        ret.push({"title":this.title});
+        RE.setCallBack("click", ret);
+        }
+     );
+  }
+}
+}
+
+function CollapsibleSection(node) {
+          node.classList.toggle("active");
+          var content = node.nextElementSibling;
+          if (content.style.maxHeight){
+             content.style.maxHeight = null;
+          } else {
+             content.style.maxHeight = content.scrollHeight + "px";
+          }
+        }
+
+RE.insertCollapsibleSection = function(section, content) {
+    var d = document.createElement("button");
+        d.setAttribute("class", "collapsible");
+        d.innerHTML = "&nbsp;" + section;
+       // d.addEventListener("click", function() {CollapsibleSection(this);});
+    var elements = document.querySelectorAll(":hover");
+    d=elements[elements.length - 1].appendChild(d);
+    var e=document.createElement("div");
+    e.setAttribute("class", "content");
+    e.innerHTML = '<p> ' + content + '<br><br></p>';
+    elements[elements.length - 1].appendChild(e);
+    // next empty element
+    e=document.createElement("p");
+    e.innerHTML = '<br>';
+    elements[elements.length - 1].appendChild(e);
+     //RE.callback("input");
+     RE.setElementListener("section");
+}
+
+RE._insertHTML = function(html) {
+    RE.restorerange();
+    document.execCommand('insertHTML', false, html);
+};
 
-RE.insertYoutubeVideoWH = function(url, width, height) {
-    var html = '<iframe width="' + width + '" height="' + height + '" src="' + url + '" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe><br>'
-    RE.insertHTML(html);
-}
+RE.insertHTML = function(contents) {
+    RE.restorerange();
+    document.execCommand('insertHTML', false, decodeURIComponent(contents.replace(/\+/g, '%20')));
+};
 
-RE.insertHTML = function(html) {
+RE.insertLink = function(url, text, title) {
     RE.restorerange();
-    document.execCommand('insertHTML', false, html);
-}
+    RE._insertHTML("<a href='"+url+"' title='"+title+"'>"+text+"</a>");
+    RE.setElementListener("link");
+    //RE.callback("input");
+};
 
-RE.insertLink = function(url, title) {
+RE.insertLinkSelection = function(url, text, title) {
     RE.restorerange();
     var sel = document.getSelection();
     if (sel.toString().length == 0) {
-        document.execCommand("insertHTML",false,"<a href='"+url+"'>"+title+"</a>");
+        RE._insertHTML("<a href='"+url+"' title='"+title+"'>"+text+"</a>");
     } else if (sel.rangeCount) {
-       var el = document.createElement("a");
-       el.setAttribute("href", url);
-       el.setAttribute("title", title);
-
-       var range = sel.getRangeAt(0).cloneRange();
-       range.surroundContents(el);
-       sel.removeAllRanges();
-       sel.addRange(range);
-   }
-    RE.callback();
-}
-
-RE.setTodo = function(text) {
-    var html = '<input type="checkbox" name="'+ text +'" value="'+ text +'"/> &nbsp;';
-    document.execCommand('insertHTML', false, html);
-}
+        var el = document.createElement("a");
+        el.setAttribute("href", url);
+        el.setAttribute("title", title);
+
+        var range = sel.getRangeAt(0).cloneRange();
+        range.surroundContents(el);
+        sel.removeAllRanges();
+        sel.addRange(range);
+    }
+    //RE.callback("input");
+};
 
 RE.prepareInsert = function() {
     RE.backuprange();
-}
+};
 
-RE.backuprange = function(){
+RE.backuprange = function() {
     var selection = window.getSelection();
     if (selection.rangeCount > 0) {
       var range = selection.getRangeAt(0);
@@ -270,18 +662,186 @@ RE.backuprange = function(){
           "startContainer": range.startContainer,
           "startOffset": range.startOffset,
           "endContainer": range.endContainer,
-          "endOffset": range.endOffset};
+          "endOffset": range.endOffset
+      };
     }
-}
+};
+
+RE.addRangeToSelection = function(selection, range) {
+    if (selection) {
+        selection.removeAllRanges();
+        selection.addRange(range);
+    }
+};
 
-RE.restorerange = function(){
+// Programatically select a DOM element
+RE.selectElementContents = function(el) {
+    var range = document.createRange();
+    range.selectNodeContents(el);
+    var sel = window.getSelection();
+    // this.createSelectionFromRange sel, range
+    RE.addRangeToSelection(sel, range);
+};
+
+RE.restorerange = function() {
     var selection = window.getSelection();
     selection.removeAllRanges();
     var range = document.createRange();
     range.setStart(RE.currentSelection.startContainer, RE.currentSelection.startOffset);
     range.setEnd(RE.currentSelection.endContainer, RE.currentSelection.endOffset);
     selection.addRange(range);
-}
+};
+
+// User editing table functionality
+RE.insertTable = function(width, height) {
+    var table = document.createElement("table");
+    for (let i = 0; i < height; i++) {
+        var row = table.insertRow();
+        for (let j = 0; j < width; j++) {
+            var cell = row.insertCell();
+        }
+    }
+    RE._insertHTML(table.outerHTML);
+    RE.setNewParagraph();
+    //RE.callback("input");
+};
+
+function getNearestTableAncestor(htmlElementNode) {
+    while (htmlElementNode) {
+        htmlElementNode = htmlElementNode.parentNode;
+        if (htmlElementNode.tagName.toLowerCase() === 'table') {
+            return htmlElementNode;
+        }
+    }
+    return undefined;
+}
+
+RE.isCursorInTable = function() {
+    return document.querySelectorAll(":hover")[elements.length - 1] instanceof HTMLTableCellElement  
+};
+
+RE.addRowToTable = function() {
+    // Add row below current cursor's
+    var elements = document.querySelectorAll(":hover");
+    let rowIndex = elements[elements.length - 2].rowIndex;
+    let table = getNearestTableAncestor(elements[elements.length - 1]);
+    let columns = table.rows[rowIndex].cells.length;
+    var row = table.insertRow(rowIndex + 1);
+    for (let j = 0; j < columns ; j++) {
+        var cell = row.insertCell();
+    }
+};
+
+RE.deleteRowFromTable = function() {
+    // Deletes the current cursor's row
+    var elements = document.querySelectorAll(":hover");
+    let rowIndex = elements[elements.length - 2].rowIndex;
+    let table = getNearestTableAncestor(elements[elements.length - 1]);
+    table.deleteRow(rowIndex);
+};
+
+RE.addColumnToTable = function() {
+    // Add column to the right of current cursor's
+    var elements = document.querySelectorAll(":hover");
+    let columnIndex = elements[elements.length - 1].cellIndex;
+    let row = elements[elements.length - 2];
+    row.insertCell(columnIndex + 1);
+}
+
+RE.deleteColumnFromTable = function() {
+    // Deletes the current cursor's column
+    var elements = document.querySelectorAll(":hover");
+    let columnIndex = elements[elements.length - 1].cellIndex;
+    let row = elements[elements.length - 2];
+    row.deleteCell(columnIndex);
+};
+
+/**
+Recursively search element ancestors to find a element nodeName e.g. A
+**/
+var _findNodeByNameInContainer = function(element, nodeName, rootElementId) {
+    if (element.nodeName == nodeName) {
+        return element;
+    } else {
+        if (element.id === rootElementId) {
+            return null;
+        }
+        _findNodeByNameInContainer(element.parentElement, nodeName, rootElementId);
+    }
+};
+
+var isAnchorNode = function(node) {
+    return ("A" == node.nodeName);
+};
+
+RE.getAnchorTagsInNode = function(node) {
+    var links = [];
+
+    while (node.nextSibling !== null && node.nextSibling !== undefined) {
+        node = node.nextSibling;
+        if (isAnchorNode(node)) {
+            links.push(node.getAttribute('href'));
+        }
+    }
+    return links;
+};
+
+RE.countAnchorTagsInNode = function(node) {
+    return RE.getAnchorTagsInNode(node).length;
+};
+
+/**
+ * If the current selection's parent is an anchor tag, get the href.
+ * @returns {string}
+ */
+RE.getSelectedHref = function() {
+    var href, sel;
+    href = '';
+    sel = window.getSelection();
+    if (!RE.rangeOrCaretSelectionExists()) {
+        return null;
+    }
+
+    var tags = RE.getAnchorTagsInNode(sel.anchorNode);
+    //if more than one link is there, return null
+    if (tags.length > 1) {
+        return null;
+    } else if (tags.length == 1) {
+        href = tags[0];
+    } else {
+        var node = _findNodeByNameInContainer(sel.anchorNode.parentElement, 'A', 'editor');
+        href = node.href;
+    }
+    return href ? href : null;
+};
+
+// Returns the cursor position relative to its current position onscreen.
+// Can be negative if it is above what is visible
+RE.getRelativeCaretYPosition = function() {
+    var y = 0;
+    var sel = window.getSelection();
+    if (sel.rangeCount) {
+        var range = sel.getRangeAt(0);
+        var needsWorkAround = (range.startOffset == 0)
+        /* Removing fixes bug when node name other than 'div' */
+        // && range.startContainer.nodeName.toLowerCase() == 'div');
+        if (needsWorkAround) {
+            y = range.startContainer.offsetTop - window.pageYOffset;
+        } else {
+            if (range.getClientRects) {
+                var rects = range.getClientRects();
+                if (rects.length > 0) {
+                    y = rects[0].top;
+                }
+            }
+        }
+    }
+    return y;
+};
+
+window.onload = function() {
+    RE.callback("ready");
+};
 
 RE.enabledEditingItems = function(e) {
     var items = [];
@@ -328,8 +888,12 @@ RE.enabledEditingItems = function(e) {
     if (formatBlock.length > 0) {
         items.push(formatBlock);
     }
+    RE.setCallBack("state", items);
+}
 
-    window.location.href = "re-state://" + encodeURI(items.join(','));
+RE.setCallBack = function(schema, items) {
+    //console.log("Response value: " + x);
+    window.location.href = "http://richeditor/" + schema + "?" + encodeURI(JSON.stringify(items));
 }
 
 RE.focus = function() {
@@ -340,16 +904,26 @@ RE.focus = function() {
     selection.removeAllRanges();
     selection.addRange(range);
     RE.editor.focus();
-}
+};
+
+RE.focusAtPoint = function(x, y) {
+    var range = document.caretRangeFromPoint(x, y) || document.createRange();
+    var selection = window.getSelection();
+    selection.removeAllRanges();
+    selection.addRange(range);
+    RE.editor.focus();
+};
 
 RE.blurFocus = function() {
     RE.editor.blur();
-}
+};
 
 RE.removeFormat = function() {
+    document.execCommand('formatBlock', false, 'p');
     document.execCommand('removeFormat', false, null);
-}
+};
 
+/*
 // Event Listeners
 RE.editor.addEventListener("input", RE.callback);
 RE.editor.addEventListener("keyup", function(e) {
@@ -358,4 +932,15 @@ RE.editor.addEventListener("keyup", function(e) {
         RE.enabledEditingItems(e);
     }
 });
+*/
 RE.editor.addEventListener("click", RE.enabledEditingItems);
+
+
+//https://stackoverflow.com/questions/18552336/prevent-contenteditable-adding-div-on-enter-chrome
+RE.editor.addEventListener("keydown", function(e) {
+let isList=document.queryCommandState('insertOrderedList') || document.queryCommandState('insertUnorderedList');
+ if(e.keyCode===13 && !isList){ //enter && shift
+   document.execCommand('insertLineBreak');
+   e.preventDefault(); //Prevent default browser behavior
+   }
+});
diff --git a/richeditor/src/main/assets/rich_editor_tests.html b/richeditor/src/main/assets/rich_editor_tests.html
new file mode 100644
index 00000000..c12f3ec1
--- /dev/null
+++ b/richeditor/src/main/assets/rich_editor_tests.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="ja">
+    <head>
+        <meta name="viewport" content="user-scalable=no">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <link rel="stylesheet" type="text/css" href="normalize.css">
+        <link rel="stylesheet" type="text/css" href="style.css">
+    </head>
+    <body><div id="editor" contentEditable="true" placeholder="" class="placeholder">
+    </div>
+    <script type="text/javascript" src="rich_editor.js"></script>
+    <script type="text/javascript" src="assert.js"></script>
+    <script type="text/javascript" src="rich_editor_tests.js"></script>
+    </body>
+</html>
diff --git a/richeditor/src/main/assets/rich_editor_tests.js b/richeditor/src/main/assets/rich_editor_tests.js
new file mode 100644
index 00000000..98494314
--- /dev/null
+++ b/richeditor/src/main/assets/rich_editor_tests.js
@@ -0,0 +1,72 @@
+"use strict";
+
+var RichEditorTests = function() {
+    var self = {};
+    var tests = [];
+    var link = "http://foo.bar/";
+    var anchor = "<a id='link_id' href='" + link + "'>Foo</a>";
+    var htmlWithLink = "<span><p id='prose'>What are these so withered and wild in their attire? " + anchor + " </p>that look not like the inhabitants of the Earth and yet are on't?</span>";
+    var htmlWith2Links = "<span><p id='two_links'>Blah? " + anchor + " " + anchor + " Blah</p></span>";
+
+    var tearDown = function() {
+        RE.setHtml('');
+    };
+
+    /**
+    This is the main and only public "method"
+    **/
+    self.runTests = function() {
+        var content = "";
+        for (var testName in tests) {
+            tests[testName]();
+            var log = 'Passed : ' + testName;
+            console.log(log);
+            content += log + "<br>";
+            tearDown();
+        }
+        RE.setHtml(content);
+    };
+
+    tests['testGetSet'] = function() {
+        var testContent = "Test";
+        RE.setHtml(testContent);
+        Assert.equals(RE.getHtml(), testContent, 'testGetSet');
+    };
+
+    tests['testGetSelectedHrefReturnsLinkOnFullSelection'] = function() {
+        let htmlWithLink = "<a id='link_id' href='" + link + "'>Foo</a>";
+        RE.setHtml(htmlWithLink);
+            //select the anchor tag directly and fully
+        RE.selectElementContents(document.querySelector('#link_id'));
+        Assert.equals(RE.getSelectedHref(), link);
+    };
+
+    tests['testGetSelectedHrefWithSelectionContainingOneLink'] = function() {
+        RE.setHtml(htmlWithLink);
+            //select the anchor tag directly and fully
+        RE.selectElementContents(document.querySelector('#prose'));
+        Assert.equals(RE.getSelectedHref(), link);
+    };
+
+    tests['testCountAnchorTagsInSelection'] = function() {
+        RE.setHtml(htmlWithLink);
+            //select the anchor tag directly and fully
+        RE.selectElementContents(document.querySelector('#prose'));
+        let count = RE.countAnchorTagsInNode(getSelection().anchorNode);
+        Assert.equals(count, 1);
+    };
+
+    tests['testgetSelectedHrefWith2LinksReturnsNull'] = function() {
+        RE.setHtml(htmlWith2Links);
+
+        //select the anchor tag directly and fully
+        RE.selectElementContents(document.querySelector('#two_links'));
+        let count = RE.countAnchorTagsInNode(getSelection().anchorNode);
+        Assert.equals(count, 2);
+            // Assert.equals(RE.getSelectedHref(), null)
+    };
+
+    return self;
+}();
+
+RichEditorTests.runTests();
\ No newline at end of file
diff --git a/richeditor/src/main/assets/style.css b/richeditor/src/main/assets/style.css
index 89772a62..817632fb 100644
--- a/richeditor/src/main/assets/style.css
+++ b/richeditor/src/main/assets/style.css
@@ -1,5 +1,6 @@
 /**
- * Copyright (C) 2020 Wasabeef
+ * Copyright (C) 2022-2023 peter@niendo.de
+ * Copyright (C) 2015 Wasabeef
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,28 +17,112 @@
 
 @charset "UTF-8";
 
+:root {
+    color-scheme: light dark;
+}
 
 html {
-  height: 100%;
+    height: 100%;
 }
 
 body {
-  overflow: scroll;
-  display: table;
-  table-layout: fixed;
-  width: 100%;
-  min-height:100%;
+    min-height: 100%;
+    overflow: auto;
+    font: -apple-system-body;
+}
+
+body, h1, p, ul, ol {
+    margin: 0;
+}
+
+div {
+    display: block;
+    position: static;
+}
+
+#editor {
+    -webkit-user-select: auto !important;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+#editor:focus {
+    outline: 0px solid transparent;
+}
+
+@media (prefers-color-scheme: dark) {
+    body, #editor {
+    }
+}
+
+.placeholder[placeholder]:after {
+    content: attr(placeholder);
+    position: absolute;
+    top: 0px;
+    color: #cccccc;
 }
 
 #editor {
-  display: table-cell;
-  outline: 0px solid transparent;
-  background-repeat: no-repeat;
-  background-position: center;
-  background-size: cover;
+    min-height: 100%;
+    height: 100%;
+    overflow: auto;
+    display: block;
+    font-size: 12pt;
+}
+
+input[type=checkbox] {
+    transform: scale(1.4);
+    margin-right: 9px;
+}
+
+/* #responsive-image {
+    width: 100%;
+    height: auto;
+}
+
+video {
+    width: 100%  !important;
+    height: auto !important;
+}
+*/
+
+table {overflow-x: scroll;}
+th, td {max-width: 200px; min-width:50px;}
+table, td, th{border-collapse:collapse; border:1px solid #777;}
+td{padding:5px 10px; height:35px;}
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 10px;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 17px;
+}
+
+.active, .collapsible:hover {
+  background-color: #555;
+}
+
+.collapsible:after {
+  content: '\002B';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 5px;
+}
+
+.active:after {
+  content: "\2212";
 }
 
-#editor[placeholder]:empty:not(:focus):before {
-  content: attr(placeholder);
-  opacity: .5;
+.content {
+  padding: 0 15px;
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out;
+  background-color: #f1f1f1;
+  font-size: 12pt;
 }
diff --git a/richeditor/src/main/java/jp/wasabeef/richeditor/RichEditor.java b/richeditor/src/main/java/jp/wasabeef/richeditor/RichEditor.java
index d05481d6..ff260123 100644
--- a/richeditor/src/main/java/jp/wasabeef/richeditor/RichEditor.java
+++ b/richeditor/src/main/java/jp/wasabeef/richeditor/RichEditor.java
@@ -1,29 +1,37 @@
 package jp.wasabeef.richeditor;
 
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Build;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.Gravity;
+import android.view.inputmethod.InputMethodManager;
+import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
+ * Copyright (C) 2022-2025 niendo
+ * Copyright (C) 2017 Kishan Jadav
  * Copyright (C) 2020 Wasabeef
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,61 +47,131 @@
  * limitations under the License.
  */
 
-public class RichEditor extends WebView {
+/**
+ * This class provides the HTML-Editor.
+ *
+ *  Note: The behavior may vary between different Android, Java and webView versions
+ */
+public class RichEditor extends WebView implements ValueCallback<String> {
 
+  /**
+   *
+   */
   public enum Type {
-    BOLD,
-    ITALIC,
-    SUBSCRIPT,
-    SUPERSCRIPT,
-    STRIKETHROUGH,
-    UNDERLINE,
-    H1,
-    H2,
-    H3,
-    H4,
-    H5,
-    H6,
-    ORDEREDLIST,
-    UNORDEREDLIST,
-    JUSTIFYCENTER,
-    JUSTIFYFULL,
-    JUSTIFYLEFT,
-    JUSTIFYRIGHT
+    BOLD, ITALIC, SUBSCRIPT, SUPERSCRIPT, STRIKETHROUGH, UNDERLINE, H1, H2, H3, H4, H5, H6, HTML, HR, ORDEREDLIST, UNORDEREDLIST, JUSTIFYCENTER, JUSTIFYFULL, JUSTIFYLEFT, JUSTIFYRIGHT
   }
 
-  public interface OnTextChangeListener {
+  private final AtomicBoolean mEvaluateFinished = new AtomicBoolean(false);
+
+
+  /**
+   * Bring back focus in to the editor
+   * by IntuzMayurS
+   *
+   */
+  @Override
+  public void onWindowFocusChanged(boolean hasWindowFocus) {
+    super.onWindowFocusChanged(hasWindowFocus);
+    if (hasWindowFocus) {
+      requestFocus();
+      post(() -> {
+        InputMethodManager imm = getContext().getSystemService(InputMethodManager.class);
+        imm.showSoftInput(this, 0);
+      });
+    }
+  }
 
-    void onTextChange(String text);
+  /**
+   * Callback interface to receive data from the editor
+   *
+   * Example code
+   * <pre>
+   *    mEditor.setOnTextChangeListener(new RichEditor.OnTextChangeListener() {
+   *       @Override
+   *       public void onTextChange(String text) {
+   *         mEditor.setOnJSDataListener(value -> {
+   *
+   *           // do something with value
+   *
+   *         });
+   *         mEditor.getHtml();
+   *       }
+   *     });
+   * </pre>
+   */
+  public interface onJSDataListener  {
+    public void onDataReceived(String value);
   }
 
-  public interface OnDecorationStateListener {
+  /**
+   * The class implements this listener to receive notifications when clicks occur
+   * in the html editor
+   * @todo
+   */
+  public interface onClickListener  {
+    public void onClick(String value);
+  }
+
+  /**
+   * The class implements this listener to receive notifications when clicks occur
+   * in the html editor
+   * @see onJSDataListener
+   * @todo
+   */
+  public interface OnTextChangeListener {
+        void onTextChange(String text);
+  }
 
+  /**
+   * The class implements this listener to receive notifications when state changes occur
+   * in the html editor
+   * @todo
+   */
+  public interface OnDecorationStateListener {
     void onStateChangeListener(String text, List<Type> types);
   }
 
+  /**
+   * The class implements this listener to receive notifications the html editor is ready initialised
+   */
   public interface AfterInitialLoadListener {
-
     void onAfterInitialLoad(boolean isReady);
   }
 
-  private static final String SETUP_HTML = "file:///android_asset/editor.html";
-  private static final String CALLBACK_SCHEME = "re-callback://";
-  private static final String STATE_SCHEME = "re-state://";
+  private static final String SETUP_HTML = "file:///android_asset/rich_editor.html";
+  private static final String CALLBACK_SCHEME = "http://richeditor/callback";
+  private static final String STATE_SCHEME = "http://richeditor/state";
+  private static final String CLICK_SCHEME= "http://richeditor/click";
   private boolean isReady = false;
-  private String mContents;
   private OnTextChangeListener mTextChangeListener;
+  private onClickListener mClickListener;
+  private onJSDataListener mJSDataListener;
   private OnDecorationStateListener mDecorationStateListener;
   private AfterInitialLoadListener mLoadListener;
 
+  /**
+   * Constructs a new RichEditor with an Activity Context object.
+   * @param context
+   */
   public RichEditor(Context context) {
     this(context, null);
   }
 
+  /**
+   * Constructs a new RichEditor with layout parameters.
+   * @param context
+   * @param attrs
+   */
   public RichEditor(Context context, AttributeSet attrs) {
     this(context, attrs, android.R.attr.webViewStyle);
   }
 
+  /**
+   * Constructs a new RichEditor with layout parameters and a default style
+   * @param context
+   * @param attrs
+   * @param defStyleAttr
+   */
   @SuppressLint("SetJavaScriptEnabled")
   public RichEditor(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
@@ -107,46 +185,105 @@ public RichEditor(Context context, AttributeSet attrs, int defStyleAttr) {
 
     applyAttributes(context, attrs);
   }
-
+  /**
+   * Creates and returns an instance of the protected inner class EditorWebViewClient.
+   *
+   * @return An instance of the EditorWebViewClient class.
+   */
   protected EditorWebViewClient createWebviewClient() {
     return new EditorWebViewClient();
   }
 
+  /**
+   * Register a callback to be invoked when the html text is changed
+   * @param listener The callback that will run This value may be null.
+   */
   public void setOnTextChangeListener(OnTextChangeListener listener) {
     mTextChangeListener = listener;
   }
 
+  /**
+   * Register a callback to be invoked when the editor is clicked
+   * @param listener The callback that will run This value may be null.
+   */
+  public void setOnClickListener(onClickListener listener) {
+    mClickListener = listener;
+  }
+
+  /**
+   * Register a callback to be invoked when data needs to be transferred from the editor to the main program
+   * @see onJSDataListener
+   * @param listener The callback that will run This value may be null.
+   */
+  public void setOnJSDataListener(onJSDataListener listener) {
+    mJSDataListener = listener;
+  }
+
   public void setOnDecorationChangeListener(OnDecorationStateListener listener) {
     mDecorationStateListener = listener;
   }
 
+  /**
+   * Register a callback to be invoked when the editor finished loading and is ready to use
+   * @param listener The callback that will run This value may be null.
+   */
   public void setOnInitialLoadListener(AfterInitialLoadListener listener) {
     mLoadListener = listener;
   }
 
-  private void callback(String text) {
-    mContents = text.replaceFirst(CALLBACK_SCHEME, "");
+  /**
+   * Value callback
+   * @param value The value.
+   */
+  @Override public void onReceiveValue(String value) {
+
+    String unescaped= null;
+    try {
+      unescaped = URLDecoder.decode(value, "UTF-8");
+    } catch (UnsupportedEncodingException e) {
+      Log.e("RichEditor","onReceiveValue:", e);
+    }
+    if (!"null".equals(unescaped)) {
+
+      unescaped = unescaped.substring(1, unescaped.length() - 1)  // remove wrapping quotes
+        .replace("\\\\", "\\")        // unescape \\ -> \
+        .replace("\\\"", "\"")        // unescape \" -> "
+        .replace("\\u003C", "<");    // unescape \u003c" -> <
+    }
+
+    if (mJSDataListener != null) {
+      mJSDataListener.onDataReceived(unescaped);
+    }
+  }
+  
+   private void callback(String value) {
+
     if (mTextChangeListener != null) {
-      mTextChangeListener.onTextChange(mContents);
+      mTextChangeListener.onTextChange(value);
     }
   }
 
-  private void stateCheck(String text) {
-    String state = text.replaceFirst(STATE_SCHEME, "").toUpperCase(Locale.ENGLISH);
-    List<Type> types = new ArrayList<>();
-    for (Type type : Type.values()) {
-      if (TextUtils.indexOf(state, type.name()) != -1) {
-        types.add(type);
-      }
+  private void callback_click(String value) {
+    if (mClickListener != null) {
+      mClickListener.onClick(value);
     }
+  }
 
+  private void callback_stateCheck(String text) {
     if (mDecorationStateListener != null) {
+      String state = text.toUpperCase(Locale.ENGLISH);
+      List<Type> types = new ArrayList<>();
+      for (Type type : Type.values()) {
+        if (TextUtils.indexOf(state, type.name()) != -1) {
+          types.add(type);
+        }
+      }
       mDecorationStateListener.onStateChangeListener(state, types);
     }
   }
 
   private void applyAttributes(Context context, AttributeSet attrs) {
-    final int[] attrsArray = new int[]{
+    final int[] attrsArray = new int[] {
       android.R.attr.gravity
     };
     TypedArray ta = context.obtainStyledAttributes(attrs, attrsArray);
@@ -180,6 +317,36 @@ private void applyAttributes(Context context, AttributeSet attrs) {
     ta.recycle();
   }
 
+  private void load(String trigger) {
+    evaluateJavascript(trigger, null);
+  }
+
+
+  private String convertHexColorString(int color) {
+    return String.format("#%06X", (0xFFFFFF & color));
+  }
+
+  protected void exec(final String trigger) {
+    if (isReady) {
+      load(trigger);
+    } else {
+      postDelayed(new Runnable() {
+        @Override public void run() {
+          exec(trigger);
+        }
+      }, 100);
+    }
+  }
+
+  /**
+   * Load html text in the the editor.
+   * <pre>
+   *   SetupRichEditor();
+   *   String HtmlText = "<h1>Header 1</h1>"
+   *   editText.setHtml(HtmlText);
+   * </pre>
+   * @param contents string with html content
+   */
   public void setHtml(String contents) {
     if (contents == null) {
       contents = "";
@@ -187,24 +354,140 @@ public void setHtml(String contents) {
     try {
       exec("javascript:RE.setHtml('" + URLEncoder.encode(contents, "UTF-8") + "');");
     } catch (UnsupportedEncodingException e) {
-      // No handling
+      Log.e("RichEditor","setHTML:", e);
     }
-    mContents = contents;
   }
 
+  /**
+   * Requests JavaScript data from the WebView by executing the specified JavaScript command.
+   * This method uses the evaluateJavascript method to execute the provided JavaScript command
+   * and waits for the evaluation to finish before returning.
+   *
+   * @param cmdJS The JavaScript command to be executed in the WebView.
+   * @return true if the JavaScript command was successfully requested, false otherwise.
+   *
+   * @see <a href="https://stackoverflow.com/questions/38380246/espresso-how-to-call-evaluatejavascript-on-a-webview">
+   * Stack Overflow: Espresso - How to call evaluateJavascript on a WebView</a>
+   */
+  public boolean requestJSData(String cmdJS) {
+    // https://stackoverflow.com/questions/38380246/espresso-how-to-call-evaluatejavascript-on-a-webview
+    mEvaluateFinished.set(false);
+
+    // Execute the specified JavaScript command and set the evaluation flag
+    evaluateJavascript(cmdJS, this);
+
+    // Return true to indicate that the JavaScript command was successfully requested
+    return true;
+  }
+
+  /**
+   * Requests the complete html data from the editor. Data comes via callback
+   * @see onJSDataListener()
+   * <pre>
+   *         mEditor.setOnJSDataListener(value -> {
+   *             do something with value
+   *         });
+   *         mEditor.getHtml();
+   * </pre>
+   * @return the html content of the editor
+   */
   public String getHtml() {
-    return mContents;
+      requestJSData("RE.getHtml()");
+      return("data can only received by callback");
+  }
+
+  /**
+   * Text representation of the data that has been input into the editor view, if it has been loaded.
+   * Data comes via callback.
+   * @see #getHtml
+   * @return the text
+   */
+  public boolean getText() {
+    return requestJSData("RE.getText()");
+  }
+
+  /**
+   * Returns selected text
+   * Data comes via callback.
+   * @see #getHtml
+   * @return the selected text
+   */
+  public boolean getSelectedText() {
+    return requestJSData("RE.selectedText()");
+  }
+
+  /**
+   * Returns HTML-Code from selected range
+   * Data comes via callback.
+   * @see #getHtml
+   * @return HTML-Code
+   */
+  public boolean getSelectedHtml() {
+    return requestJSData("RE.selectedHtml()");
+  }
+
+  /**
+   * The href of the current selection, if the current selection's parent is an anchor tag.
+   * Will be nil if there is no href, or it is an empty string.
+   * Data comes via callback.
+   * @see #getHtml
+   * @return false - if no selection
+   */
+  public boolean getSelectedHref() {
+    if (!hasRangeSelection()) {
+      return false;
+    } else {
+      return requestJSData("RE.getSelectedHref()");
+    }
+  }
+
+  /**
+   * Whether or not the selection has a type specifically of "Range".
+   * Data comes via callback.
+   * @see #getHtml()
+   * @return
+   */
+  public boolean hasRangeSelection() {
+    return requestJSData("RE.rangeSelectionExists()");
   }
 
+  /**
+   * Whether or not the selection has a type specifically of "Range" or "Caret".
+   * Data comes via callback.
+   * @see #getHtml
+   * @return
+   */
+  public boolean hasRangeOrCaretSelection() {
+    return requestJSData("RE.rangeOrCaretSelectionExists()");
+  }
+
+  /**
+   * Sets the font color of the editor
+   * <pre>
+   *   mEditor.setEditorFontColor(getColor(R.color.EditorTxtColor));
+   * </pre>
+   * @param color
+   */
   public void setEditorFontColor(int color) {
     String hex = convertHexColorString(color);
     exec("javascript:RE.setBaseTextColor('" + hex + "');");
   }
 
+  /**
+   * Sets the font size in pixels
+   * @param px font size
+   */
   public void setEditorFontSize(int px) {
     exec("javascript:RE.setBaseFontSize('" + px + "px');");
   }
 
+  /**
+   * sets the padding
+   * @param left the left padding in pixels
+   * @param top the top padding in pixels
+   * @param right the right padding in pixels
+   * @param bottom the bottom padding in pixels
+   */
   @Override
   public void setPadding(int left, int top, int right, int bottom) {
     super.setPadding(left, top, right, bottom);
@@ -212,276 +495,662 @@ public void setPadding(int left, int top, int right, int bottom) {
       + "px');");
   }
 
+  /**
+   * sets the relative padding
+   * @todo same as @see #setPadding()
+   * @param start the start padding in pixels
+   * @param top the top padding in pixels
+   * @param end the end padding in pixels
+   * @param bottom the bottom padding in pixels
+   */
   @Override
   public void setPaddingRelative(int start, int top, int end, int bottom) {
     // still not support RTL.
     setPadding(start, top, end, bottom);
   }
 
+  /**
+   * Sets the back color of the editor
+   * @param color the color of the background
+   */
   public void setEditorBackgroundColor(int color) {
     setBackgroundColor(color);
   }
 
+  /**
+   * Sets the back color of the editor
+   * @param color the color of the background
+   */
   @Override
   public void setBackgroundColor(int color) {
     super.setBackgroundColor(color);
   }
 
+  /**
+   * set a background resource
+   * <pre>
+   *   mEditor.setBackgroundResource(R.drawable.bg);
+   * </pre>
+   * @param resid The identifier of the resource.
+   */
   @Override
   public void setBackgroundResource(int resid) {
     Bitmap bitmap = Utils.decodeResource(getContext(), resid);
-    String base64 = Utils.toBase64(bitmap);
+    String base64 = Utils.toBase64(bitmap, "png");
     bitmap.recycle();
 
     exec("javascript:RE.setBackgroundImage('url(data:image/png;base64," + base64 + ")');");
   }
 
+  /**
+   * The Drawable (png) to use as the background, or null to remove the background
+   * @param background The Drawable to use as the background, or null to remove the
+   * background
+   */
   @Override
   public void setBackground(Drawable background) {
     Bitmap bitmap = Utils.toBitmap(background);
-    String base64 = Utils.toBase64(bitmap);
+    String base64 = Utils.toBase64(bitmap,"png");
     bitmap.recycle();
 
     exec("javascript:RE.setBackgroundImage('url(data:image/png;base64," + base64 + ")');");
   }
 
+  /**
+   * The URL (png) to use as the background
+   * <pre>
+   *   mEditor.setBackground("https://raw.githubusercontent.com/wasabeef/art/master/chip.png");
+   * </pre>
+   * @param url The Drawable to use as the background, or null to remove the
+   * background
+   */
   public void setBackground(String url) {
     exec("javascript:RE.setBackgroundImage('url(" + url + ")');");
   }
 
+  /**
+   * Sets width of the editor in pixels
+   * @param px new width
+   */
   public void setEditorWidth(int px) {
     exec("javascript:RE.setWidth('" + px + "px');");
   }
 
+  /**
+   * Sets height of the editor in pixels
+   * @param px new height
+   */
   public void setEditorHeight(int px) {
     exec("javascript:RE.setHeight('" + px + "px');");
   }
 
+  /**
+   * Sets a hint in the empty editor
+   * <pre>
+   *   mEditor.setPlaceholder("Insert text here...");
+   * </pre>
+   * @param placeholder the text
+   */
   public void setPlaceholder(String placeholder) {
-    exec("javascript:RE.setPlaceholder('" + placeholder + "');");
+    exec("javascript:RE.setPlaceholderText('" + placeholder + "');");
   }
 
+  /**
+   * Make the editor writable
+   * @param inputEnabled true=writable, false=read only
+   */
   public void setInputEnabled(Boolean inputEnabled) {
     exec("javascript:RE.setInputEnabled(" + inputEnabled + ")");
   }
 
+  /**
+   * Loads an additional CSS file
+   * @param cssFile
+   */
   public void loadCSS(String cssFile) {
-    String jsCSSImport = "(function() {" +
-      "    var head  = document.getElementsByTagName(\"head\")[0];" +
-      "    var link  = document.createElement(\"link\");" +
-      "    link.rel  = \"stylesheet\";" +
-      "    link.type = \"text/css\";" +
-      "    link.href = \"" + cssFile + "\";" +
-      "    link.media = \"all\";" +
-      "    head.appendChild(link);" +
-      "}) ();";
+    String jsCSSImport =
+      "(function() {" + "    var head  = document.getElementsByTagName(\"head\")[0];"
+        + "    var link  = document.createElement(\"link\");" + "    link.rel  = \"stylesheet\";"
+        + "    link.type = \"text/css\";" + "    link.href = \"" + cssFile + "\";"
+        + "    link.media = \"all\";" + "    head.appendChild(link);" + "}) ();";
     exec("javascript:" + jsCSSImport + "");
   }
 
+  /**
+   * reverts the last action
+   */
   public void undo() {
     exec("javascript:RE.undo();");
   }
 
+  /**
+   * reverts the last revert action
+   */
   public void redo() {
     exec("javascript:RE.redo();");
   }
 
-  public void setBold() {
-    exec("javascript:RE.setBold();");
+  /**
+   * set html tag <code>PRE</code>
+   */
+  public void setPre() {
+    exec("javascript:RE.setPre();");
+  }
+
+  /**
+   * toggle font attribute bold
+   */
+  public void toggleBold() {
+    exec("javascript:RE.toggleBold();");
+  }
+
+  /**
+   * set font attribute bold
+   */
+  public void setBold(boolean enabled) {
+    exec("javascript:RE.setBold(" + enabled + ");");
+  }
+
+  /**
+   * toggle font attribute Italic
+   */
+  public void toggleItalic() {
+    exec("javascript:RE.toggleItalic();");
   }
 
-  public void setItalic() {
-    exec("javascript:RE.setItalic();");
+  /**
+   * set font attribute Italic
+   */
+  public void setItalic(boolean enabled) {
+    exec("javascript:RE.setItalic(" + enabled + ");");
   }
 
+  /**
+   * set font attribute Sub script
+   */
   public void setSubscript() {
     exec("javascript:RE.setSubscript();");
   }
 
+  /**
+   * set font attribute super script
+   */
   public void setSuperscript() {
     exec("javascript:RE.setSuperscript();");
   }
 
-  public void setStrikeThrough() {
-    exec("javascript:RE.setStrikeThrough();");
+  /**
+   * toggle font attribute Strike Through
+   */
+  public void toggleStrikeThrough() {
+    exec("javascript:RE.toggleStrikeThrough();");
+  }
+
+  /**
+   * set font attribute Strike Through
+   * @param enabled
+   */
+  public void setStrikeThrough(boolean enabled) {
+    exec("javascript:RE.setStrikeThrough(" + enabled + ");");
   }
 
-  public void setUnderline() {
-    exec("javascript:RE.setUnderline();");
+  /**
+   * toggle font attribute Under line
+   */
+  public void toggleUnderline() {
+    exec("javascript:RE.toggleUnderline();");
   }
 
+  /**
+   * set font attribute Under line
+   * @param enabled
+   */
+  public void setUnderline(boolean enabled) {
+    exec("javascript:RE.setUnderline(" + enabled + ");");
+  }
+
+  /**
+   * set text color by value
+   * @param color
+   */
   public void setTextColor(int color) {
-    exec("javascript:RE.prepareInsert();");
+    setTextColor(convertHexColorString(color));
+  }
 
-    String hex = convertHexColorString(color);
-    exec("javascript:RE.setTextColor('" + hex + "');");
+  /**
+   * set text color by string
+   *  if color=initial, text color is reset to default value
+   * <pre>
+   *   mEditor.setTextColor("red")
+   * </pre>
+   * @param color
+   */
+  public void setTextColor(String color) {
+    //requestFocusFromTouch();
+    exec("javascript:RE.prepareInsert();");
+    exec("javascript:RE.setTextColor('" + color + "');");
   }
 
+  /**
+   * Sets Background color for text by number
+   * @param color
+   */
   public void setTextBackgroundColor(int color) {
+    setTextBackgroundColor(convertHexColorString(color));
+  }
+
+  /**
+   * Sets Background color for text by string
+   * if color=initial, background color is reset to default value
+   * <pre>
+   * mEditor.setTextColor("red")
+   * </pre>
+   * @param color as string
+   */
+  public void setTextBackgroundColor(String color) {
+    //requestFocusFromTouch();
     exec("javascript:RE.prepareInsert();");
+    exec("javascript:RE.setTextBackgroundColor('" + color + "');");
+  }
 
-    String hex = convertHexColorString(color);
-    exec("javascript:RE.setTextBackgroundColor('" + hex + "');");
+  /**
+   * set the font family
+   * @see #getFontFamily for a list of available font families
+   * @see #LoadFont to add new fonts
+   * @param fontFamily
+   */
+  public void setFontFamily(String fontFamily) {
+    exec("javascript:RE.setFontFamily('" + fontFamily + "');");
   }
 
+  /**
+   * loads a new font file (for example ttf)
+   * @see #setFontFamily to access this font
+   * @param name to access this font
+   * @param url
+   */
+  public void LoadFont(String name, String url) {
+    exec("javascript:RE.LoadFont('" + name + "','"+url+"');");
+  }
+
+  /**
+   * gets a list of available fonts/font families
+   * @see #setFontFamily to access one of these fonts/font families
+   */
+  public void getFontFamily() {
+    requestJSData("javascript:RE.getFontFamily();");
+  }
+
+  /**
+   * sets the font size
+   * @param fontSize in steps 1 tru 7
+   */
   public void setFontSize(int fontSize) {
     if (fontSize > 7 || fontSize < 1) {
-      Log.e("RichEditor", "Font size should have a value between 1-7");
+      Log.w("RichEditor", "Font size should have a value between 1-7");
     }
     exec("javascript:RE.setFontSize('" + fontSize + "');");
   }
 
+  /**
+   * removes all the formats for the actual selection
+   */
   public void removeFormat() {
     exec("javascript:RE.removeFormat();");
   }
 
+  /**
+   * Sets the selected text or cursor position to a specific heading level in the Rich Editor WebView.
+   *
+   * @param heading The heading level to set, where 1 is the highest (largest) heading and
+   *                larger values represent lower (smaller) headings.
+   */
   public void setHeading(int heading) {
     exec("javascript:RE.setHeading('" + heading + "');");
   }
 
+  /**
+   * Shifts the actual text selection or cursor position to the right in the Rich Editor WebView.
+   * This is used to create an indentation effect.
+   */
   public void setIndent() {
     exec("javascript:RE.setIndent();");
   }
 
+  /**
+   * Shifts the actual text selection or cursor position to the left in the Rich Editor WebView.
+   * This is used to remove indentation.
+   */
   public void setOutdent() {
     exec("javascript:RE.setOutdent();");
   }
 
+  /**
+   * Aligns the selected text or cursor position to the left in the Rich Editor WebView.
+   */
   public void setAlignLeft() {
     exec("javascript:RE.setJustifyLeft();");
   }
 
+  /**
+   * Aligns the selected text or cursor position to the center in the Rich Editor WebView.
+   */
   public void setAlignCenter() {
     exec("javascript:RE.setJustifyCenter();");
   }
 
+  /**
+   * Aligns the selected text or cursor position to the right in the Rich Editor WebView.
+   */
   public void setAlignRight() {
     exec("javascript:RE.setJustifyRight();");
   }
 
+  /**
+   * Applies blockquote styling to the selected text or cursor position in the Rich Editor WebView.
+   * This is used to create a blockquote effect.
+   */
   public void setBlockquote() {
     exec("javascript:RE.setBlockquote();");
   }
 
-  public void setBullets() {
-    exec("javascript:RE.setBullets();");
-  }
+  /**
+   * Sets the selected text or cursor position to use bullets in the Rich Editor WebView.
+   * This method is an alias for {@see #setUnorderedList()}.
+   */
+  public void setBullets() { setUnorderedList(); }
+
+  /**
+   * Sets the selected text or cursor position to use an unordered list (bullets) in the Rich Editor WebView.
+   */
+  public void setUnorderedList() { exec("javascript:RE.setUnorderedList();"); }
+
+  /**
+   * Sets the selected text or cursor position to use numbers in the Rich Editor WebView.
+   * This method is an alias for {@see #setOrderedList()}.
+   */
+  public void setNumbers() { setOrderedList(); }
+
+  /**
+   * Sets the selected text or cursor position to use an ordered list (numbers) in the Rich Editor WebView.
+   */
+  public void setOrderedList() { exec("javascript:RE.setOrderedList();"); }
 
-  public void setNumbers() {
-    exec("javascript:RE.setNumbers();");
+  /**
+   * Insert a HTML string into the Rich Editor WebView.
+   * Example to insert a not breakable space:
+   * <pre>
+   *   mEditor.insertHTML("&nbsp";)
+   * </pre>
+   * @param contents string with html content
+   */
+  public void insertHTML(String contents) {
+    if (contents == null) {
+       contents = "";
+    }
+    try {
+      exec("javascript:RE.prepareInsert();");
+      exec("javascript:RE.insertHTML('" + URLEncoder.encode(contents, "UTF-8") + "');");
+    } catch (UnsupportedEncodingException e) {
+      Log.e("RichEditor","insertHTML", e);
+    }
   }
 
-  public void insertImage(String url, String alt) {
+  /**
+   * Inserts a horizontal rule (line) into the Rich Editor WebView.
+   * This method prepares the editor for insertion and then adds an HTML horizontal rule.
+   */
+  public void insertHR_Line() {
     exec("javascript:RE.prepareInsert();");
-    exec("javascript:RE.insertImage('" + url + "', '" + alt + "');");
+    exec("javascript:RE.insertHTML('<hr>');");
   }
 
   /**
-   * the image according to the specific width of the image automatically
+   * Inserts a collapsible section into the Rich Editor WebView.
    *
-   * @param url
-   * @param alt
-   * @param width
+   * @param section The title or label for the collapsible section.
+   * @param content The content to be included in the collapsible section.
    */
-  public void insertImage(String url, String alt, int width) {
-    exec("javascript:RE.prepareInsert();");
-    exec("javascript:RE.insertImageW('" + url + "', '" + alt + "','" + width + "');");
+  public void insertCollapsibleSection(String section, String content) {
+    exec("javascript:RE.insertCollapsibleSection('"+section+"', '"+content+"');");
   }
 
   /**
-   * {@link RichEditor#insertImage(String, String)} will show the original size of the image.
+   * Inserts an image into the Rich Editor as link
    * So this method can manually process the image by adjusting specific width and height to fit into different mobile screens.
+   * Example to insert
+   * <pre>
+   *   // inserts an image with 90% page width
+   *   mEditor.insertImage("https://raw.githubusercontent.com/wasabeef/art/master/chip.jpg", "Example", "90%", "", true);
+   *   // inserts an image with 50% of its own width
+   *   mEditor.insertImage("https://raw.githubusercontent.com/wasabeef/art/master/chip.jpg", "Example", "50%", "", false);
+   *   // inserts an image 100px X 100px
+   *   mEditor.insertImage("https://raw.githubusercontent.com/wasabeef/art/master/chip.jpg", "dachshund", "100","100",false);
+   * </pre>
    *
-   * @param url
-   * @param alt
-   * @param width
-   * @param height
+   * @param url      The URI of the image to be inserted.
+   * @param alt      The alternative text for the image.
+   * @param width    Width of the Image; if relative=true then 100% means 100% page width.
+   *                  Can be empty, if not specified in units (px or %) its px
+   * @param height   Height of the Image (with units).
+   *                  Can be empty, if not specified in units (px or %) its px
+   * @param relative Image size is relative to page width
    */
-  public void insertImage(String url, String alt, int width, int height) {
-    exec("javascript:RE.prepareInsert();");
-    exec("javascript:RE.insertImageWH('" + url + "', '" + alt + "','" + width + "', '" + height + "');");
-  }
-
-  public void insertVideo(String url) {
+  public void insertImage(String url, String alt, String width, String height, Boolean relative) {
     exec("javascript:RE.prepareInsert();");
-    exec("javascript:RE.insertVideo('" + url + "');");
+    exec("javascript:RE.insertImage('" + url + "', '" + alt + "','" + width + "', '" + height + "', '" + relative.toString() + "');");
   }
 
-  public void insertVideo(String url, int width) {
-    exec("javascript:RE.prepareInsert();");
-    exec("javascript:RE.insertVideoW('" + url + "', '" + width + "');");
-  }
+  /**
+   * Inserts an image into the Rich Editor WebView using Base64 encoding from the provided image URI.
+   * This method allows manual processing of the image, adjusting width and height to fit different mobile screens.
+   * Examples:
+   * @param imageURI      The URI of the image to be inserted.
+   * @param alt           The alternative text for the image.
+   * @param width         The width of the image; if relative=true then 100% means 100% page width.
+   *                       Can be empty, if not specified in units (px or %) its px
+   * @param height        The height of the image.
+   *                       Can be empty, if not specified in units (px or %) its px
+   * @param relative      Image size is relative to page width
+   * @param inSampleSize  Shrink the image size by this factor.
+   */
+  public void insertImageAsBase64(Uri imageURI, String alt, String width, String height, Boolean relative, Integer inSampleSize) {
+    InputStream inputStream = null;
+    try {
+      inputStream = getContext().getContentResolver().openInputStream(imageURI);
+    } catch (FileNotFoundException e) {
+      Log.e("RichEditor","insertImageAsBase64 Inputstream:", e);
+    }
 
-  public void insertVideo(String url, int width, int height) {
+    BitmapFactory.Options options = new BitmapFactory.Options();
+    options.inSampleSize = inSampleSize;
+    Bitmap bitmap = BitmapFactory.decodeStream(inputStream, null, options);
+    try {
+      inputStream.close();
+    } catch (IOException e) {
+      Log.e("RichEditor","insertImageAsBase64 Inputstream.close:", e);
+    }
+    String type = getContext().getContentResolver().getType(imageURI).toLowerCase();
+    String tag = "data:" + type + ";charset=utf-8;base64,";
     exec("javascript:RE.prepareInsert();");
-    exec("javascript:RE.insertVideoWH('" + url + "', '" + width + "', '" + height + "');");
+    exec("javascript:RE.insertImage('" + tag + Utils.toBase64(bitmap, type) + "','" + alt + "','" + width + "', '" + height + "', '" + relative.toString() + "');");
+    //exec("javascript:RE.insertImage('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==','alt');");
   }
 
-  public void insertAudio(String url) {
+  /**
+   * Will show the original size of the video.
+   * So this method can manually process the image by adjusting specific width and height to fit into different mobile screens.
+   *
+   * @param url           The URI of the video to be inserted.
+   * @param alt           The alternative text for the video.
+   * @param width         The width of the video; if relative=true then 100% means 100% page width.
+   *                       Can be empty, if not specified in units (px or %) its px
+   * @param height        The height of the image.
+   *                       Can be empty, if not specified in units (px or %) its px
+   * @param relative      Video size is relative to page width
+   * @param optProperties additional properties like 'autoplay muted controls loop'
+   * @param height
+   */
+  public void insertVideo(String url, String alt, String width, String height, Boolean relative, String optProperties) {
     exec("javascript:RE.prepareInsert();");
-    exec("javascript:RE.insertAudio('" + url + "');");
+    exec("javascript:RE.insertVideo('" + url + "', '" + alt + "', '" + width + "','" + height + "', '" + relative.toString() + "', '" + optProperties + "');");
   }
 
-  public void insertYoutubeVideo(String url) {
+  /**
+   * Inserts an audio element into the Rich Editor WebView at the current cursor position or selection.
+   *
+   * @param url The URL of the audio file to be inserted.
+   * @param optProperties additional properties like 'autoplay, loop'
+   */
+  public void insertAudio(String url, String optProperties) {
     exec("javascript:RE.prepareInsert();");
-    exec("javascript:RE.insertYoutubeVideo('" + url + "');");
+    exec("javascript:RE.insertAudio('" + url + "', '" + optProperties + "');");
   }
 
-  public void insertYoutubeVideo(String url, int width) {
+  /**
+   * Embeds another HTML page (iframe) into the current one (like for YouTube video into the Rich Editor WebView with the specified URL, width, and height.
+   * This method executes JavaScript commands to prepare for video insertion and inserts the YouTube video.
+   *
+   * @param src    The src URL (for example https://www.openstreetmap.org/export/embed.html?bbox=12.236022949218752%2C51.28886912565582%2C12.462615966796877%2C51.39363622420581&layer=opnvkarte)
+   * @param name   alternative text, if the embedded page can not be shown.
+   * @param width         The width of the frame; if relative=true then 100% means 100% page width.
+   *                       Can be empty, if not specified in units (px or %) its px
+   * @param height        The height of the image.
+   *                       Can be empty, if not specified in units (px or %) its px
+   * @param relative      Frame size is relative to page width
+   * @param optProperties additional properties like 'title="test", allow-forms'
+   */
+  public void insertIFrame(String src, String name, String width, String height, Boolean relative, String optProperties) {
     exec("javascript:RE.prepareInsert();");
-    exec("javascript:RE.insertYoutubeVideoW('" + url + "', '" + width + "');");
+    exec("javascript:RE.insertIFrame('" + src + "', '" + name + "', '" + "', '" + width + "', '" + height + "', '" + relative.toString() + "', '" + optProperties + "');");
   }
 
-  public void insertYoutubeVideo(String url, int width, int height) {
-    exec("javascript:RE.prepareInsert();");
-    exec("javascript:RE.insertYoutubeVideoWH('" + url + "', '" + width + "', '" + height + "');");
+  /**
+   * Inserts a YouTube video into the Rich Editor WebView with the specified URL, width, and height.
+   * This method executes JavaScript commands to prepare for video insertion and inserts the YouTube video.
+   * @see #insertIFrame
+   * @param src      The YouTube video URL. (for example https://www.youtube.com/embed/3AeYHDZ2riI)
+   * @param width         The width of the video; if relative=true then 100% means 100% page width
+   *                       Can be empty, if not specified in units (px or %) its px
+   * @param height        The height of the image
+   *                       Can be empty, if not specified in units (px or %) its px
+   * @param relative      Video size is relative to page width
+   */
+  public void insertYoutubeVideo(String src, String width, String height, Boolean relative) {
+    String optProperties="frameborder=\"0\" allow=\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; fullscreen\"";
+    exec("javascript:RE.insertIFrame('" + src + "', '', '" + width + "', '" + height + "', '" + relative.toString() + "', '" + optProperties + "');");
   }
 
-  public void insertLink(String href, String title) {
+  /**
+   * Inserts a hyperlink into the Rich Editor WebView with the specified href, text, and title.
+   * This method executes JavaScript commands to prepare for link insertion and inserts the link.
+   *
+   * @param href  The URL to link to.
+   * @param text  The text to display as the link.
+   * @param title The title of the link (optional, can be empty).
+   */
+  public void insertLink(String href, String text, String title) {
     exec("javascript:RE.prepareInsert();");
-    exec("javascript:RE.insertLink('" + href + "', '" + title + "');");
+    exec("javascript:RE.insertLink('" + href + "', '" + text + "', '" + title + "');");
   }
 
-  public void insertTodo() {
+  /**
+   * Inserts a check box
+   */
+  public void insertCheckbox() {
     exec("javascript:RE.prepareInsert();");
-    exec("javascript:RE.setTodo('" + Utils.getCurrentTime() + "');");
+    exec("javascript:RE.setCheckbox();");
   }
 
+  /**
+   * Set focus
+   */
   public void focusEditor() {
     requestFocus();
     exec("javascript:RE.focus();");
   }
 
+  /**
+   * Set focus on point
+   * @param x
+   * @param y
+   */
+  public void focus(Integer x, Integer y) {
+    requestFocus();
+    exec("javascript:RE.focusAtPoint("+ x.toString() + ", "+ y.toString() + ")");
+  }
+
+  /**
+   * Clears the focus and blurs the editor
+   */
   public void clearFocusEditor() {
     exec("javascript:RE.blurFocus();");
   }
 
-  private String convertHexColorString(int color) {
-    return String.format("#%06X", (0xFFFFFF & color));
+  /**
+   * Inserts a table with the specified number of columns and rows into the Rich Editor WebView.
+   * This method executes JavaScript commands to prepare for table insertion and insert the table.
+   *
+   * @param col The number of columns in the table.
+   * @param row The number of rows in the table.
+   */
+  public void insertTable(Integer col, Integer row) {
+    exec("javascript:RE.prepareInsert()");
+    exec("javascript:RE.insertTable("+ col.toString() + "," + row.toString() + ")");
   }
 
-  protected void exec(final String trigger) {
-    if (isReady) {
-      load(trigger);
-    } else {
-      postDelayed(new Runnable() {
-        @Override
-        public void run() {
-          exec(trigger);
-        }
-      }, 100);
-    }
+  /**
+   * Checks if cursor is in a table element. If so, return true so that you can add menu items accordingly.
+   *
+   */
+  public void isCursorInTable() {
+    requestJSData("javascript:RE.isCursorInTable");
   }
 
-  private void load(String trigger) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-      evaluateJavascript(trigger, null);
-    } else {
-      loadUrl(trigger);
-    }
+  /**
+   * Adds a new row to the table in the Rich Editor WebView.
+   * This method executes a JavaScript command to add a new row to the table.
+   */
+  public void addRowToTable() {
+    exec("javascript:RE.addRowToTable()");
   }
 
+  /**
+   * Deletes the currently selected row from the table in the Rich Editor WebView.
+   * This method executes a JavaScript command to delete the currently selected row from the table.
+   */
+  public void deleteRowFromTable() {
+    exec("javascript:RE.deleteRowFromTable()");
+  }
+
+  /**
+   * Adds a new column to the table in the Rich Editor WebView.
+   * This method executes a JavaScript command to add a new column to the table.
+   */
+  public void addColumnToTable() {
+    exec("javascript:RE.addColumnToTable()");
+  }
+
+  /**
+   * Deletes the currently selected column from the table in the Rich Editor WebView.
+   * This method executes a JavaScript command to delete the currently selected column from the table.
+   */
+  public void deleteColumnFromTable() {
+    exec("javascript:RE.deleteColumnFromTable()");
+  }
+
+  /**
+   * A custom WebViewClient to handle page loading events for the RichEditor.
+   * This class extends the WebViewClient and provides additional functionality
+   * when a page has finished loading.
+   */
   protected class EditorWebViewClient extends WebViewClient {
+    /**
+     * Called when the page has finished loading in the WebView.
+     *
+     * @param view The WebView that has finished loading the page.
+     * @param url  The URL of the page that has finished loading.
+     */
     @Override
     public void onPageFinished(WebView view, String url) {
       isReady = url.equalsIgnoreCase(SETUP_HTML);
@@ -490,32 +1159,26 @@ public void onPageFinished(WebView view, String url) {
       }
     }
 
-    @Override
-    public boolean shouldOverrideUrlLoading(WebView view, String url) {
-      String decode = Uri.decode(url);
-
-      if (TextUtils.indexOf(url, CALLBACK_SCHEME) == 0) {
-        callback(decode);
-        return true;
-      } else if (TextUtils.indexOf(url, STATE_SCHEME) == 0) {
-        stateCheck(decode);
-        return true;
-      }
 
-      return super.shouldOverrideUrlLoading(view, url);
-    }
+    /**
+     * @param view The WebView that is initiating the callback.
+     * @param request Object containing the details of the request.
+     * @return
+     */
 
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     @Override
     public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
       final String url = request.getUrl().toString();
       String decode = Uri.decode(url);
-
-      if (TextUtils.indexOf(url, CALLBACK_SCHEME) == 0) {
-        callback(decode);
+      String list=decode.substring(decode.indexOf("?")+1);
+      if (decode.startsWith(CALLBACK_SCHEME)) {
+        callback(list);
+        return true;
+      } else if (decode.startsWith(STATE_SCHEME)) {
+        callback_stateCheck(list);
         return true;
-      } else if (TextUtils.indexOf(url, STATE_SCHEME) == 0) {
-        stateCheck(decode);
+      } else if (decode.startsWith(CLICK_SCHEME) ) {
+        callback_click(list);
         return true;
       }
       return super.shouldOverrideUrlLoading(view, request);
diff --git a/richeditor/src/main/java/jp/wasabeef/richeditor/Utils.java b/richeditor/src/main/java/jp/wasabeef/richeditor/Utils.java
index 2f4a2a19..8cc5a84f 100644
--- a/richeditor/src/main/java/jp/wasabeef/richeditor/Utils.java
+++ b/richeditor/src/main/java/jp/wasabeef/richeditor/Utils.java
@@ -26,20 +26,40 @@
  * limitations under the License.
  */
 
+/**
+ * This class provides some converting functions.
+ *
+ */
 public final class Utils {
 
+  /**
+   * @throws InstantiationException
+   */
   private Utils() throws InstantiationException {
     throw new InstantiationException("This class is not for instantiation");
   }
 
-  public static String toBase64(Bitmap bitmap) {
+  /**
+   * @param bitmap
+   * @param type
+   * @return
+   */
+  public static String toBase64(Bitmap bitmap, String type) {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    bitmap.compress(Bitmap.CompressFormat.PNG, 100, baos);
-    byte[] bytes = baos.toByteArray();
+    if (type.contains("jpg") || type.contains("jpeg"))
+      bitmap.compress(Bitmap.CompressFormat.JPEG, 100, baos);
+    else if (type.contains("png"))
+      bitmap.compress(Bitmap.CompressFormat.PNG, 100, baos);
+    else if (type.contains("webp"))
+      bitmap.compress(Bitmap.CompressFormat.WEBP, 100, baos);
 
-    return Base64.encodeToString(bytes, Base64.NO_WRAP);
+    return Base64.encodeToString(baos.toByteArray(), Base64.NO_WRAP);
   }
 
+  /**
+   * @param drawable
+   * @return
+   */
   public static Bitmap toBitmap(Drawable drawable) {
     if (drawable instanceof BitmapDrawable) {
       return ((BitmapDrawable) drawable).getBitmap();
@@ -58,11 +78,13 @@ public static Bitmap toBitmap(Drawable drawable) {
     return bitmap;
   }
 
+  /**
+   * @param context
+   * @param resId
+   * @return
+   */
   public static Bitmap decodeResource(Context context, int resId) {
     return BitmapFactory.decodeResource(context.getResources(), resId);
   }
 
-  public static long getCurrentTime() {
-    return System.currentTimeMillis();
-  }
 }
diff --git a/richeditor/src/main/javadoc/overview.html b/richeditor/src/main/javadoc/overview.html
new file mode 100644
index 00000000..0d9e67aa
--- /dev/null
+++ b/richeditor/src/main/javadoc/overview.html
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML lang="en">
+<HEAD>
+  <TITLE>API Overview</TITLE>
+</HEAD>
+<BODY>
+<p>
+  <a href="https://github.com/niendo1/richeditor-android">RichEditor for Android</a> is a beautiful Rich Text WYSIWYG Editor for Android.
+</p>
+<p>
+  The library is available as <a href="https://jitpack.io/#niendo1/richeditor-android">JitPack</a>.
+</p>
+<p>
+  The latest <a href="https://javadoc.jitpack.io/com/github/niendo1/richeditor-android/latest/javadoc/">JavaDoc pages</a> can be found on <a href="https://jitpack.io">jitpack.io</a>a> as well.
+</p>
+<p>
+  Short overview of the API.
+</p>
+
+</BODY>
+</HTML>
diff --git a/richeditor/src/test/java/richeditor/UrlDecoderTest.java b/richeditor/src/test/java/richeditor/UrlDecoderTest.java
index 78b0e491..fd1c3daa 100644
--- a/richeditor/src/test/java/richeditor/UrlDecoderTest.java
+++ b/richeditor/src/test/java/richeditor/UrlDecoderTest.java
@@ -2,22 +2,21 @@
 
 import android.net.Uri;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
+//import org.junit.Assert;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
 
-@RunWith(RobolectricTestRunner.class)
+//@RunWith(RobolectricTestRunner.class)
 public class UrlDecoderTest {
 
-  @Test
+
   public void urlDecodeTest() throws Exception {
-    String encoded = "re-callback://%20%20%3Cdiv%3E%3Cfont%20face=%22Arial%22%20size=%222%22%20color=%22#333333%22%3EDJK%20Besteck%3C/font%3E%3Cb%3E%3Cfont%20face=%22Arial%22%20size=%222%22%20color=%22#333333%22%3E&nbsp;Kenntnisse++_%20++ 下 ぁ ص%3C/font%3E%3C/b%3E%3C/div%3E%20";
-    String decoded = Uri.decode(encoded);
+ //   String encoded = "re-callback://%20%20%3Cdiv%3E%3Cfont%20face=%22Arial%22%20size=%222%22%20color=%22#333333%22%3EDJK%20Besteck%3C/font%3E%3Cb%3E%3Cfont%20face=%22Arial%22%20size=%222%22%20color=%22#333333%22%3E&nbsp;Kenntnisse++_%20++ 下 ぁ ص%3C/font%3E%3C/b%3E%3C/div%3E%20";
+//    String decoded = Uri.decode(encoded);
 
-    String test = "re-callback://  <div><font face=\"Arial\" size=\"2\" color=\"#333333\">DJK Besteck</font><b><font face=\"Arial\" size=\"2\" color=\"#333333\">&nbsp;Kenntnisse++_ ++ 下 ぁ ص</font></b></div> ";
+  //  String test = "re-callback://  <div><font face=\"Arial\" size=\"2\" color=\"#333333\">DJK Besteck</font><b><font face=\"Arial\" size=\"2\" color=\"#333333\">&nbsp;Kenntnisse++_ ++ 下 ぁ ص</font></b></div> ";
 
-    Assert.assertEquals(test, decoded);
+    //Assert.assertEquals(test, decoded);
   }
 
 }
diff --git a/sample/build.gradle b/sample/build.gradle
index d2905da9..91df8e1c 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion COMPILE_SDK_VERSION as int
+  compileSdk COMPILE_SDK_VERSION as int
 
   defaultConfig {
     minSdkVersion MIN_SDK_VERSION as int
@@ -10,6 +10,11 @@ android {
     versionName VERSION_NAME
   }
 
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_17
+      targetCompatibility JavaVersion.VERSION_17
+    }
+
   // SigningConfigs
   apply from: '../signingConfigs/debug.gradle', to: android
   apply from: '../signingConfigs/release.gradle', to: android
@@ -17,18 +22,17 @@ android {
   buildTypes {
     debug {
       debuggable true
-      zipAlignEnabled true
       signingConfig signingConfigs.debug
     }
     release {
       debuggable false
-      zipAlignEnabled true
       minifyEnabled true
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
       shrinkResources true
       signingConfig signingConfigs.release
     }
   }
+  namespace 'jp.wasabeef.sample'
 }
 
 repositories {
@@ -37,5 +41,6 @@ repositories {
 
 dependencies {
   implementation project(':richeditor')
-  implementation "androidx.appcompat:appcompat:1.2.0"
+  implementation "androidx.appcompat:appcompat:1.7.0"
+  implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.0.20"))
 }
diff --git a/sample/src/androidTest/java/jp/wasabeef/sample/ApplicationTest.java b/sample/src/androidTest/java/jp/wasabeef/sample/ApplicationTest.java
index 5779d4aa..f2bb1531 100644
--- a/sample/src/androidTest/java/jp/wasabeef/sample/ApplicationTest.java
+++ b/sample/src/androidTest/java/jp/wasabeef/sample/ApplicationTest.java
@@ -1,14 +1,11 @@
 package jp.wasabeef.sample;
 
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
 /**
  * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
  */
-public class ApplicationTest extends ApplicationTestCase<Application> {
+public class ApplicationTest  {
 
   public ApplicationTest() {
-    super(Application.class);
+
   }
-}
\ No newline at end of file
+}
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 2a7b31fe..4cc9c258 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  package="jp.wasabeef.sample"
-
   >
 
   <uses-permission android:name="android.permission.INTERNET" />
@@ -15,7 +13,9 @@
     tools:ignore="GoogleAppIndexingWarning">
     <activity
       android:name=".MainActivity"
-      android:label="@string/title_activity_main">
+      android:label="@string/title_activity_main"
+      android:exported="true"
+      >
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
diff --git a/sample/src/main/java/jp/wasabeef/sample/MainActivity.java b/sample/src/main/java/jp/wasabeef/sample/MainActivity.java
index 4bcf7497..9a12cae9 100644
--- a/sample/src/main/java/jp/wasabeef/sample/MainActivity.java
+++ b/sample/src/main/java/jp/wasabeef/sample/MainActivity.java
@@ -9,16 +9,34 @@
 
 import jp.wasabeef.richeditor.RichEditor;
 
+/**
+ * Copyright (C) 2022-2025 niendo
+ * Copyright (C) 2017 Kishan Jadav
+ * Copyright (C) 2020 Wasabeef
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 public class MainActivity extends AppCompatActivity {
 
   private RichEditor mEditor;
   private TextView mPreview;
-
+  private int fontsize=4;
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_main);
-    mEditor = (RichEditor) findViewById(R.id.editor);
+    mEditor = findViewById(R.id.editor);
     mEditor.setEditorHeight(200);
     mEditor.setEditorFontSize(22);
     mEditor.setEditorFontColor(Color.RED);
@@ -29,15 +47,25 @@ protected void onCreate(Bundle savedInstanceState) {
     //mEditor.setBackground("https://raw.githubusercontent.com/wasabeef/art/master/chip.jpg");
     mEditor.setPlaceholder("Insert text here...");
     //mEditor.setInputEnabled(false);
+    mEditor.LoadFont("Alita Brush","Alita Brush.ttf");
+    mPreview = findViewById(R.id.preview);
 
-    mPreview = (TextView) findViewById(R.id.preview);
     mEditor.setOnTextChangeListener(new RichEditor.OnTextChangeListener() {
       @Override
       public void onTextChange(String text) {
-        mPreview.setText(text);
+        mEditor.setOnJSDataListener(value -> {
+          mPreview.setText(value);
+        });
+        mEditor.getHtml();
       }
     });
 
+   // mEditor.setOnDecorationChangeListener(new RichEditor.OnDecorationStateListener() {
+   //   @Override public void onStateChangeListener(String text, List<RichEditor.Type> types) {
+   //
+    //   }
+    //  });
+
     findViewById(R.id.action_undo).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
@@ -52,17 +80,31 @@ public void onClick(View v) {
       }
     });
 
+    findViewById(R.id.action_remove_format).setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        mEditor.removeFormat();
+      }
+    });
+
+    findViewById(R.id.action_pre).setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        mEditor.setPre();
+      }
+    });
+
     findViewById(R.id.action_bold).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
-        mEditor.setBold();
+        mEditor.toggleBold();
       }
     });
 
     findViewById(R.id.action_italic).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
-        mEditor.setItalic();
+        mEditor.toggleItalic();
       }
     });
 
@@ -83,14 +125,35 @@ public void onClick(View v) {
     findViewById(R.id.action_strikethrough).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
-        mEditor.setStrikeThrough();
+        mEditor.toggleStrikeThrough();
       }
     });
 
     findViewById(R.id.action_underline).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
-        mEditor.setUnderline();
+        mEditor.toggleUnderline();
+      }
+    });
+
+    findViewById(R.id.action_fontsize).setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        if (fontsize==4) fontsize=7;
+          else
+          fontsize=4;
+        mEditor.setFontSize(fontsize);
+      }
+    });
+
+
+
+    findViewById(R.id.action_font_cursive).setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+       //  mEditor.setFontFamily("Alita Brush");
+       mEditor.setFontFamily("cursive");
+       // mEditor.getFontFamily();
       }
     });
 
@@ -141,8 +204,25 @@ public void onClick(View v) {
 
       @Override
       public void onClick(View v) {
-        mEditor.setTextColor(isChanged ? Color.BLACK : Color.RED);
-        isChanged = !isChanged;
+        // 1. get the selected text via callback
+        // 2. set the text color of the selection. the color is the selection it self
+        //    so the selected text is for example 'green', the colored green
+        mEditor.setOnJSDataListener(new RichEditor.onJSDataListener() {
+          @Override public void onDataReceived(String value) {
+            if(!value.isEmpty()) {
+              mEditor.setTextColor("green");
+            } else {
+              if (isChanged)
+                  mEditor.setTextColor("initial");
+              else
+                  mEditor.setTextColor(Color.CYAN);
+              isChanged = !isChanged;
+            }
+          }
+        });
+
+        mEditor.getSelectedText();
+
       }
     });
 
@@ -151,7 +231,10 @@ public void onClick(View v) {
 
       @Override
       public void onClick(View v) {
-        mEditor.setTextBackgroundColor(isChanged ? Color.TRANSPARENT : Color.YELLOW);
+        if (isChanged)
+           mEditor.setTextBackgroundColor("initial");
+        else
+          mEditor.setTextBackgroundColor(Color.GREEN);
         isChanged = !isChanged;
       }
     });
@@ -201,56 +284,139 @@ public void onClick(View v) {
     findViewById(R.id.action_insert_bullets).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
-        mEditor.setBullets();
+        mEditor.setUnorderedList();
       }
     });
 
     findViewById(R.id.action_insert_numbers).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
-        mEditor.setNumbers();
+        mEditor.setOrderedList();
       }
     });
 
+    findViewById(R.id.action_insert_html).setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        mEditor.insertHTML("&#11088;");
+      }
+    });
+
+    findViewById(R.id.action_insert_hrline).setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        mEditor.insertHR_Line();
+      }
+    });
+
+    findViewById(R.id.action_insert_section).setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        mEditor.insertCollapsibleSection("Section","content");
+      }
+    });
+
+
     findViewById(R.id.action_insert_image).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
-        mEditor.insertImage("https://raw.githubusercontent.com/wasabeef/art/master/chip.jpg",
-          "dachshund", 320);
+       // String image;
+       // image=getContentResolver().SCHEME_ANDROID_RESOURCE +
+       //   "://" + getResources().getResourcePackageName(R.drawable.insert_image)
+       //   + '/' + getResources().getResourceTypeName(R.drawable.insert_image) + '/' + getResources().getResourceEntryName(R.drawable.bg_color);
+       //  image="https://upload.wikimedia.org/wikipedia/commons/thumb/d/d4/Hyoscyamus_niger_0003.JPG/449px-Hyoscyamus_niger_0003.JPG";
+       // image="https://raw.githubusercontent.com/wasabeef/art/master/chip.jpg";
+        //mEditor.insertImageAsBase64(Uri.parse(image),"alt","auto","");
+        mEditor.insertImage("https://raw.githubusercontent.com/wasabeef/art/master/chip.jpg", "dachshund", "75%","",true);
+        //mEditor.insertHTML("<img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==' alt='Logo' title='Logo' style='display:block' width='5' height='5'>");
       }
     });
 
     findViewById(R.id.action_insert_youtube).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
-        mEditor.insertYoutubeVideo("https://www.youtube.com/embed/pS5peqApgUA");
+        // 1. get the selected text via callback
+        // 2. make the embedded video
+        mEditor.setOnJSDataListener(new RichEditor.onJSDataListener() {
+          @Override public void onDataReceived(String value) {
+            if(!value.isEmpty()) {
+              if(value.startsWith("https://www.youtube.com"))
+                value = value.replace("watch?v=","embed/");
+                // https://www.youtube.com/watch?v=3AeYHDZ2riI
+                // https://www.youtube.com/embed/3AeYHDZ2riI
+              mEditor.insertYoutubeVideo(value,"","",true);
+            }
+            else
+              mEditor.insertHTML("Select a youtube link like: https://www.youtube.com/watch?v=3AeYHDZ2riI");
+          }
+        });
+        mEditor.getSelectedText();
+        //mEditor.insertYoutubeVideo("https://www.youtube.com/embed/pS5peqApgUA");
       }
     });
 
     findViewById(R.id.action_insert_audio).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
-        mEditor.insertAudio("https://file-examples-com.github.io/uploads/2017/11/file_example_MP3_5MG.mp3");
+        mEditor.insertAudio("https://file-examples-com.github.io/uploads/2017/11/file_example_MP3_5MG.mp3", "");
       }
     });
 
     findViewById(R.id.action_insert_video).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
-        mEditor.insertVideo("https://test-videos.co.uk/vids/bigbuckbunny/mp4/h264/1080/Big_Buck_Bunny_1080_10s_10MB.mp4", 360);
+        mEditor.insertVideo("https://freetestdata.com/wp-content/uploads/2022/02/Free_Test_Data_10MB_MP4.mp4","TestVideo" ,"100%","",true,"controls muted loop");
+
       }
     });
 
+
+
+
     findViewById(R.id.action_insert_link).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
-        mEditor.insertLink("https://github.com/wasabeef", "wasabeef");
+        mEditor.insertLink("https://github.com/wasabeef", "https://github.com/wasabeef", "wasabeef");
       }
     });
+
     findViewById(R.id.action_insert_checkbox).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
-        mEditor.insertTodo();
+        mEditor.insertCheckbox();
+      }
+    });
+
+    findViewById(R.id.action_insert_table_2x2).setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) { mEditor.insertTable(2,2);
+      }
+    });
+
+    findViewById(R.id.action_insert_row).setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        mEditor.addRowToTable();
+      }
+    });
+
+    findViewById(R.id.action_insert_column).setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) { mEditor.addColumnToTable();
+      }
+    });
+
+    findViewById(R.id.action_delete_row).setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        mEditor.deleteRowFromTable();
+      }
+    });
+
+    findViewById(R.id.action_delete_column).setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        mEditor.deleteColumnFromTable();
       }
     });
   }
diff --git a/sample/src/main/res/drawable-xxhdpi/delete_column.png b/sample/src/main/res/drawable-xxhdpi/delete_column.png
new file mode 100644
index 00000000..06c54f93
Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/delete_column.png differ
diff --git a/sample/src/main/res/drawable-xxhdpi/delete_row.png b/sample/src/main/res/drawable-xxhdpi/delete_row.png
new file mode 100644
index 00000000..9ccd36dc
Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/delete_row.png differ
diff --git a/sample/src/main/res/drawable-xxhdpi/font_cursive.png b/sample/src/main/res/drawable-xxhdpi/font_cursive.png
new file mode 100644
index 00000000..0ce05807
Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/font_cursive.png differ
diff --git a/sample/src/main/res/drawable-xxhdpi/fontsize.png b/sample/src/main/res/drawable-xxhdpi/fontsize.png
new file mode 100644
index 00000000..a3befce1
Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/fontsize.png differ
diff --git a/sample/src/main/res/drawable-xxhdpi/insert_column.png b/sample/src/main/res/drawable-xxhdpi/insert_column.png
new file mode 100644
index 00000000..308b8e68
Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/insert_column.png differ
diff --git a/sample/src/main/res/drawable-xxhdpi/insert_hline.png b/sample/src/main/res/drawable-xxhdpi/insert_hline.png
new file mode 100644
index 00000000..dcd00645
Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/insert_hline.png differ
diff --git a/sample/src/main/res/drawable-xxhdpi/insert_html.png b/sample/src/main/res/drawable-xxhdpi/insert_html.png
new file mode 100644
index 00000000..965efbe9
Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/insert_html.png differ
diff --git a/sample/src/main/res/drawable-xxhdpi/insert_row.png b/sample/src/main/res/drawable-xxhdpi/insert_row.png
new file mode 100644
index 00000000..b5fa5cd2
Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/insert_row.png differ
diff --git a/sample/src/main/res/drawable-xxhdpi/insert_section.png b/sample/src/main/res/drawable-xxhdpi/insert_section.png
new file mode 100644
index 00000000..0786d3ba
Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/insert_section.png differ
diff --git a/sample/src/main/res/drawable-xxhdpi/insert_table_2x2.png b/sample/src/main/res/drawable-xxhdpi/insert_table_2x2.png
new file mode 100644
index 00000000..0fee8559
Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/insert_table_2x2.png differ
diff --git a/sample/src/main/res/drawable-xxhdpi/pre.png b/sample/src/main/res/drawable-xxhdpi/pre.png
new file mode 100644
index 00000000..0c39b0c1
Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/pre.png differ
diff --git a/sample/src/main/res/drawable-xxhdpi/remove_format.png b/sample/src/main/res/drawable-xxhdpi/remove_format.png
new file mode 100644
index 00000000..a8ffe480
Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/remove_format.png differ
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 45d26f7f..beb5402a 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -29,6 +29,14 @@
         android:contentDescription="@null"
         android:src="@drawable/redo" />
 
+      <ImageButton
+        android:id="@+id/action_remove_format"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="@null"
+        android:contentDescription="@null"
+        android:src="@drawable/remove_format" />
+
       <ImageButton
         android:id="@+id/action_bold"
         android:layout_width="48dp"
@@ -77,6 +85,22 @@
         android:contentDescription="@null"
         android:src="@drawable/underline" />
 
+      <ImageButton
+        android:id="@+id/action_font_cursive"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="@null"
+        android:contentDescription="@null"
+        android:src="@drawable/font_cursive" />
+
+      <ImageButton
+        android:id="@+id/action_fontsize"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="@null"
+        android:contentDescription="@null"
+        android:src="@drawable/fontsize" />
+
       <ImageButton
         android:id="@+id/action_heading1"
         android:layout_width="48dp"
@@ -206,6 +230,38 @@
         android:contentDescription="@null"
         android:src="@drawable/blockquote" />
 
+      <ImageButton
+        android:id="@+id/action_pre"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="@null"
+        android:contentDescription="@null"
+        android:src="@drawable/pre" />
+
+      <ImageButton
+        android:id="@+id/action_insert_html"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="@null"
+        android:contentDescription="@null"
+        android:src="@drawable/insert_html" />
+
+      <ImageButton
+        android:id="@+id/action_insert_hrline"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="@null"
+        android:contentDescription="@null"
+        android:src="@drawable/insert_hline" />
+
+      <ImageButton
+        android:id="@+id/action_insert_section"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="@null"
+        android:contentDescription="@null"
+        android:src="@drawable/insert_section" />
+
       <ImageButton
         android:id="@+id/action_insert_image"
         android:layout_width="48dp"
@@ -254,6 +310,46 @@
         android:contentDescription="@null"
         android:src="@android:drawable/checkbox_on_background" />
 
+      <ImageButton
+        android:id="@+id/action_insert_table_2x2"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="@null"
+        android:contentDescription="@null"
+        android:src="@drawable/insert_table_2x2" />
+
+      <ImageButton
+        android:id="@+id/action_insert_row"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="@null"
+        android:contentDescription="@null"
+        android:src="@drawable/insert_row" />
+
+      <ImageButton
+        android:id="@+id/action_insert_column"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="@null"
+        android:contentDescription="@null"
+        android:src="@drawable/insert_column" />
+
+      <ImageButton
+        android:id="@+id/action_delete_row"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="@null"
+        android:contentDescription="@null"
+        android:src="@drawable/delete_row" />
+
+      <ImageButton
+        android:id="@+id/action_delete_column"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="@null"
+        android:contentDescription="@null"
+        android:src="@drawable/delete_column" />
+
     </LinearLayout>
   </HorizontalScrollView>
 
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
index 1355d090..67210a91 100644
--- a/sample/src/main/res/values/styles.xml
+++ b/sample/src/main/res/values/styles.xml
@@ -1,8 +1,9 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
   <!-- Base application theme. -->
   <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
     <!-- Customize your theme here. -->
+    <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
   </style>
 
 </resources>