diff --git a/CMakeLists.txt b/CMakeLists.txt
index b62d4d2132..175e716b45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,7 +241,7 @@ endif (NOT JPEG_FOUND)
 
 if (NOT MSVC AND NOT CR3_FREETYPE)
 FIND_PACKAGE(Freetype 2.10.0)
-FIND_PACKAGE(HarfBuzz)
+FIND_PACKAGE(HarfBuzz 2.6.0)
 endif (NOT MSVC AND NOT CR3_FREETYPE)
 
 ADD_SUBDIRECTORY(thirdparty_unman/qimagescale)
@@ -249,14 +249,19 @@ ADD_SUBDIRECTORY(thirdparty_unman/qimagescale)
 if (NOT FREETYPE_FOUND)
   message("System FREETYPE not found, will build local one\n")
   if (NOT HarfBuzz_FOUND)
-	SET(HARFBUZZ_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE)
-	SET(HARFBUZZ_LIBRARIES harfbuzz)
+    SET(HarfBuzz_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE)
+    SET(HarfBuzz_INCLUDE_DIRS ${HarfBuzz_INCLUDE_DIR} CACHE PATH "" FORCE)
+    SET(HarfBuzz_LIBRARIES harfbuzz CACHE PATH "" FORCE)
+    SET(HARFBUZZ_INCLUDE_DIR ${HarfBuzz_INCLUDE_DIR} CACHE PATH "" FORCE)
+    SET(HARFBUZZ_INCLUDE_DIRS ${HarfBuzz_INCLUDE_DIRS} CACHE PATH "" FORCE)
+    SET(HARFBUZZ_LIBRARIES ${HarfBuzz_LIBRARIES} CACHE PATH "" FORCE)
   endif (NOT HarfBuzz_FOUND)
   SET(FT_WITH_ZLIB ON CACHE BOOL "Use system zlib instead of internal library." FORCE)
   SET(FT_WITH_PNG ON CACHE BOOL "Support PNG compressed OpenType embedded bitmaps." FORCE)
   SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
   SET(PNG_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE PATH "" FORCE)
   SET(PNG_LIBRARY ${PNG_LIBRARIES})
+  SET(SKIP_INSTALL_ALL ON CACHE BOOL "Don't install anything" FORCE)
   ADD_SUBDIRECTORY(thirdparty/${REPO_FREETYPE_SRCDIR})
   SET(FREETYPE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_FREETYPE_SRCDIR}/include CACHE PATH "" FORCE)
   SET(FREETYPE_LIBRARIES freetype)
@@ -267,13 +272,14 @@ if (NOT HarfBuzz_FOUND)
   SET(HB_HAVE_FREETYPE ON CACHE BOOL "Enable freetype interop helpers" FORCE)
   SET(HB_BUILD_TESTS OFF CACHE BOOL "Build harfbuzz tests" FORCE)
   SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES})
+  SET(SKIP_INSTALL_ALL ON CACHE BOOL "Don't install anything" FORCE)
   ADD_SUBDIRECTORY(thirdparty/${REPO_HARFBUZZ_SRCDIR})
-  SET(HARFBUZZ_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE)
-  SET(HARFBUZZ_LIBRARY harfbuzz)
+  SET(HarfBuzz_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE)
+  SET(HarfBuzz_LIBRARY harfbuzz)
 endif (NOT HarfBuzz_FOUND)
 
 if (NOT MSVC)
-	find_package(FontConfig)
+	find_package(FontConfig 2.11.0)
 endif(NOT MSVC)
 
 if (FONTCONFIG_FOUND)
@@ -283,7 +289,7 @@ else()
 endif (FONTCONFIG_FOUND)
 
 if (NOT MSVC)
-find_package(FriBidi)
+find_package(FriBidi 1.0.0)
 if (NOT FRIBIDI_FOUND)
   message("System FriBidi not found, will build local one\n")
   ADD_SUBDIRECTORY(thirdparty/${REPO_FRIBIDI_SRCDIR})
@@ -295,7 +301,7 @@ endif(NOT MSVC)
 
 
 if (NOT MSVC)
-	find_package(libunibreak)
+	find_package(libunibreak 4.0)
 endif(NOT MSVC)
 
 if (NOT LIBUNIBREAK_FOUND)
@@ -305,7 +311,7 @@ if (NOT LIBUNIBREAK_FOUND)
   SET(LIBUNIBREAK_LIBRARIES unibreak)
 endif (NOT LIBUNIBREAK_FOUND)
 
-find_package(ZSTD)
+find_package(ZSTD 1.4.0)
 if (NOT ZSTD_FOUND)
     message("\nSystem zstd not found, will build local one\n")
     set(ZSTD_LEGACY_SUPPORT OFF CACHE BOOL "LEGACY SUPPORT" FORCE)
@@ -355,7 +361,7 @@ INCLUDE_DIRECTORIES(
   ${JPEG_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
   ${FREETYPE_INCLUDE_DIRS}
-  ${HARFBUZZ_INCLUDE_DIRS}
+  ${HarfBuzz_INCLUDE_DIRS}
   ${ANTIWORD_INCLUDE_DIR}
   ${CHM_INCLUDE_DIR}
   ${FRIBIDI_INCLUDE_DIR}
@@ -371,7 +377,7 @@ else()
 SET(STD_LIBS
   ${JPEG_LIBRARIES}
   ${FREETYPE_LIBRARIES}
-  ${HARFBUZZ_LIBRARY}
+  ${HarfBuzz_LIBRARY}
   ${PNG_LIBRARIES}
   ${ZLIB_LIBRARIES}
   ${CHM_LIBRARIES}
diff --git a/android/.idea/codeStyles/Project.xml b/android/.idea/codeStyles/Project.xml
index 5781ead325..8dbe5e3026 100644
--- a/android/.idea/codeStyles/Project.xml
+++ b/android/.idea/codeStyles/Project.xml
@@ -1,5 +1,23 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" 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>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />
diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml
new file mode 100644
index 0000000000..fb7f4a8a46
--- /dev/null
+++ b/android/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
index 4b3431da59..3a2e8ac718 100644
--- a/android/.idea/gradle.xml
+++ b/android/.idea/gradle.xml
@@ -4,10 +4,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="false" />
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -17,7 +17,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/android/.idea/runConfigurations.xml b/android/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460d8b..0000000000
--- a/android/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt
index 9d41e596af..810e52b74d 100644
--- a/android/app/CMakeLists.txt
+++ b/android/app/CMakeLists.txt
@@ -29,7 +29,7 @@ include_directories(${CR3_ROOT}/thirdparty/${REPO_LIBUNIBREAK_SRCDIR}/src)
 include_directories(${CR3_ROOT}/thirdparty/${REPO_ZSTD_SRCDIR}/lib)
 include_directories(${CR3_ROOT}/thirdparty/${REPO_UTF8PROC_SRCDIR})
 
-add_definitions(-DLINUX=1 -D_LINUX=1 -DFOR_ANDROID=1 -DCR3_PATCH)
+add_definitions(-DLINUX=1 -D_LINUX=1)
 add_definitions(-DFT_CONFIG_MODULES_H=<android/config/ftmodule.h> -DFT_CONFIG_OPTIONS_H=<android/config/ftoption.h>)
 add_definitions(-DDOC_DATA_COMPRESSION_LEVEL=1 -DDOC_BUFFER_SIZE=0x1000000)
 add_definitions(-DENABLE_CACHE_FILE_CONTENTS_VALIDATION=1)
@@ -39,7 +39,7 @@ add_definitions(-DLVLONG_FILE_SUPPORT=1)
 add_definitions(-DMAX_IMAGE_SCALE_MUL=2)
 add_definitions(-DUSE_NANOSVG=1)
 add_definitions(-DBUNDLED_FRIBIDI=1)
-add_definitions(-DKO_LIBUNIBREAK_PATCH=1)       # patch "add_lb_get_char_class.patch" for libunibreak from koreader
+add_definitions(-DKO_LIBUNIBREAK_PATCH=1)       # libunibreak patched with "add_lb_get_char_class.patch" file from koreader
 add_definitions(-DUSE_UTF8PROC=1)
 
 #set(LOCAL_CFLAGS "-Wno-psabi -Wno-unused-variable -Wno-sign-compare -Wno-write-strings -Wno-main -Wno-unused-but-set-variable -Wno-unused-function -Wall")
diff --git a/android/app/build.gradle b/android/app/build.gradle
index aadae5b402..59fd4ab641 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -24,7 +24,6 @@ android {
             aidl.srcDirs = ['../../android/src']
             java.srcDirs = ['../../android/src']
             res.srcDirs = ['../../android/res']
-            jni.srcDirs = ['../../android/jni']
         }
     }
     buildTypes {
diff --git a/android/build.gradle b/android/build.gradle
index a67ea57f1d..755874a723 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,10 +4,10 @@ buildscript {
     
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:7.0.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -16,7 +16,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/android/eink-onyx-reflections/build.gradle b/android/eink-onyx-reflections/build.gradle
index e6cbd59c68..073e6ab876 100644
--- a/android/eink-onyx-reflections/build.gradle
+++ b/android/eink-onyx-reflections/build.gradle
@@ -9,8 +9,6 @@ android {
     defaultConfig {
         minSdkVersion 3
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
 
         consumerProguardFiles "consumer-rules.pro"
     }
diff --git a/android/eink-onyx-reflections/src/main/java/org/eink_onyx_reflections/OnyxDevice.java b/android/eink-onyx-reflections/src/main/java/org/eink_onyx_reflections/OnyxDevice.java
index 0826fda752..37db84e1b8 100644
--- a/android/eink-onyx-reflections/src/main/java/org/eink_onyx_reflections/OnyxDevice.java
+++ b/android/eink-onyx-reflections/src/main/java/org/eink_onyx_reflections/OnyxDevice.java
@@ -52,7 +52,7 @@ private static String getBoardPlatform() {
 	private static void bootstrap() {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
 			try {
-				// Allow Private API on Android 10 (API 28)
+				// Allow Private API on Android 10 (API 29)
 				Class<?> aClass = Class.class;
 				Method methodForName = aClass.getDeclaredMethod("forName", String.class);
 				Method methodGetDeclaredMethod = aClass.getDeclaredMethod("getDeclaredMethod", String.class, Class[].class);
diff --git a/android/genrescollection/build.gradle b/android/genrescollection/build.gradle
index 5263642bfe..bfd1daf313 100644
--- a/android/genrescollection/build.gradle
+++ b/android/genrescollection/build.gradle
@@ -9,8 +9,6 @@ android {
     defaultConfig {
         minSdkVersion 3
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
 
         consumerProguardFiles "consumer-rules.pro"
     }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index baed342c08..ee628ac404 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 53a5e93c1f..a47a87dd9f 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -5,9 +5,9 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE    := cr3engine-3-2-X
 
-# Generate CREngine blob with statically linked libjpeg, libpng, freetype, harfbuzz, fribidi, libunibreak, chmlib
+# Generate CREngine blob with statically linked libjpeg, libpng, freetype, harfbuzz, fribidi, libunibreak, zstd, utf8proc, antiword, chmlib
 
-CRFLAGS := -DLINUX=1 -D_LINUX=1 -DFOR_ANDROID=1 -DCR3_PATCH \
+CRFLAGS := -DLINUX=1 -D_LINUX=1 \
      -DFT2_BUILD_LIBRARY=1 -DFT_CONFIG_MODULES_H=\<android/config/ftmodule.h\> -DFT_CONFIG_OPTIONS_H=\<android/config/ftoption.h\> \
      -DDOC_DATA_COMPRESSION_LEVEL=1 -DDOC_BUFFER_SIZE=0x1000000 \
      -DENABLE_CACHE_FILE_CONTENTS_VALIDATION=1 \
diff --git a/android/jni/cr3engine.cpp b/android/jni/cr3engine.cpp
index 3000d24a3b..674b14170b 100644
--- a/android/jni/cr3engine.cpp
+++ b/android/jni/cr3engine.cpp
@@ -404,6 +404,295 @@ static bool GetBookProperties(const char *name,  BookProperties * pBookProps)
     return true;
 }
 
+class JNICDRLogger : public CRLog {
+public:
+    JNICDRLogger() {
+        curr_level = CRLog::LL_DEBUG;
+    }
+
+protected:
+
+    virtual void log(const char *lvl, const char *msg, va_list args) {
+#define MAX_LOG_MSG_SIZE 1024
+        static char buffer[MAX_LOG_MSG_SIZE + 1];
+        vsnprintf(buffer, MAX_LOG_MSG_SIZE, msg, args);
+        int level = ANDROID_LOG_DEBUG;
+        //LOGD("CRLog::log is called with LEVEL %s, pattern %s", lvl, msg);
+        if (!strcmp(lvl, "FATAL"))
+            level = ANDROID_LOG_FATAL;
+        else if (!strcmp(lvl, "ERROR"))
+            level = ANDROID_LOG_ERROR;
+        else if (!strcmp(lvl, "WARN"))
+            level = ANDROID_LOG_WARN;
+        else if (!strcmp(lvl, "INFO"))
+            level = ANDROID_LOG_INFO;
+        else if (!strcmp(lvl, "DEBUG"))
+            level = ANDROID_LOG_DEBUG;
+        else if (!strcmp(lvl, "TRACE"))
+            level = ANDROID_LOG_VERBOSE;
+        __android_log_write(level, LOG_TAG, buffer);
+    }
+};
+
+void cr3androidFatalErrorHandler(int errorCode, const char *errorText) {
+    LOGE("CoolReader Fatal Error #%d: %s", errorCode, errorText);
+    LOGASSERTFAILED("CoolReader Fatal Error", "CoolReader Fatal Error #%d: %s", errorCode,
+                    errorText);
+    //static char str[1001];
+    //snprintf(str, 1000, "CoolReader Fatal Error #%d: %s", errorCode, errorText);
+    //LOGE("CoolReader Fatal Error #%d: %s", errorCode, errorText);
+    //LOGASSERTFAILED(errorText, "CoolReader Fatal Error #%d: %s", errorCode, errorText);
+}
+
+jboolean initInternal(JNIEnv *penv, jclass obj, jobjectArray fontArray, jint sdk_int) {
+
+    CRJNIEnv::sdk_int = sdk_int;
+
+    CRJNIEnv env(penv);
+
+    // to catch crashes and remove current cache file on crash (SIGSEGV etc.)
+    crSetSignalHandler();
+
+    LOGI("initInternal called");
+    // set fatal error handler
+    crSetFatalErrorHandler(&cr3androidFatalErrorHandler);
+    LOGD("Redirecting CDRLog to Android");
+    CRLog::setLogger(new JNICDRLogger());
+    CRLog::setLogLevel(CRLog::LL_TRACE);
+    CRLog::info("CREngine log redirected");
+    CRLog::info("CRENGINE version %s %s", CR_ENGINE_VERSION, CR_ENGINE_BUILD_DATE);
+
+    CRLog::info("initializing hyphenation manager");
+    HyphMan::initDictionaries(lString32::empty_str); //don't look for dictionaries
+    HyphMan::activateDictionary(lString32(HYPH_DICT_ID_NONE));
+    CRLog::info("creating font manager");
+    InitFontManager(lString8::empty_str);
+    CRLog::debug("converting fonts array: %d items", (int) env->GetArrayLength(fontArray));
+    lString32Collection fonts;
+    env.fromJavaStringArray(fontArray, fonts);
+    int len = fonts.length();
+    CRLog::debug("registering fonts: %d fonts in list", len);
+    for (int i = 0; i < len; i++) {
+        lString8 fontName = UnicodeToUtf8(fonts[i]);
+        CRLog::debug("registering font %s", fontName.c_str());
+        if (!fontMan->RegisterFont(fontName))
+            CRLog::error("cannot load font %s", fontName.c_str());
+    }
+    CRLog::info("%d fonts registered", fontMan->GetFontCount());
+    return fontMan->GetFontCount() ? JNI_TRUE : JNI_FALSE;
+}
+
+void drawBookCoverInternal(JNIEnv * _env, jclass _engine, jobject bitmap, jbyteArray _data, jboolean respectAspectRatio, jstring _fontFace, jstring _title, jstring _authors, jstring _seriesName, jint seriesNumber, jint bpp)
+{
+    CRJNIEnv env(_env);
+    CRLog::debug("drawBookCoverInternal called");
+    lString8 fontFace = UnicodeToUtf8(env.fromJavaString(_fontFace));
+    lString32 title = env.fromJavaString(_title);
+    lString32 authors = env.fromJavaString(_authors);
+    lString32 seriesName = env.fromJavaString(_seriesName);
+    LVStreamRef stream;
+    LVDrawBuf * drawbuf = BitmapAccessorInterface::getInstance()->lock(_env, bitmap);
+    if (drawbuf != NULL) {
+        LVImageSourceRef image;
+        if (_data != NULL && _env->GetArrayLength(_data) > 0) {
+            CRLog::debug("drawBookCoverInternal : cover image from array");
+            stream = env.jbyteArrayToStream(_data);
+            if (!stream.isNull())
+                image = LVCreateStreamImageSource(stream);
+        }
+
+        int factor = 1;
+        int dx = drawbuf->GetWidth();
+        int dy = drawbuf->GetHeight();
+        int MIN_WIDTH = 300;
+        int MIN_HEIGHT = 400;
+        if (dx < MIN_WIDTH || dy < MIN_HEIGHT) {
+            if (dx * 2 < MIN_WIDTH || dy * 2 < MIN_HEIGHT) {
+                dx *= 3;
+                dy *= 3;
+                factor = 3;
+            } else {
+                dx *= 2;
+                dy *= 2;
+                factor = 2;
+            }
+        }
+        LVDrawBuf * drawbuf2 = drawbuf;
+        if (factor > 1)
+            drawbuf2 = new LVColorDrawBuf(dx, dy, drawbuf->GetBitsPerPixel());
+
+        if (bpp >= 16) {
+            // native color resolution
+            CRLog::debug("drawBookCoverInternal : calling LVDrawBookCover");
+            LVDrawBookCover(*drawbuf2, image, respectAspectRatio, fontFace, title, authors, seriesName, seriesNumber);
+            image.Clear();
+        } else {
+            LVGrayDrawBuf grayBuf(drawbuf2->GetWidth(), drawbuf2->GetHeight(), bpp);
+            LVDrawBookCover(grayBuf, image, respectAspectRatio, fontFace, title, authors, seriesName, seriesNumber);
+            image.Clear();
+            grayBuf.DrawTo(drawbuf2, 0, 0, 0, NULL);
+        }
+
+        if (factor > 1) {
+            CRLog::debug("drawBookCoverInternal : rescaling");
+            drawbuf->DrawRescaled(drawbuf2, 0, 0, drawbuf->GetWidth(), drawbuf->GetHeight(), 0);
+            delete drawbuf2;
+        }
+
+        //CRLog::trace("getPageImageInternal calling bitmap->unlock");
+        BitmapAccessorInterface::getInstance()->unlock(_env, bitmap, drawbuf);
+    } else {
+        CRLog::error("bitmap accessor is invalid");
+    }
+    CRLog::debug("drawBookCoverInternal finished");
+}
+
+jbyteArray scanBookCoverInternal(JNIEnv *_env, jclass _class, jstring _path) {
+    CRJNIEnv env(_env);
+    lString32 path = env.fromJavaString(_path);
+    CRLog::debug("scanBookCoverInternal(%s) called", LCSTR(path));
+    lString32 arcname, item;
+    LVStreamRef res;
+    jbyteArray array = NULL;
+    LVContainerRef arc;
+    if (!LVSplitArcName(path, arcname, item)) {
+        // not in archive
+        LVStreamRef stream = LVOpenFileStream(path.c_str(), LVOM_READ);
+        if (!stream.isNull()) {
+            arc = LVOpenArchieve(stream);
+            if (!arc.isNull()) {
+                // ZIP-based format
+                if (DetectEpubFormat(stream)) {
+                    // EPUB
+                    // extract coverpage from epub
+                    res = GetEpubCoverpage(arc);
+                }
+            } else {
+                res = GetFB2Coverpage(stream);
+                if (res.isNull()) {
+                    doc_format_t fmt;
+                    if (DetectPDBFormat(stream, fmt)) {
+                        res = GetPDBCoverpage(stream);
+                    }
+                }
+            }
+        }
+    } else {
+        CRLog::debug("scanBookCoverInternal() : is archive, item=%s, arc=%s", LCSTR(item),
+                     LCSTR(arcname));
+        LVStreamRef arcstream = LVOpenFileStream(arcname.c_str(), LVOM_READ);
+        if (!arcstream.isNull()) {
+            arc = LVOpenArchieve(arcstream);
+            if (!arc.isNull()) {
+                LVStreamRef stream = arc->OpenStream(item.c_str(), LVOM_READ);
+                if (!stream.isNull()) {
+                    CRLog::debug("scanBookCoverInternal() : archive stream opened ok, parsing");
+                    res = GetFB2Coverpage(stream);
+                    if (res.isNull()) {
+                        doc_format_t fmt;
+                        if (DetectPDBFormat(stream, fmt)) {
+                            res = GetPDBCoverpage(stream);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    if (!res.isNull())
+        array = env.streamToJByteArray(res);
+    if (array != NULL)
+        CRLog::debug("scanBookCoverInternal() : returned cover page array");
+    else
+        CRLog::debug("scanBookCoverInternal() : cover page data not found");
+    return array;
+}
+
+class HyphDataLoaderProxy : public HyphDataLoader {
+    JavaVM *mJavaVM;
+public:
+    HyphDataLoaderProxy(JavaVM *jvm) :
+            HyphDataLoader(), mJavaVM(jvm) {
+    }
+
+    virtual ~HyphDataLoaderProxy() {}
+
+    virtual LVStreamRef loadData(lString32 id) {
+        JNIEnv *penv = NULL;
+        bool attached = false;
+        mJavaVM->GetEnv((void **) &penv, JNI_VERSION_1_6);
+        if (NULL == penv) {
+            // caller thread is not attached yet
+            mJavaVM->AttachCurrentThread(&penv, NULL);
+            attached = true;
+        }
+        LVStreamRef stream = LVStreamRef();
+        jclass pjcEngine = penv->FindClass("org/coolreader/crengine/Engine");
+        if (NULL == pjcEngine)
+            return stream;
+        jmethodID pjmEngine_loadHyphDictData = penv->GetStaticMethodID(pjcEngine,
+                                                                       "loadHyphDictData",
+                                                                       "(Ljava/lang/String;)[B");
+        if (NULL == pjmEngine_loadHyphDictData)
+            return stream;
+        CRJNIEnv env(penv);
+        jstring jid = env.toJavaString(id);
+        jbyteArray data = static_cast<jbyteArray>(penv->CallStaticObjectMethod(pjcEngine,
+                                                                               pjmEngine_loadHyphDictData,
+                                                                               jid));
+        stream = env.jbyteArrayToStream(data);
+        if (attached)
+            mJavaVM->DetachCurrentThread();
+        return stream;
+    }
+};
+
+jboolean initDictionaries(JNIEnv *penv, jclass clazz, jobjectArray dictArray) {
+    jclass pjcHyphDict = penv->FindClass("org/coolreader/crengine/Engine$HyphDict");
+    if (NULL == pjcHyphDict)
+        return JNI_FALSE;
+    jfieldID pjfHyphDict_type = penv->GetFieldID(pjcHyphDict, "type", "I");
+    if (NULL == pjfHyphDict_type)
+        return JNI_FALSE;
+    jfieldID pjfHyphDict_code = penv->GetFieldID(pjcHyphDict, "code", "Ljava/lang/String;");
+    if (NULL == pjfHyphDict_code)
+        return JNI_FALSE;
+
+    int len = penv->GetArrayLength(dictArray);
+    HyphDictionary *dict;
+    CRJNIEnv env(penv);
+    HyphDictType dict_type;
+    for (int i = 0; i < len; i++) {
+        jobject obj = penv->GetObjectArrayElement(dictArray, i);
+        int type = penv->GetIntField(obj, pjfHyphDict_type);
+        jstring code = static_cast<jstring>(penv->GetObjectField(obj, pjfHyphDict_code));
+        switch (type) {     // convert org/coolreader/crengine/Engine$HyphDict$type into HyphDictType
+            case 0:         // org/coolreader/crengine/Engine$HYPH_NONE
+                dict_type = HDT_NONE;
+                break;
+            case 1:         // org/coolreader/crengine/Engine$HYPH_ALGO
+                dict_type = HDT_ALGORITHM;
+                break;
+            case 2:         // org/coolreader/crengine/Engine$HYPH_DICT
+                dict_type = HDT_DICT_TEX;
+                break;
+            default:
+                dict_type = HDT_NONE;
+                break;
+        }
+        lString32 dict_code = env.fromJavaString(code);
+        dict = new HyphDictionary(dict_type, dict_code, dict_code, dict_code);
+        if (!HyphMan::addDictionaryItem(dict))
+            delete dict;
+    }
+    JavaVM *jvm;
+    env->GetJavaVM(&jvm);
+    HyphMan::setDataLoader(new HyphDataLoaderProxy(jvm));
+    return JNI_TRUE;
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
  * Class:     org_coolreader_crengine_Engine
@@ -509,72 +798,6 @@ JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_Engine_updateFileCRC32In
 	return JNI_TRUE;
 }
 
-
-void drawBookCoverInternal(JNIEnv * _env, jclass _engine, jobject bitmap, jbyteArray _data, jboolean respectAspectRatio, jstring _fontFace, jstring _title, jstring _authors, jstring _seriesName, jint seriesNumber, jint bpp)
-{
-	CRJNIEnv env(_env);
-	CRLog::debug("drawBookCoverInternal called");
-	lString8 fontFace = UnicodeToUtf8(env.fromJavaString(_fontFace));
-	lString32 title = env.fromJavaString(_title);
-	lString32 authors = env.fromJavaString(_authors);
-	lString32 seriesName = env.fromJavaString(_seriesName);
-	LVStreamRef stream;
-	LVDrawBuf * drawbuf = BitmapAccessorInterface::getInstance()->lock(_env, bitmap);
-	if (drawbuf != NULL) {
-		LVImageSourceRef image;
-		if (_data != NULL && _env->GetArrayLength(_data) > 0) {
-			CRLog::debug("drawBookCoverInternal : cover image from array");
-			stream = env.jbyteArrayToStream(_data);
-			if (!stream.isNull())
-				image = LVCreateStreamImageSource(stream);
-		}
-
-		int factor = 1;
-		int dx = drawbuf->GetWidth();
-		int dy = drawbuf->GetHeight();
-		int MIN_WIDTH = 300;
-		int MIN_HEIGHT = 400;
-		if (dx < MIN_WIDTH || dy < MIN_HEIGHT) {
-			if (dx * 2 < MIN_WIDTH || dy * 2 < MIN_HEIGHT) {
-				dx *= 3;
-				dy *= 3;
-				factor = 3;
-			} else {
-				dx *= 2;
-				dy *= 2;
-				factor = 2;
-			}
-		}
-		LVDrawBuf * drawbuf2 = drawbuf;
-		if (factor > 1)
-			drawbuf2 = new LVColorDrawBuf(dx, dy, drawbuf->GetBitsPerPixel());
-
-		if (bpp >= 16) {
-			// native color resolution
-			CRLog::debug("drawBookCoverInternal : calling LVDrawBookCover");
-			LVDrawBookCover(*drawbuf2, image, respectAspectRatio, fontFace, title, authors, seriesName, seriesNumber);
-			image.Clear();
-		} else {
-			LVGrayDrawBuf grayBuf(drawbuf2->GetWidth(), drawbuf2->GetHeight(), bpp);
-			LVDrawBookCover(grayBuf, image, respectAspectRatio, fontFace, title, authors, seriesName, seriesNumber);
-			image.Clear();
-			grayBuf.DrawTo(drawbuf2, 0, 0, 0, NULL);
-		}
-
-		if (factor > 1) {
-			CRLog::debug("drawBookCoverInternal : rescaling");
-			drawbuf->DrawRescaled(drawbuf2, 0, 0, drawbuf->GetWidth(), drawbuf->GetHeight(), 0);
-			delete drawbuf2;
-		}
-
-		//CRLog::trace("getPageImageInternal calling bitmap->unlock");
-		BitmapAccessorInterface::getInstance()->unlock(_env, bitmap, drawbuf);
-	} else {
-		CRLog::error("bitmap accessor is invalid");
-	}
-	CRLog::debug("drawBookCoverInternal finished");
-}
-
 /*
  * Class:     org_coolreader_crengine_Engine
  * Method:    drawBookCoverInternal
@@ -586,67 +809,6 @@ JNIEXPORT void JNICALL Java_org_coolreader_crengine_Engine_drawBookCoverInternal
 	COFFEE_TRY_JNI(_env, drawBookCoverInternal(_env, _engine, bitmap, _data, respectAspectRatio, _fontFace, _title, _authors, _seriesName, seriesNumber, bpp));
 }
 
-jbyteArray scanBookCoverInternal
-  (JNIEnv * _env, jclass _class, jstring _path)
-{
-	CRJNIEnv env(_env);
-	lString32 path = env.fromJavaString(_path);
-	CRLog::debug("scanBookCoverInternal(%s) called", LCSTR(path));
-	lString32 arcname, item;
-    LVStreamRef res;
-    jbyteArray array = NULL;
-    LVContainerRef arc;
-	if (!LVSplitArcName(path, arcname, item)) {
-		// not in archive
-		LVStreamRef stream = LVOpenFileStream(path.c_str(), LVOM_READ);
-		if (!stream.isNull()) {
-			arc = LVOpenArchieve(stream);
-			if (!arc.isNull()) {
-				// ZIP-based format
-				if (DetectEpubFormat(stream)) {
-					// EPUB
-					// extract coverpage from epub
-					res = GetEpubCoverpage(arc);
-				}
-			} else {
-				res = GetFB2Coverpage(stream);
-				if (res.isNull()) {
-					doc_format_t fmt;
-					if (DetectPDBFormat(stream, fmt)) {
-						res = GetPDBCoverpage(stream);
-					}
-				}
-			}
-		}
-	} else {
-    	CRLog::debug("scanBookCoverInternal() : is archive, item=%s, arc=%s", LCSTR(item), LCSTR(arcname));
-		LVStreamRef arcstream = LVOpenFileStream(arcname.c_str(), LVOM_READ);
-		if (!arcstream.isNull()) {
-			arc = LVOpenArchieve(arcstream);
-			if (!arc.isNull()) {
-				LVStreamRef stream = arc->OpenStream(item.c_str(), LVOM_READ);
-				if (!stream.isNull()) {
-			    	CRLog::debug("scanBookCoverInternal() : archive stream opened ok, parsing");
-					res = GetFB2Coverpage(stream);
-					if (res.isNull()) {
-						doc_format_t fmt;
-						if (DetectPDBFormat(stream, fmt)) {
-							res = GetPDBCoverpage(stream);
-						}
-					}
-				}
-			}
-		}
-	}
-	if (!res.isNull())
-		array = env.streamToJByteArray(res);
-    if (array != NULL)
-    	CRLog::debug("scanBookCoverInternal() : returned cover page array");
-    else
-    	CRLog::debug("scanBookCoverInternal() : cover page data not found");
-    return array;
-}
-
 /*
  * Class:     org_coolreader_crengine_Engine
  * Method:    scanBookCoverInternal
@@ -690,92 +852,6 @@ JNIEXPORT jobjectArray JNICALL Java_org_coolreader_crengine_Engine_getArchiveIte
     return env.toJavaStringArray(list);
 }
 
-
-class JNICDRLogger : public CRLog
-{
-public:
-    JNICDRLogger()
-    {
-    	curr_level = CRLog::LL_DEBUG;
-    }
-protected:
-  
-	virtual void log( const char * lvl, const char * msg, va_list args)
-	{
-	    #define MAX_LOG_MSG_SIZE 1024
-		static char buffer[MAX_LOG_MSG_SIZE+1];
-		vsnprintf(buffer, MAX_LOG_MSG_SIZE, msg, args);
-		int level = ANDROID_LOG_DEBUG;
-		//LOGD("CRLog::log is called with LEVEL %s, pattern %s", lvl, msg);
-		if ( !strcmp(lvl, "FATAL") )
-			level = ANDROID_LOG_FATAL;
-		else if ( !strcmp(lvl, "ERROR") )
-			level = ANDROID_LOG_ERROR;
-		else if ( !strcmp(lvl, "WARN") )
-			level = ANDROID_LOG_WARN;
-		else if ( !strcmp(lvl, "INFO") )
-			level = ANDROID_LOG_INFO;
-		else if ( !strcmp(lvl, "DEBUG") )
-			level = ANDROID_LOG_DEBUG;
-		else if ( !strcmp(lvl, "TRACE") )
-			level = ANDROID_LOG_VERBOSE;
-		__android_log_write(level, LOG_TAG, buffer);
-	}
-};
-
-//typedef void (lv_FatalErrorHandler_t)(int errorCode, const char * errorText );
-
-void cr3androidFatalErrorHandler(int errorCode, const char * errorText )
-{
-	LOGE("CoolReader Fatal Error #%d: %s", errorCode, errorText);
-	LOGASSERTFAILED("CoolReader Fatal Error", "CoolReader Fatal Error #%d: %s", errorCode, errorText);
-	//static char str[1001];
-	//snprintf(str, 1000, "CoolReader Fatal Error #%d: %s", errorCode, errorText);
-	//LOGE("CoolReader Fatal Error #%d: %s", errorCode, errorText);
-	//LOGASSERTFAILED(errorText, "CoolReader Fatal Error #%d: %s", errorCode, errorText);
-}
-
-/// set fatal error handler
-void crSetFatalErrorHandler( lv_FatalErrorHandler_t * handler );
-
-jboolean initInternal(JNIEnv * penv, jclass obj, jobjectArray fontArray, jint sdk_int) {
-
-	CRJNIEnv::sdk_int = sdk_int;
-
-	CRJNIEnv env(penv);
-
-	// to catch crashes and remove current cache file on crash (SIGSEGV etc.)
-	crSetSignalHandler();
-
-	LOGI("initInternal called");
-	// set fatal error handler
-	crSetFatalErrorHandler( &cr3androidFatalErrorHandler );
-	LOGD("Redirecting CDRLog to Android");
-	CRLog::setLogger( new JNICDRLogger() );
-	CRLog::setLogLevel( CRLog::LL_TRACE );
-	CRLog::info("CREngine log redirected");
-	CRLog::info("CRENGINE version %s %s", CR_ENGINE_VERSION, CR_ENGINE_BUILD_DATE);
-	
-	CRLog::info("initializing hyphenation manager");
-    HyphMan::initDictionaries(lString32::empty_str); //don't look for dictionaries
-	HyphMan::activateDictionary(lString32(HYPH_DICT_ID_NONE));
-	CRLog::info("creating font manager");
-    InitFontManager(lString8::empty_str);
-	CRLog::debug("converting fonts array: %d items", (int)env->GetArrayLength(fontArray));
-	lString32Collection fonts;
-	env.fromJavaStringArray(fontArray, fonts);
-	int len = fonts.length();
-	CRLog::debug("registering fonts: %d fonts in list", len);
-	for ( int i=0; i<len; i++ ) {
-		lString8 fontName = UnicodeToUtf8(fonts[i]);
-		CRLog::debug("registering font %s", fontName.c_str());
-		if ( !fontMan->RegisterFont( fontName ) )
-			CRLog::error("cannot load font %s", fontName.c_str());
-	}
-    CRLog::info("%d fonts registered", fontMan->GetFontCount());
-	return fontMan->GetFontCount() ? JNI_TRUE : JNI_FALSE;
-}
-
 /*
  * Class:     org_coolreader_crengine_Engine
  * Method:    initInternal
@@ -789,87 +865,7 @@ JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_Engine_initInternal
 	return res;
 }
 
-class HyphDataLoaderProxy : public HyphDataLoader {
-	JavaVM *mJavaVM;
-public:
-	HyphDataLoaderProxy(JavaVM *jvm) :
-			HyphDataLoader(), mJavaVM(jvm) {
-	}
-
-	virtual ~HyphDataLoaderProxy() {}
-
-	virtual LVStreamRef loadData(lString32 id) {
-		JNIEnv *penv = NULL;
-		bool attached = false;
-		mJavaVM->GetEnv((void **) &penv, JNI_VERSION_1_6);
-		if (NULL == penv) {
-			// caller thread is not attached yet
-			mJavaVM->AttachCurrentThread(&penv, NULL);
-			attached = true;
-		}
-		LVStreamRef stream = LVStreamRef();
-		jclass pjcEngine = penv->FindClass("org/coolreader/crengine/Engine");
-		if (NULL == pjcEngine)
-			return stream;
-		jmethodID pjmEngine_loadHyphDictData = penv->GetStaticMethodID(pjcEngine, "loadHyphDictData", "(Ljava/lang/String;)[B");
-		if (NULL == pjmEngine_loadHyphDictData)
-			return stream;
-		CRJNIEnv env(penv);
-		jstring jid = env.toJavaString(id);
-		jbyteArray data = static_cast<jbyteArray>(penv->CallStaticObjectMethod(pjcEngine, pjmEngine_loadHyphDictData, jid));
-		stream = env.jbyteArrayToStream(data);
-		if (attached)
-			mJavaVM->DetachCurrentThread();
-		return stream;
-	}
-};
-
-jboolean initDictionaries(JNIEnv *penv, jclass clazz, jobjectArray dictArray) {
-	jclass pjcHyphDict = penv->FindClass("org/coolreader/crengine/Engine$HyphDict");
-	if (NULL == pjcHyphDict)
-		return JNI_FALSE;
-	jfieldID pjfHyphDict_type = penv->GetFieldID(pjcHyphDict, "type", "I");
-	if (NULL == pjfHyphDict_type)
-		return JNI_FALSE;
-    jfieldID pjfHyphDict_code = penv->GetFieldID(pjcHyphDict, "code", "Ljava/lang/String;");
-    if (NULL == pjfHyphDict_code)
-        return JNI_FALSE;
-
-	int len = penv->GetArrayLength(dictArray);
-	HyphDictionary *dict;
-	CRJNIEnv env(penv);
-	HyphDictType dict_type;
-	for (int i = 0; i < len; i++) {
-		jobject obj = penv->GetObjectArrayElement(dictArray, i);
-		int type = penv->GetIntField(obj, pjfHyphDict_type);
-		jstring code = static_cast<jstring>(penv->GetObjectField(obj, pjfHyphDict_code));
-		switch (type) {     // convert org/coolreader/crengine/Engine$HyphDict$type into HyphDictType
-			case 0:         // org/coolreader/crengine/Engine$HYPH_NONE
-				dict_type = HDT_NONE;
-				break;
-			case 1:         // org/coolreader/crengine/Engine$HYPH_ALGO
-				dict_type = HDT_ALGORITHM;
-				break;
-			case 2:         // org/coolreader/crengine/Engine$HYPH_DICT
-				dict_type = HDT_DICT_TEX;
-				break;
-			default:
-				dict_type = HDT_NONE;
-				break;
-		}
-		lString32 dict_code = env.fromJavaString(code);
-		dict = new HyphDictionary(dict_type, dict_code, dict_code, dict_code);
-		if (!HyphMan::addDictionaryItem(dict))
-		    delete dict;
-	}
-	JavaVM *jvm;
-	env->GetJavaVM(&jvm);
-	HyphMan::setDataLoader(new HyphDataLoaderProxy( jvm ));
-	return JNI_TRUE;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_org_coolreader_crengine_Engine_initDictionaries
+JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_Engine_initDictionaries
  (JNIEnv * penv, jclass clazz, jobjectArray dictArray)
 {
     jboolean res = JNI_FALSE;
@@ -1011,7 +1007,9 @@ JNIEXPORT jstring JNICALL Java_org_coolreader_crengine_Engine_getHumanReadableLo
 		(JNIEnv *env, jclass cls, jstring langTag)
 {
 	jstring res = NULL;
-	const char* langTag_ptr = env->GetStringUTFChars(langTag, 0);
+	const char* langTag_ptr = NULL;
+	if (langTag)
+		langTag_ptr = env->GetStringUTFChars(langTag, 0);
 	if (langTag_ptr) {
 		CRLocaleData loc(langTag_ptr);
 		if (loc.isValid()) {
@@ -1163,6 +1161,10 @@ JNIEXPORT jint JNICALL Java_org_coolreader_crengine_Engine_getDomVersionCurrent
 	return gDOMVersionCurrent;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 //=====================================================================
 
 static JNINativeMethod sEngineMethods[] = {
@@ -1210,7 +1212,7 @@ static JNINativeMethod sDocViewMethods[] = {
   {"getTOCInternal", "()Lorg/coolreader/crengine/TOCItem;", (void*)Java_org_coolreader_crengine_DocView_getTOCInternal},
   {"clearSelectionInternal", "()V", (void*)Java_org_coolreader_crengine_DocView_clearSelectionInternal},
   {"findTextInternal", "(Ljava/lang/String;III)Z", (void*)Java_org_coolreader_crengine_DocView_findTextInternal},
-  {"setBatteryStateInternal", "(I)V", (void*)Java_org_coolreader_crengine_DocView_setBatteryStateInternal},
+  {"setBatteryStateInternal", "(III)V", (void*)Java_org_coolreader_crengine_DocView_setBatteryStateInternal},
   {"getCoverPageDataInternal", "()[B", (void*)Java_org_coolreader_crengine_DocView_getCoverPageDataInternal},
   {"setPageBackgroundTextureInternal", "([BI)V", (void*)Java_org_coolreader_crengine_DocView_setPageBackgroundTextureInternal},
   {"updateSelectionInternal", "(Lorg/coolreader/crengine/Selection;)V", (void*)Java_org_coolreader_crengine_DocView_updateSelectionInternal},
@@ -1223,7 +1225,8 @@ static JNINativeMethod sDocViewMethods[] = {
   {"closeImageInternal", "()Z", (void*)Java_org_coolreader_crengine_DocView_closeImageInternal},
   {"hilightBookmarksInternal", "([Lorg/coolreader/crengine/Bookmark;)V", (void*)Java_org_coolreader_crengine_DocView_hilightBookmarksInternal},
   {"checkBookmarkInternal", "(IILorg/coolreader/crengine/Bookmark;)Z", (void*)Java_org_coolreader_crengine_DocView_checkBookmarkInternal},
-  {"isRenderedInternal", "()Z", (void*)Java_org_coolreader_crengine_DocView_isRenderedInternal}
+  {"isRenderedInternal", "()Z", (void*)Java_org_coolreader_crengine_DocView_isRenderedInternal},
+  {"isTimeChangedInternal", "()Z", (void*)Java_org_coolreader_crengine_DocView_isTimeChangedInternal}
 };
 
 /*
diff --git a/android/jni/docview.cpp b/android/jni/docview.cpp
index ef2c9da1f0..1a13e704c6 100644
--- a/android/jni/docview.cpp
+++ b/android/jni/docview.cpp
@@ -1106,6 +1106,179 @@ int DocViewNative::doCommand( int cmd, int param )
    	return 1;
 }
 
+lString32 DocViewNative::getLink( int x, int y, int r )
+{
+	int step = 5;
+	int n = r / step;
+	r = n * step;
+	if ( r==0 )
+		return getLink(x, y);
+	lString32 link;
+	for ( int xx = -r; xx<=r; xx+=step ) {
+		link = getLink( x+xx, y-r );
+		if ( !link.empty() )
+			return link;
+		link = getLink( x+xx, y+r );
+		if ( !link.empty() )
+			return link;
+	}
+	for ( int yy = -r + step; yy<=r - step; yy+=step ) {
+		link = getLink( x+r, y+yy );
+		if ( !link.empty() )
+			return link;
+		link = getLink( x-r, y+yy );
+		if ( !link.empty() )
+			return link;
+	}
+	return lString32::empty_str;
+}
+
+lString32 DocViewNative::getLink( int x, int y )
+{
+	ldomXPointer p = _docview->getNodeByPoint( lvPoint(x, y) );
+	if ( p.isNull() )
+		return lString32::empty_str;
+	lString32 href = p.getHRef();
+	return href;
+}
+
+// The maximum allowed value for multiplying the width and height of the image
+#define MAX_IMAGE_SIZE_MUL 16777216		// 4096 x 4096 px, for now 4K is enough
+
+// checks whether point belongs to image: if found, returns true, and _currentImage is set to image
+bool DocViewNative::checkImage(int x, int y, int bufWidth, int bufHeight, int &dx, int &dy, bool & needRotate)
+{
+	_currentImage = _docview->getImageByPoint(lvPoint(x, y));
+	if (_currentImage.isNull())
+		return false;
+	dx = _currentImage->GetWidth();
+	dy = _currentImage->GetHeight();
+	if (dx < 8 && dy < 8) {
+		_currentImage.Clear();
+		return false;
+	}
+	needRotate = false;
+	if (bufWidth <= bufHeight) {
+		// screen == portrait
+		needRotate = 8 * dx > 10 * dy;
+	} else {
+		// screen == landscape
+		needRotate = 10 * dx < 8 * dy;
+	}
+	int scale = 1;
+	if (dx * dy > MAX_IMAGE_SIZE_MUL) {
+		scale = dx * dy / MAX_IMAGE_SIZE_MUL;
+		dx /= scale;
+		dy /= scale;
+	}
+	LVColorDrawBuf * buf = new LVColorDrawBuf(dx, dy);
+	buf->Clear(0xFF000000); // transparent
+	buf->Draw(_currentImage, 0, 0, dx, dy, false);
+	if (needRotate) {
+		int c = dx;
+		dx = dy;
+		dy = c;
+		buf->Rotate(CR_ROTATE_ANGLE_90);
+	}
+	_currentImage = LVCreateDrawBufImageSource(buf, true);
+	return true;
+}
+
+// draws current image to buffer (scaled, panned)
+bool DocViewNative::drawImage(LVDrawBuf * buf, int x, int y, int dx, int dy)
+{
+	if (_currentImage.isNull())
+		return false;
+	return _docview->drawImage(buf, _currentImage, x, y, dx, dy);
+}
+
+// draws icon to buffer
+bool DocViewNative::drawIcon(LVDrawBuf * buf, lvRect & rc, int type) {
+	rc.shrink(rc.width() / 7);
+	lUInt32 light = 0x60C0C0C0;
+	lUInt32 dark = 0x80606060;
+	lUInt32 colors[2];
+	colors[0] = dark;
+	colors[1] = light;
+	// x0  x1  x2  x3
+	int x0 = rc.left;
+	int x1 = rc.left + rc.width() * 4 / 10;
+	int x2 = rc.right -  + rc.width() * 4 / 10;
+	int x3 = rc.right;
+	int y0 = rc.top;
+	int y1 = rc.top + rc.width() * 4 / 10;
+	int y2 = rc.bottom -  + rc.height() * 4 / 10;
+	int y3 = rc.bottom;
+	for (int w = 1; w>=0; w--) {
+		if (type == 1) {
+			// horizontal minus
+			buf->FillRect(x0-w, y1-w, x3+w+1, y1+w+1, colors[w]);
+			buf->FillRect(x0-w, y2-w, x3+w+1, y2+w+1, colors[w]);
+			buf->FillRect(x0-w, y1-w, x0+w+1, y2+w+1, colors[w]);
+			buf->FillRect(x3-w, y1-w, x3+w+1, y2+w+1, colors[w]);
+		} else if (type == 2) {
+			// vertical minus
+			buf->FillRect(x1-w, y0-w, x1+w+1, y3+w+1, colors[w]);
+			buf->FillRect(x2-w, y0-w, x2+w+1, y3+w+1, colors[w]);
+			buf->FillRect(x1-w, y0-w, x2+w+1, y0+w+1, colors[w]);
+			buf->FillRect(x1-w, y3-w, x2+w+1, y3+w+1, colors[w]);
+		} else {
+			// plus
+			buf->FillRect(x0-w, y1-w, x1+w+1, y1+w+1, colors[w]);
+			buf->FillRect(x1-w, y0-w, x1+w+1, y1+w+1, colors[w]);
+			buf->FillRect(x0-w, y1-w, x0+w+1, y2+w+1, colors[w]);
+			buf->FillRect(x1-w, y0-w, x2+w+1, y0+w+1, colors[w]);
+			buf->FillRect(x2-w, y0-w, x2+w+1, y1+w+1, colors[w]);
+			buf->FillRect(x2-w, y1-w, x3+w+1, y1+w+1, colors[w]);
+			buf->FillRect(x3-w, y1-w, x3+w+1, y2+w+1, colors[w]);
+			buf->FillRect(x2-w, y2-w, x3+w+1, y2+w+1, colors[w]);
+			buf->FillRect(x2-w, y2-w, x2+w+1, y3+w+1, colors[w]);
+			buf->FillRect(x1-w, y3-w, x2+w+1, y3+w+1, colors[w]);
+			buf->FillRect(x1-w, y2-w, x1+w+1, y3+w+1, colors[w]);
+			buf->FillRect(x0-w, y2-w, x1+w+1, y2+w+1, colors[w]);
+		}
+	}
+	return true;
+}
+
+// sets current image to null
+bool DocViewNative::closeImage() {
+	if (_currentImage.isNull())
+		return false;
+	_currentImage.Clear();
+	return true;
+}
+
+void DocViewNative::updateBatteryIcons() {
+	CRPropRef props = _docview->propsGetCurrent();
+	lUInt32 textColor = props->getColorDef(PROP_FONT_COLOR, 0x000000);
+	lUInt32 statusColor = props->getColorDef(PROP_STATUS_FONT_COLOR, 0xFF000000);
+	lUInt32 batteryColor = statusColor;
+	if ( batteryColor==0xFF000000 )
+		batteryColor = textColor;
+	int newSize = 28;
+	int w = _docview->GetWidth();
+	int h = _docview->GetHeight();
+	if (w > h)
+		w = h;
+	if (w > 700)
+		newSize = 56;
+	if ( _batteryIconColor != batteryColor || _batteryIconSize != newSize ) { //oldNightMode!=newNightMode
+		_batteryIconColor = batteryColor;
+		_batteryIconSize = newSize;
+		//CRLog::debug("%x->%x, %x->%x: Setting Battery icon color = #%06x", oldTextColor, newTextColor, oldStatusColor, newStatusColor, batteryColor);
+		LVRefVec<LVImageSource> icons;
+		getBatteryIcons(icons, _batteryIconColor, _batteryIconSize);
+		//CRLog::debug("Setting list of Battery icon bitmats");
+		_docview->setBatteryIcons( icons );
+		//CRLog::debug("Setting list of Battery icon bitmats - done");
+	}
+}
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
  * Class:     org_coolreader_crengine_DocView
@@ -1405,8 +1578,7 @@ JNIEXPORT jobject JNICALL Java_org_coolreader_crengine_DocView_getSettingsIntern
  * Method:    getDocPropsInternal
  * Signature: ()Ljava/util/Properties;
  */
-JNIEXPORT jobject JNICALL
-Java_org_coolreader_crengine_DocView_getDocPropsInternal
+JNIEXPORT jobject JNICALL Java_org_coolreader_crengine_DocView_getDocPropsInternal
   (JNIEnv * _env, jobject _this)
 {
     CRLog::trace("DocView_getDocPropsInternal");
@@ -1832,10 +2004,10 @@ JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_DocView_findTextInternal
 /*
  * Class:     org_coolreader_crengine_DocView
  * Method:    setBatteryStateInternal
- * Signature: (I)V
+ * Signature: (III)V
  */
 JNIEXPORT void JNICALL Java_org_coolreader_crengine_DocView_setBatteryStateInternal
-  (JNIEnv * _env, jobject _this, jint state)
+  (JNIEnv * _env, jobject _this, jint state, jint chargingConn, jint chargeLevel)
 {
     CRJNIEnv env(_env);
     DocViewNative * p = getNative(_env, _this);
@@ -1843,7 +2015,7 @@ JNIEXPORT void JNICALL Java_org_coolreader_crengine_DocView_setBatteryStateInter
     	CRLog::error("Cannot get native view");
     	return;
     }
-    p->_docview->setBatteryState(state);
+    p->_docview->setBatteryState(state, chargingConn, chargeLevel);
 }
 
 /*
@@ -2041,150 +2213,6 @@ JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_DocView_moveSelectionInt
     return JNI_FALSE;
 }
 
-
-lString32 DocViewNative::getLink( int x, int y, int r )
-{
-	int step = 5;
-	int n = r / step;
-	r = n * step;
-	if ( r==0 )
-		return getLink(x, y);
-	lString32 link;
-	for ( int xx = -r; xx<=r; xx+=step ) {
-		link = getLink( x+xx, y-r );
-		if ( !link.empty() )
-			return link;
-		link = getLink( x+xx, y+r );
-		if ( !link.empty() )
-			return link;
-	}
-	for ( int yy = -r + step; yy<=r - step; yy+=step ) {
-		link = getLink( x+r, y+yy );
-		if ( !link.empty() )
-			return link;
-		link = getLink( x-r, y+yy );
-		if ( !link.empty() )
-			return link;
-	}
-	return lString32::empty_str;
-}
-
-lString32 DocViewNative::getLink( int x, int y )
-{
-	ldomXPointer p = _docview->getNodeByPoint( lvPoint(x, y) );
-	if ( p.isNull() )
-		return lString32::empty_str;
-	lString32 href = p.getHRef();
-	return href;
-}
-
-// The maximum allowed value for multiplying the width and height of the image
-#define MAX_IMAGE_SIZE_MUL 16777216		// 4096 x 4096 px, for now 4K is enough
-
-// checks whether point belongs to image: if found, returns true, and _currentImage is set to image
-bool DocViewNative::checkImage(int x, int y, int bufWidth, int bufHeight, int &dx, int &dy, bool & needRotate)
-{
-	_currentImage = _docview->getImageByPoint(lvPoint(x, y));
-	if (_currentImage.isNull())
-		return false;
-	dx = _currentImage->GetWidth();
-	dy = _currentImage->GetHeight();
-	if (dx < 8 && dy < 8) {
-		_currentImage.Clear();
-		return false;
-	}
-	needRotate = false;
-	if (bufWidth <= bufHeight) {
-		// screen == portrait
-		needRotate = 8 * dx > 10 * dy;
-	} else {
-		// screen == landscape
-		needRotate = 10 * dx < 8 * dy;
-	}
-	int scale = 1;
-	if (dx * dy > MAX_IMAGE_SIZE_MUL) {
-		scale = dx * dy / MAX_IMAGE_SIZE_MUL;
-		dx /= scale;
-		dy /= scale;
-	}
-	LVColorDrawBuf * buf = new LVColorDrawBuf(dx, dy);
-	buf->Clear(0xFF000000); // transparent
-	buf->Draw(_currentImage, 0, 0, dx, dy, false);
-	if (needRotate) {
-		int c = dx;
-		dx = dy;
-		dy = c;
-		buf->Rotate(CR_ROTATE_ANGLE_90);
-	}
-	_currentImage = LVCreateDrawBufImageSource(buf, true);
-	return true;
-}
-
-// draws current image to buffer (scaled, panned)
-bool DocViewNative::drawImage(LVDrawBuf * buf, int x, int y, int dx, int dy)
-{
-	if (_currentImage.isNull())
-		return false;
-	return _docview->drawImage(buf, _currentImage, x, y, dx, dy);
-}
-
-// draws icon to buffer
-bool DocViewNative::drawIcon(LVDrawBuf * buf, lvRect & rc, int type) {
-	rc.shrink(rc.width() / 7);
-	lUInt32 light = 0x60C0C0C0;
-	lUInt32 dark = 0x80606060;
-	lUInt32 colors[2];
-	colors[0] = dark;
-	colors[1] = light;
-	// x0  x1  x2  x3
-	int x0 = rc.left;
-	int x1 = rc.left + rc.width() * 4 / 10;
-	int x2 = rc.right -  + rc.width() * 4 / 10;
-	int x3 = rc.right;
-	int y0 = rc.top;
-	int y1 = rc.top + rc.width() * 4 / 10;
-	int y2 = rc.bottom -  + rc.height() * 4 / 10;
-	int y3 = rc.bottom;
-	for (int w = 1; w>=0; w--) {
-		if (type == 1) {
-			// horizontal minus
-			buf->FillRect(x0-w, y1-w, x3+w+1, y1+w+1, colors[w]);
-			buf->FillRect(x0-w, y2-w, x3+w+1, y2+w+1, colors[w]);
-			buf->FillRect(x0-w, y1-w, x0+w+1, y2+w+1, colors[w]);
-			buf->FillRect(x3-w, y1-w, x3+w+1, y2+w+1, colors[w]);
-		} else if (type == 2) {
-			// vertical minus
-			buf->FillRect(x1-w, y0-w, x1+w+1, y3+w+1, colors[w]);
-			buf->FillRect(x2-w, y0-w, x2+w+1, y3+w+1, colors[w]);
-			buf->FillRect(x1-w, y0-w, x2+w+1, y0+w+1, colors[w]);
-			buf->FillRect(x1-w, y3-w, x2+w+1, y3+w+1, colors[w]);
-		} else {
-			// plus
-			buf->FillRect(x0-w, y1-w, x1+w+1, y1+w+1, colors[w]);
-			buf->FillRect(x1-w, y0-w, x1+w+1, y1+w+1, colors[w]);
-			buf->FillRect(x0-w, y1-w, x0+w+1, y2+w+1, colors[w]);
-			buf->FillRect(x1-w, y0-w, x2+w+1, y0+w+1, colors[w]);
-			buf->FillRect(x2-w, y0-w, x2+w+1, y1+w+1, colors[w]);
-			buf->FillRect(x2-w, y1-w, x3+w+1, y1+w+1, colors[w]);
-			buf->FillRect(x3-w, y1-w, x3+w+1, y2+w+1, colors[w]);
-			buf->FillRect(x2-w, y2-w, x3+w+1, y2+w+1, colors[w]);
-			buf->FillRect(x2-w, y2-w, x2+w+1, y3+w+1, colors[w]);
-			buf->FillRect(x1-w, y3-w, x2+w+1, y3+w+1, colors[w]);
-			buf->FillRect(x1-w, y2-w, x1+w+1, y3+w+1, colors[w]);
-			buf->FillRect(x0-w, y2-w, x1+w+1, y2+w+1, colors[w]);
-		}
-	}
-	return true;
-}
-
-// sets current image to null
-bool DocViewNative::closeImage() {
-	if (_currentImage.isNull())
-		return false;
-	_currentImage.Clear();
-	return true;
-}
-
 /*
  * Class:     org_coolreader_crengine_DocView
  * Method:    checkLinkInternal
@@ -2258,30 +2286,22 @@ JNIEXPORT void JNICALL Java_org_coolreader_crengine_DocView_hilightBookmarksInte
     p->_docview->setBookmarkList(bookmarks);
 }
 
+/*
+ * Class:     org_coolreader_crengine_DocView
+ * Method:    isTimeChangedInternal
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_DocView_isTimeChangedInternal
+  (JNIEnv * _env, jobject _this) {
+    ;
+    DocViewNative * p = getNative(_env, _this);
+    if (!p) {
+        CRLog::error("Cannot get native view");
+        return JNI_FALSE;
+    }
+    return p->_docview->isTimeChanged() ? JNI_TRUE : JNI_FALSE;
+}
 
-
-void DocViewNative::updateBatteryIcons() {
-	CRPropRef props = _docview->propsGetCurrent();
-	lUInt32 textColor = props->getColorDef(PROP_FONT_COLOR, 0x000000);
-	lUInt32 statusColor = props->getColorDef(PROP_STATUS_FONT_COLOR, 0xFF000000);
-	lUInt32 batteryColor = statusColor;
-	if ( batteryColor==0xFF000000 )
-		batteryColor = textColor;
-	int newSize = 28;
-	int w = _docview->GetWidth();
-	int h = _docview->GetHeight();
-	if (w > h)
-		w = h;
-	if (w > 700)
-		newSize = 56;
-	if ( _batteryIconColor != batteryColor || _batteryIconSize != newSize ) { //oldNightMode!=newNightMode
-		_batteryIconColor = batteryColor;
-		_batteryIconSize = newSize;
-		//CRLog::debug("%x->%x, %x->%x: Setting Battery icon color = #%06x", oldTextColor, newTextColor, oldStatusColor, newStatusColor, batteryColor);
-	    LVRefVec<LVImageSource> icons;
-	    getBatteryIcons(icons, _batteryIconColor, _batteryIconSize);
-		//CRLog::debug("Setting list of Battery icon bitmats");
-	   _docview->setBatteryIcons( icons );
-		//CRLog::debug("Setting list of Battery icon bitmats - done");
-	}
+#ifdef __cplusplus
 }
+#endif
diff --git a/android/jni/org_coolreader_crengine_DocView.h b/android/jni/org_coolreader_crengine_DocView.h
index cbeb8b12a4..2d9117124b 100644
--- a/android/jni/org_coolreader_crengine_DocView.h
+++ b/android/jni/org_coolreader_crengine_DocView.h
@@ -168,10 +168,10 @@ JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_DocView_findTextInternal
 /*
  * Class:     org_coolreader_crengine_DocView
  * Method:    setBatteryStateInternal
- * Signature: (I)V
+ * Signature: (III)V
  */
 JNIEXPORT void JNICALL Java_org_coolreader_crengine_DocView_setBatteryStateInternal
-  (JNIEnv *, jobject, jint);
+  (JNIEnv *, jobject, jint, jint, jint);
 
 /*
  * Class:     org_coolreader_crengine_DocView
@@ -277,6 +277,14 @@ JNIEXPORT void JNICALL Java_org_coolreader_crengine_DocView_hilightBookmarksInte
 JNIEXPORT jint JNICALL Java_org_coolreader_crengine_DocView_swapToCacheInternal
   (JNIEnv *, jobject);
 
+/*
+ * Class:     org_coolreader_crengine_DocView
+ * Method:    isTimeChangedInternal
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_DocView_isTimeChangedInternal
+  (JNIEnv *, jobject);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/android/res/color-v21/common_tint_black.xml b/android/res/color-v21/common_tint_black.xml
new file mode 100644
index 0000000000..0175c925f6
--- /dev/null
+++ b/android/res/color-v21/common_tint_black.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:color="#d0d0d0"/>
+</selector>
diff --git a/android/res/color-v21/common_tint_dark.xml b/android/res/color-v21/common_tint_dark.xml
new file mode 100644
index 0000000000..0175c925f6
--- /dev/null
+++ b/android/res/color-v21/common_tint_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:color="#d0d0d0"/>
+</selector>
diff --git a/android/res/color-v21/common_tint_hc_dark.xml b/android/res/color-v21/common_tint_hc_dark.xml
new file mode 100644
index 0000000000..d1a41512c6
--- /dev/null
+++ b/android/res/color-v21/common_tint_hc_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:color="@android:color/white"/>
+</selector>
diff --git a/android/res/color-v21/common_tint_hc_light.xml b/android/res/color-v21/common_tint_hc_light.xml
new file mode 100644
index 0000000000..5dbccef04c
--- /dev/null
+++ b/android/res/color-v21/common_tint_hc_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:color="@android:color/black"/>
+</selector>
diff --git a/android/res/color-v21/common_tint_light.xml b/android/res/color-v21/common_tint_light.xml
new file mode 100644
index 0000000000..5ad99d9caf
--- /dev/null
+++ b/android/res/color-v21/common_tint_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#b9b9b9"/>
+    <item android:color="#6b472f"/>
+</selector>
diff --git a/android/res/color-v21/common_tint_white.xml b/android/res/color-v21/common_tint_white.xml
new file mode 100644
index 0000000000..be0c0a3ffa
--- /dev/null
+++ b/android/res/color-v21/common_tint_white.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#888888"/>
+    <item android:color="#323232"/>
+</selector>
diff --git a/android/res/color-v21/compoundbutton_tint_black.xml b/android/res/color-v21/compoundbutton_tint_black.xml
new file mode 100644
index 0000000000..53a271bbe6
--- /dev/null
+++ b/android/res/color-v21/compoundbutton_tint_black.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:state_checked="true"  android:color="#d0d0d0"/>
+    <item android:color="#d0d0d0"/>
+</selector>
diff --git a/android/res/color-v21/compoundbutton_tint_dark.xml b/android/res/color-v21/compoundbutton_tint_dark.xml
new file mode 100644
index 0000000000..53a271bbe6
--- /dev/null
+++ b/android/res/color-v21/compoundbutton_tint_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:state_checked="true"  android:color="#d0d0d0"/>
+    <item android:color="#d0d0d0"/>
+</selector>
diff --git a/android/res/color-v21/compoundbutton_tint_hc_dark.xml b/android/res/color-v21/compoundbutton_tint_hc_dark.xml
new file mode 100644
index 0000000000..a51ebdb493
--- /dev/null
+++ b/android/res/color-v21/compoundbutton_tint_hc_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:state_checked="true"  android:color="@android:color/white"/>
+    <item android:color="@android:color/white"/>
+</selector>
diff --git a/android/res/color-v21/compoundbutton_tint_hc_light.xml b/android/res/color-v21/compoundbutton_tint_hc_light.xml
new file mode 100644
index 0000000000..e37642a320
--- /dev/null
+++ b/android/res/color-v21/compoundbutton_tint_hc_light.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:state_checked="true"  android:color="@android:color/black"/>
+    <item android:color="@android:color/black"/>
+</selector>
diff --git a/android/res/color-v21/compoundbutton_tint_light.xml b/android/res/color-v21/compoundbutton_tint_light.xml
new file mode 100644
index 0000000000..33e530fbdd
--- /dev/null
+++ b/android/res/color-v21/compoundbutton_tint_light.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#b9b9b9"/>
+    <item android:state_checked="true"  android:color="#6b472f"/>
+    <item android:color="#88000000"/>
+</selector>
diff --git a/android/res/color-v21/compoundbutton_tint_white.xml b/android/res/color-v21/compoundbutton_tint_white.xml
new file mode 100644
index 0000000000..4dbc26c20e
--- /dev/null
+++ b/android/res/color-v21/compoundbutton_tint_white.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#888888"/>
+    <item android:state_checked="true"  android:color="#323232"/>
+    <item android:color="#323232"/>
+</selector>
diff --git a/android/res/color-v24/switch_thumb_tint_black.xml b/android/res/color-v24/switch_thumb_tint_black.xml
new file mode 100644
index 0000000000..fac24108f3
--- /dev/null
+++ b/android/res/color-v24/switch_thumb_tint_black.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#5f5f5f"/>
+    <item android:state_checked="true"  android:color="#d0d0d0"/>
+    <item android:color="#b9b9b9"/>
+</selector>
diff --git a/android/res/color-v24/switch_thumb_tint_dark.xml b/android/res/color-v24/switch_thumb_tint_dark.xml
new file mode 100644
index 0000000000..fb21724987
--- /dev/null
+++ b/android/res/color-v24/switch_thumb_tint_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#5f5f5f"/>
+    <item android:state_checked="true"  android:color="#feddb7"/>
+    <item android:color="#b9b9b9"/>
+</selector>
diff --git a/android/res/color-v24/switch_thumb_tint_hc_dark.xml b/android/res/color-v24/switch_thumb_tint_hc_dark.xml
new file mode 100644
index 0000000000..a51ebdb493
--- /dev/null
+++ b/android/res/color-v24/switch_thumb_tint_hc_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:state_checked="true"  android:color="@android:color/white"/>
+    <item android:color="@android:color/white"/>
+</selector>
diff --git a/android/res/color-v24/switch_thumb_tint_hc_light.xml b/android/res/color-v24/switch_thumb_tint_hc_light.xml
new file mode 100644
index 0000000000..e37642a320
--- /dev/null
+++ b/android/res/color-v24/switch_thumb_tint_hc_light.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:state_checked="true"  android:color="@android:color/black"/>
+    <item android:color="@android:color/black"/>
+</selector>
diff --git a/android/res/color-v24/switch_thumb_tint_light.xml b/android/res/color-v24/switch_thumb_tint_light.xml
new file mode 100644
index 0000000000..2be1b2d80c
--- /dev/null
+++ b/android/res/color-v24/switch_thumb_tint_light.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#b9b9b9"/>
+    <item android:state_checked="true"  android:color="#6b472f"/>
+    <item android:color="#ececec"/>
+</selector>
diff --git a/android/res/color-v24/switch_thumb_tint_white.xml b/android/res/color-v24/switch_thumb_tint_white.xml
new file mode 100644
index 0000000000..cf5941174f
--- /dev/null
+++ b/android/res/color-v24/switch_thumb_tint_white.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#b9b9b9"/>
+    <item android:state_checked="true"  android:color="#323232"/>
+    <item android:color="#ececec"/>
+</selector>
diff --git a/android/res/color-v24/switch_track_tint_dark.xml b/android/res/color-v24/switch_track_tint_dark.xml
new file mode 100644
index 0000000000..1845f3b1e3
--- /dev/null
+++ b/android/res/color-v24/switch_track_tint_dark.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+          android:color="#80000000" />
+    <item android:state_checked="true"
+          android:color="#8d8d8d" />
+    <item android:color="#8d8d8d" />
+</selector>
diff --git a/android/res/color-v24/switch_track_tint_hc_dark.xml b/android/res/color-v24/switch_track_tint_hc_dark.xml
new file mode 100644
index 0000000000..50b0ad091f
--- /dev/null
+++ b/android/res/color-v24/switch_track_tint_hc_dark.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+          android:color="#808080" />
+    <item android:state_checked="true"
+          android:color="#8d8d8d" />
+    <item android:color="#8d8d8d" />
+</selector>
diff --git a/android/res/color-v24/switch_track_tint_hc_light.xml b/android/res/color-v24/switch_track_tint_hc_light.xml
new file mode 100644
index 0000000000..50b0ad091f
--- /dev/null
+++ b/android/res/color-v24/switch_track_tint_hc_light.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+          android:color="#808080" />
+    <item android:state_checked="true"
+          android:color="#8d8d8d" />
+    <item android:color="#8d8d8d" />
+</selector>
diff --git a/android/res/color-v24/switch_track_tint_light.xml b/android/res/color-v24/switch_track_tint_light.xml
new file mode 100644
index 0000000000..1845f3b1e3
--- /dev/null
+++ b/android/res/color-v24/switch_track_tint_light.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+          android:color="#80000000" />
+    <item android:state_checked="true"
+          android:color="#8d8d8d" />
+    <item android:color="#8d8d8d" />
+</selector>
diff --git a/android/res/drawable-hdpi/cr3_button_dec_dark.png b/android/res/drawable-hdpi/cr3_button_dec_dark.png
new file mode 100644
index 0000000000..f9b9de02a8
Binary files /dev/null and b/android/res/drawable-hdpi/cr3_button_dec_dark.png differ
diff --git a/android/res/drawable-hdpi/cr3_button_dec_light.png b/android/res/drawable-hdpi/cr3_button_dec_light.png
new file mode 100644
index 0000000000..96e986a325
Binary files /dev/null and b/android/res/drawable-hdpi/cr3_button_dec_light.png differ
diff --git a/android/res/drawable-hdpi/cr3_button_dec_white.png b/android/res/drawable-hdpi/cr3_button_dec_white.png
new file mode 100644
index 0000000000..3068e463ec
Binary files /dev/null and b/android/res/drawable-hdpi/cr3_button_dec_white.png differ
diff --git a/android/res/drawable-hdpi/cr3_button_inc_dark.png b/android/res/drawable-hdpi/cr3_button_inc_dark.png
new file mode 100644
index 0000000000..631bd4238c
Binary files /dev/null and b/android/res/drawable-hdpi/cr3_button_inc_dark.png differ
diff --git a/android/res/drawable-hdpi/cr3_button_inc_light.png b/android/res/drawable-hdpi/cr3_button_inc_light.png
new file mode 100644
index 0000000000..333859e2ec
Binary files /dev/null and b/android/res/drawable-hdpi/cr3_button_inc_light.png differ
diff --git a/android/res/drawable-hdpi/cr3_button_inc_white.png b/android/res/drawable-hdpi/cr3_button_inc_white.png
new file mode 100644
index 0000000000..65d37535a1
Binary files /dev/null and b/android/res/drawable-hdpi/cr3_button_inc_white.png differ
diff --git a/android/res/drawable-ldpi/cr3_button_dec_dark.png b/android/res/drawable-ldpi/cr3_button_dec_dark.png
new file mode 100644
index 0000000000..f43bc904df
Binary files /dev/null and b/android/res/drawable-ldpi/cr3_button_dec_dark.png differ
diff --git a/android/res/drawable-ldpi/cr3_button_dec_light.png b/android/res/drawable-ldpi/cr3_button_dec_light.png
new file mode 100644
index 0000000000..1da8297ee5
Binary files /dev/null and b/android/res/drawable-ldpi/cr3_button_dec_light.png differ
diff --git a/android/res/drawable-ldpi/cr3_button_dec_white.png b/android/res/drawable-ldpi/cr3_button_dec_white.png
new file mode 100644
index 0000000000..c84b07d517
Binary files /dev/null and b/android/res/drawable-ldpi/cr3_button_dec_white.png differ
diff --git a/android/res/drawable-ldpi/cr3_button_inc_dark.png b/android/res/drawable-ldpi/cr3_button_inc_dark.png
new file mode 100644
index 0000000000..fd887cc192
Binary files /dev/null and b/android/res/drawable-ldpi/cr3_button_inc_dark.png differ
diff --git a/android/res/drawable-ldpi/cr3_button_inc_light.png b/android/res/drawable-ldpi/cr3_button_inc_light.png
new file mode 100644
index 0000000000..43679f564d
Binary files /dev/null and b/android/res/drawable-ldpi/cr3_button_inc_light.png differ
diff --git a/android/res/drawable-ldpi/cr3_button_inc_white.png b/android/res/drawable-ldpi/cr3_button_inc_white.png
new file mode 100644
index 0000000000..9a86e3d362
Binary files /dev/null and b/android/res/drawable-ldpi/cr3_button_inc_white.png differ
diff --git a/android/res/drawable-mdpi/cr3_button_dec_dark.png b/android/res/drawable-mdpi/cr3_button_dec_dark.png
new file mode 100644
index 0000000000..5cf5969039
Binary files /dev/null and b/android/res/drawable-mdpi/cr3_button_dec_dark.png differ
diff --git a/android/res/drawable-mdpi/cr3_button_dec_light.png b/android/res/drawable-mdpi/cr3_button_dec_light.png
new file mode 100644
index 0000000000..d420d5b489
Binary files /dev/null and b/android/res/drawable-mdpi/cr3_button_dec_light.png differ
diff --git a/android/res/drawable-mdpi/cr3_button_dec_white.png b/android/res/drawable-mdpi/cr3_button_dec_white.png
new file mode 100644
index 0000000000..a3e270d2d3
Binary files /dev/null and b/android/res/drawable-mdpi/cr3_button_dec_white.png differ
diff --git a/android/res/drawable-mdpi/cr3_button_inc_dark.png b/android/res/drawable-mdpi/cr3_button_inc_dark.png
new file mode 100644
index 0000000000..84003b875a
Binary files /dev/null and b/android/res/drawable-mdpi/cr3_button_inc_dark.png differ
diff --git a/android/res/drawable-mdpi/cr3_button_inc_light.png b/android/res/drawable-mdpi/cr3_button_inc_light.png
new file mode 100644
index 0000000000..0a8d594e5a
Binary files /dev/null and b/android/res/drawable-mdpi/cr3_button_inc_light.png differ
diff --git a/android/res/drawable-mdpi/cr3_button_inc_white.png b/android/res/drawable-mdpi/cr3_button_inc_white.png
new file mode 100644
index 0000000000..90453daddb
Binary files /dev/null and b/android/res/drawable-mdpi/cr3_button_inc_white.png differ
diff --git a/android/res/drawable-v21/tab_indicator_material.xml b/android/res/drawable-v21/tab_indicator_material.xml
index b9ca7800ec..268a4a5c1a 100644
--- a/android/res/drawable-v21/tab_indicator_material.xml
+++ b/android/res/drawable-v21/tab_indicator_material.xml
@@ -17,7 +17,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true">
         <nine-patch android:src="@drawable/tab_indicator_mtrl_alpha"
-            android:tint="?android:attr/colorControlActivated" />
+            android:tint="?attr/colorControlActivated" />
     </item>
     <item android:drawable="@android:color/transparent" />
 </selector>
diff --git a/android/res/drawable-xhdpi/cr3_button_dec_dark.png b/android/res/drawable-xhdpi/cr3_button_dec_dark.png
new file mode 100644
index 0000000000..3d0f461054
Binary files /dev/null and b/android/res/drawable-xhdpi/cr3_button_dec_dark.png differ
diff --git a/android/res/drawable-xhdpi/cr3_button_dec_light.png b/android/res/drawable-xhdpi/cr3_button_dec_light.png
new file mode 100644
index 0000000000..c2902e9c3a
Binary files /dev/null and b/android/res/drawable-xhdpi/cr3_button_dec_light.png differ
diff --git a/android/res/drawable-xhdpi/cr3_button_dec_white.png b/android/res/drawable-xhdpi/cr3_button_dec_white.png
new file mode 100644
index 0000000000..a12a33c394
Binary files /dev/null and b/android/res/drawable-xhdpi/cr3_button_dec_white.png differ
diff --git a/android/res/drawable-xhdpi/cr3_button_inc_dark.png b/android/res/drawable-xhdpi/cr3_button_inc_dark.png
new file mode 100644
index 0000000000..d3dc12bf2b
Binary files /dev/null and b/android/res/drawable-xhdpi/cr3_button_inc_dark.png differ
diff --git a/android/res/drawable-xhdpi/cr3_button_inc_light.png b/android/res/drawable-xhdpi/cr3_button_inc_light.png
new file mode 100644
index 0000000000..e722d7fe14
Binary files /dev/null and b/android/res/drawable-xhdpi/cr3_button_inc_light.png differ
diff --git a/android/res/drawable-xhdpi/cr3_button_inc_white.png b/android/res/drawable-xhdpi/cr3_button_inc_white.png
new file mode 100644
index 0000000000..945d738444
Binary files /dev/null and b/android/res/drawable-xhdpi/cr3_button_inc_white.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_button_dec_dark.png b/android/res/drawable-xxhdpi/cr3_button_dec_dark.png
new file mode 100644
index 0000000000..e2a8d28cdc
Binary files /dev/null and b/android/res/drawable-xxhdpi/cr3_button_dec_dark.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_button_dec_light.png b/android/res/drawable-xxhdpi/cr3_button_dec_light.png
new file mode 100644
index 0000000000..dc53e925e3
Binary files /dev/null and b/android/res/drawable-xxhdpi/cr3_button_dec_light.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_button_dec_white.png b/android/res/drawable-xxhdpi/cr3_button_dec_white.png
new file mode 100644
index 0000000000..8cfac42fef
Binary files /dev/null and b/android/res/drawable-xxhdpi/cr3_button_dec_white.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_button_inc_dark.png b/android/res/drawable-xxhdpi/cr3_button_inc_dark.png
new file mode 100644
index 0000000000..905cd48cb9
Binary files /dev/null and b/android/res/drawable-xxhdpi/cr3_button_inc_dark.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_button_inc_light.png b/android/res/drawable-xxhdpi/cr3_button_inc_light.png
new file mode 100644
index 0000000000..bf7442277e
Binary files /dev/null and b/android/res/drawable-xxhdpi/cr3_button_inc_light.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_button_inc_white.png b/android/res/drawable-xxhdpi/cr3_button_inc_white.png
new file mode 100644
index 0000000000..4c9c61d718
Binary files /dev/null and b/android/res/drawable-xxhdpi/cr3_button_inc_white.png differ
diff --git a/android/res/layout-v24/option_item_boolean.xml b/android/res/layout-v24/option_item_boolean.xml
new file mode 100644
index 0000000000..daebcd7c6e
--- /dev/null
+++ b/android/res/layout-v24/option_item_boolean.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Boolean option item layout for CR3 options dialog, for API24+
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/option_item_body"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:orientation="horizontal"
+        android:paddingRight="?android:attr/scrollbarSize">
+
+    <ImageView
+            android:id="@+id/option_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+
+    <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="15dip"
+            android:layout_marginTop="6dip"
+            android:layout_marginRight="6dip"
+            android:layout_marginBottom="6dip"
+            android:layout_weight="1">
+
+        <TextView
+                android:id="@+id/option_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="3"
+                android:singleLine="false"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textColor="?attr/textColorOptionLabel" />
+        <!--android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+         -->
+        <TextView
+                android:id="@+id/option_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/option_label"
+                android:layout_alignLeft="@id/option_label"
+                android:maxLines="3"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?attr/textColorOptionValue"
+                android:visibility="gone" />
+
+    </RelativeLayout>
+
+    <Switch
+            android:id="@+id/option_value_cb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="0dip"
+            android:clickable="false"
+            android:focusable="false"
+            android:showText="false" />
+</LinearLayout>
diff --git a/android/res/layout-v24/option_lang_filter.xml b/android/res/layout-v24/option_lang_filter.xml
new file mode 100644
index 0000000000..f66aa47660
--- /dev/null
+++ b/android/res/layout-v24/option_lang_filter.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/option_item_body"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:orientation="vertical"
+        android:paddingRight="?android:attr/scrollbarSize">
+
+    <Switch
+            android:id="@+id/filter_by_lang"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dip"
+            android:layout_marginLeft="15dip"
+            android:layout_marginTop="0dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginRight="6dip"
+            android:layout_marginBottom="0dip"
+            android:showText="false"
+            android:text="@string/filter_by_book_language_s" />
+</LinearLayout>
diff --git a/android/res/layout/book_info_edit_dialog.xml b/android/res/layout/book_info_edit_dialog.xml
index a985545522..22d9c2e1b6 100644
--- a/android/res/layout/book_info_edit_dialog.xml
+++ b/android/res/layout/book_info_edit_dialog.xml
@@ -318,6 +318,26 @@
                     android:text=""
                     android:visibility="gone" />
 
+            <TextView
+                    android:id="@+id/lbl_book_lang"
+                    style="@style/TextAppearance.Medium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginStart="4dp"
+                    android:singleLine="true"
+                    android:text="@string/book_info_book_language" />
+
+            <EditText
+                    android:id="@+id/book_lang"
+                    style="@style/TextAppearance.Widget.EditText"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:editable="false"
+                    android:inputType="none"
+                    android:singleLine="true"
+                    android:text="" />
+
             <EditText
                     android:id="@+id/book_description"
                     style="@style/TextAppearance.Widget.EditText"
diff --git a/android/res/layout/option_lang_filter.xml b/android/res/layout/option_lang_filter.xml
new file mode 100644
index 0000000000..3bca0c0270
--- /dev/null
+++ b/android/res/layout/option_lang_filter.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/option_item_body"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:orientation="vertical"
+        android:paddingRight="?android:attr/scrollbarSize">
+
+    <CheckBox
+            android:id="@+id/filter_by_lang"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dip"
+            android:layout_marginLeft="15dip"
+            android:layout_marginTop="0dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginRight="6dip"
+            android:layout_marginBottom="0dip"
+            android:text="@string/filter_by_book_language_s" />
+</LinearLayout>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 39e569051a..69305617e7 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -732,4 +732,7 @@
     <string name="options_disabled_document_styles">отключены встроенные стили документа или неподдерживаемый тип документа</string>
     <string name="options_multilingual_enabled">отключено, так как включена поддежка мультиязычных документов</string>
     <string name="options_multilingual_disabled">отключено, так как отключена поддежка мультиязычных документов или включен устаревший рендеринг</string>
+    <string name="filter_by_book_language_s">Отфильтровать по языку книги (%s)</string>
+    <string name="scanning_font_files">Сканирование файлов шрифтов…</string>
+    <string name="undetermined">Неопределенный</string>
 </resources>
diff --git a/android/res/values-v21/styles.xml b/android/res/values-v21/styles.xml
index 1c4f6f7473..78853de0f9 100644
--- a/android/res/values-v21/styles.xml
+++ b/android/res/values-v21/styles.xml
@@ -7,6 +7,7 @@
 
     <style name="TextAppearance.Widget.EditText" parent="@android:style/TextAppearance.Widget.EditText">
         <item name="android:textColor">?android:attr/editTextColor</item>
+        <item name="android:backgroundTint">?attr/colorControlActivated</item>
     </style>
 
     <style name="ListView">
@@ -18,7 +19,7 @@
         <item name="android:listSelector">@null</item>
         <item name="android:divider">@drawable/divider_dark_tiled</item>
     </style>
-        
+
     <style name="ListView.Light" parent="@style/Theme.Light">
         <!--item name="android:background">@drawable/background_tiled_light</item-->
         <item name="android:scrollbars">vertical</item>
@@ -26,7 +27,7 @@
         <item name="android:listSelector">@null</item>
         <item name="android:divider">@drawable/divider_light_tiled</item>
     </style>
-        
+
     <style name="ListView.Black" parent="@style/Theme.Black">
         <item name="android:scrollbars">vertical</item>
         <item name="android:fadingEdge">vertical</item>
@@ -42,20 +43,52 @@
         <item name="android:divider">@drawable/divider_white_tiled</item>
     </style>
 
+    <style name="CheckBox.Light" parent="@android:style/Widget.Material.Light.CompoundButton.CheckBox">
+        <item name="android:buttonTint">@color/compoundbutton_tint_light</item>
+    </style>
+
+    <style name="CheckBox.Dark" parent="@android:style/Widget.Material.CompoundButton.CheckBox">
+        <item name="android:buttonTint">@color/compoundbutton_tint_dark</item>
+    </style>
+
+    <style name="CheckBox.White" parent="@android:style/Widget.Material.Light.CompoundButton.CheckBox">
+        <item name="android:buttonTint">@color/compoundbutton_tint_white</item>
+    </style>
+
+    <style name="CheckBox.Black" parent="@android:style/Widget.Material.CompoundButton.CheckBox">
+        <item name="android:buttonTint">@color/compoundbutton_tint_black</item>
+    </style>
+
     <style name="CheckBox.HC.Light" parent="@android:style/Widget.Material.Light.CompoundButton.CheckBox">
-        <item name="android:button">@drawable/btn_check_hc_light</item>
+        <item name="android:buttonTint">@color/compoundbutton_tint_hc_light</item>
     </style>
 
     <style name="CheckBox.HC.Dark" parent="@android:style/Widget.Material.CompoundButton.CheckBox">
-        <item name="android:button">@drawable/btn_check_hc_dark</item>
+        <item name="android:buttonTint">@color/compoundbutton_tint_hc_dark</item>
+    </style>
+
+    <style name="RadioButton.Light" parent="@android:style/Widget.Material.Light.CompoundButton.RadioButton">
+        <item name="android:buttonTint">@color/compoundbutton_tint_light</item>
+    </style>
+
+    <style name="RadioButton.Dark" parent="@android:style/Widget.Material.CompoundButton.RadioButton">
+        <item name="android:buttonTint">@color/compoundbutton_tint_dark</item>
+    </style>
+
+    <style name="RadioButton.White" parent="@android:style/Widget.Material.Light.CompoundButton.RadioButton">
+        <item name="android:buttonTint">@color/compoundbutton_tint_white</item>
+    </style>
+
+    <style name="RadioButton.Black" parent="@android:style/Widget.Material.CompoundButton.RadioButton">
+        <item name="android:buttonTint">@color/compoundbutton_tint_black</item>
     </style>
 
     <style name="RadioButton.HC.Light" parent="@android:style/Widget.Material.Light.CompoundButton.RadioButton">
-        <item name="android:button">@drawable/btn_radio_hc_light</item>
+        <item name="android:buttonTint">@color/compoundbutton_tint_hc_light</item>
     </style>
 
     <style name="RadioButton.HC.Dark" parent="@android:style/Widget.Material.CompoundButton.RadioButton">
-        <item name="android:button">@drawable/btn_radio_hc_dark</item>
+        <item name="android:buttonTint">@color/compoundbutton_tint_hc_dark</item>
     </style>
 
     <style name="Button.HC.Light" parent="@android:style/Widget.Material.Light.Button">
@@ -88,15 +121,58 @@
         <item name="android:textColor">@color/btn_default_hc_dark_text</item>
     </style>
 
+    <style name="SeekBar.Light" parent="@android:style/Widget.Material.Light.SeekBar">
+        <item name="android:progressBackgroundTint">#80000000</item>
+        <item name="android:progressTint">@color/common_tint_light</item>
+        <item name="android:thumbTint">@color/common_tint_light</item>
+    </style>
+
+    <style name="SeekBar.Dark" parent="@android:style/Widget.Material.SeekBar">
+        <item name="android:progressBackgroundTint">#80ffffff</item>
+        <item name="android:progressTint">@color/common_tint_dark</item>
+        <item name="android:thumbTint">@color/common_tint_dark</item>
+    </style>
+
+    <style name="SeekBar.White" parent="@android:style/Widget.Material.Light.SeekBar">
+        <item name="android:progressBackgroundTint">#80000000</item>
+        <item name="android:progressTint">@color/common_tint_white</item>
+        <item name="android:thumbTint">@color/common_tint_white</item>
+    </style>
+
+    <style name="SeekBar.Black" parent="@android:style/Widget.Material.SeekBar">
+        <item name="android:progressBackgroundTint">#80ffffff</item>
+        <item name="android:progressTint">@color/common_tint_black</item>
+        <item name="android:thumbTint">@color/common_tint_black</item>
+    </style>
+
+    <style name="SeekBar.HC.Light" parent="@android:style/Widget.Material.Light.SeekBar">
+        <item name="android:progressBackgroundTint">#80000000</item>
+        <item name="android:progressTint">@color/common_tint_hc_light</item>
+        <item name="android:thumbTint">@color/common_tint_hc_light</item>
+    </style>
+
+    <style name="SeekBar.HC.Dark" parent="@android:style/Widget.Material.SeekBar">
+        <item name="android:progressBackgroundTint">#80ffffff</item>
+        <item name="android:progressTint">@color/common_tint_hc_dark</item>
+        <item name="android:thumbTint">@color/common_tint_hc_dark</item>
+    </style>
+
     <style name="Theme.Light" parent="@style/Theme.White">
         <item name="android:windowBackground">@drawable/background_tiled_light</item>
         <item name="android:colorBackground">#ffe0e0e0</item>
         <!-- item name="android:textColor">@android:color/black</item-->
         <item name="android:listViewStyle">@style/ListView.Light</item>
         <item name="android:listViewWhiteStyle">@style/ListView.Light</item>
+        <item name="android:checkboxStyle">@style/CheckBox.Light</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.Light</item>
+        <item name="android:seekBarStyle">@style/SeekBar.Light</item>
         <item name="textColorToolBarLabel">?android:attr/textColorPrimary</item>
         <item name="textColorOptionLabel">@color/label_light</item>
         <item name="textColorOptionValue">@color/value_light</item>
+        <item name="colorControlActivated">@color/common_tint_light</item>
+
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_light</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_light</item>
     </style>
     <style name="Theme.Dark" parent="@style/Theme.Black">
         <item name="android:windowBackground">@drawable/background_tiled_dark</item>
@@ -104,8 +180,15 @@
         <!-- item name="android:textColor">@android:color/white</item-->
         <item name="android:listViewStyle">@style/ListView.Dark</item>
         <item name="android:listViewWhiteStyle">@style/ListView.Dark</item>
+        <item name="android:checkboxStyle">@style/CheckBox.Dark</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.Dark</item>
+        <item name="android:seekBarStyle">@style/SeekBar.Dark</item>
         <item name="textColorOptionLabel">@color/label_dark</item>
         <item name="textColorOptionValue">@color/value_dark</item>
+        <item name="colorControlActivated">@color/common_tint_dark</item>
+
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_dark</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_dark</item>
     </style>
     <style name="Theme.White" parent="@android:style/Theme.Material.Light">
         <item name="android:windowBackground">@android:color/white</item>
@@ -113,8 +196,9 @@
         <!-- item name="android:textColor">@android:color/black</item-->
         <item name="android:listViewStyle">@style/ListView.White</item>
         <item name="android:listViewWhiteStyle">@style/ListView.White</item>
-        <item name="android:checkboxStyle">@android:style/Widget.Material.Light.CompoundButton.CheckBox</item>
-        <item name="android:radioButtonStyle">@android:style/Widget.Material.Light.CompoundButton.RadioButton</item>
+        <item name="android:checkboxStyle">@style/CheckBox.White</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.White</item>
+        <item name="android:seekBarStyle">@style/SeekBar.White</item>
         <item name="android:buttonStyle">@android:style/Widget.Material.Light.Button</item>
         <item name="android:buttonStyleSmall">@android:style/Widget.Material.Light.Button.Small</item>
         <item name="android:imageButtonStyle">@android:style/Widget.Material.Light.ImageButton</item>
@@ -131,6 +215,7 @@
         <item name="textColorOptionValue">?android:attr/textColorSecondary</item>
         <item name="tts_toolbar_background">#D0808080</item>
         <item name="tabIndicatorBackground">@drawable/tab_indicator_material</item>
+        <item name="colorControlActivated">@color/common_tint_white</item>
 
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev</item>
@@ -199,8 +284,8 @@
         <item name="cr3_button_info_drawable">@drawable/cr3_button_info</item>
         <item name="cr3_button_log_drawable">@drawable/cr3_button_log</item>
         <item name="cr3_button_light_drawable">@drawable/cr3_button_light</item>
-        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc</item>
-        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec</item>
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_white</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_white</item>
 
         <item name="ic_media_ff_drawable">@drawable/ic_media_ff</item>
         <item name="ic_media_play_drawable">@drawable/ic_media_play</item>
@@ -226,14 +311,16 @@
         <!-- item name="android:textColor">@android:color/white</item-->
         <item name="android:listViewStyle">@style/ListView.Black</item>
         <item name="android:listViewWhiteStyle">@style/ListView.Black</item>
-        <item name="android:checkboxStyle">@android:style/Widget.Material.CompoundButton.CheckBox</item>
-        <item name="android:radioButtonStyle">@android:style/Widget.Material.CompoundButton.RadioButton</item>
+        <item name="android:checkboxStyle">@style/CheckBox.Black</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.Black</item>
+        <item name="android:seekBarStyle">@style/SeekBar.Black</item>
         <item name="android:buttonStyle">@android:style/Widget.Material.Button</item>
         <item name="android:buttonStyleSmall">@android:style/Widget.Material.Button.Small</item>
         <item name="android:imageButtonStyle">@android:style/Widget.Material.ImageButton</item>
         <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
         <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
         <item name="android:textAppearanceLarge">@style/TextAppearance.MediumLarge</item>
+        <item name="colorControlActivated">@color/common_tint_black</item>
 
         <!-- toolbar button background -->
         <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background</item>
@@ -312,8 +399,8 @@
         <item name="cr3_button_info_drawable">@drawable/cr3_button_info</item>
         <item name="cr3_button_log_drawable">@drawable/cr3_button_log</item>
         <item name="cr3_button_light_drawable">@drawable/cr3_button_light</item>
-        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc</item>
-        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec</item>
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_dark</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_dark</item>
 
         <item name="ic_media_ff_drawable">@drawable/ic_media_ff</item>
         <item name="ic_media_play_drawable">@drawable/ic_media_play</item>
@@ -367,6 +454,7 @@
         <item name="android:listViewWhiteStyle">@style/ListView.White</item>
         <item name="android:checkboxStyle">@style/CheckBox.HC.Light</item>
         <item name="android:radioButtonStyle">@style/RadioButton.HC.Light</item>
+        <item name="android:seekBarStyle">@style/SeekBar.HC.Light</item>
         <item name="android:buttonStyle">@style/Button.HC.Light</item>
         <item name="android:buttonStyleSmall">@style/Button.HC.Light.Small</item>
         <item name="android:imageButtonStyle">@style/ImageButton.HC.Light</item>
@@ -383,6 +471,7 @@
         <item name="textColorOptionValue">@color/label_hc_light</item>
         <item name="tts_toolbar_background">#FFFFFFFF</item>
         <item name="tabIndicatorBackground">@drawable/tab_indicator_hc_light</item>
+        <item name="colorControlActivated">@color/common_tint_hc_light</item>
 
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev_hc</item>
@@ -480,6 +569,7 @@
         <item name="android:listViewWhiteStyle">@style/ListView.Black</item>
         <item name="android:checkboxStyle">@style/CheckBox.HC.Dark</item>
         <item name="android:radioButtonStyle">@style/RadioButton.HC.Dark</item>
+        <item name="android:seekBarStyle">@style/SeekBar.HC.Dark</item>
         <item name="android:buttonStyle">@style/Button.HC.Dark</item>
         <item name="android:buttonStyleSmall">@style/Button.HC.Dark.Small</item>
         <item name="android:imageButtonStyle">@style/ImageButton.HC.Dark</item>
@@ -496,6 +586,7 @@
         <item name="textColorOptionValue">@color/label_hc_dark</item>
         <item name="tts_toolbar_background">#FFFFFFFF</item>
         <item name="tabIndicatorBackground">@drawable/tab_indicator_hc_dark</item>
+        <item name="colorControlActivated">@color/common_tint_hc_dark</item>
 
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev_hc</item>
diff --git a/android/res/values-v24/styles.xml b/android/res/values-v24/styles.xml
new file mode 100644
index 0000000000..bcd6bf17f5
--- /dev/null
+++ b/android/res/values-v24/styles.xml
@@ -0,0 +1,537 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Switch.Light" parent="@android:style/Widget.Material.Light.CompoundButton.Switch">
+        <item name="android:trackTint">@color/switch_track_tint_light</item>
+        <item name="android:thumbTint">@color/switch_thumb_tint_light</item>
+    </style>
+
+    <style name="Switch.Dark" parent="@android:style/Widget.Material.CompoundButton.Switch">
+        <item name="android:trackTint">@color/switch_track_tint_dark</item>
+        <item name="android:thumbTint">@color/switch_thumb_tint_dark</item>
+    </style>
+
+    <style name="Switch.White" parent="@android:style/Widget.Material.Light.CompoundButton.Switch">
+        <item name="android:trackTint">@color/switch_track_tint_light</item>
+        <item name="android:thumbTint">@color/switch_thumb_tint_white</item>
+    </style>
+
+    <style name="Switch.Black" parent="@android:style/Widget.Material.CompoundButton.Switch">
+        <item name="android:trackTint">@color/switch_track_tint_dark</item>
+        <item name="android:thumbTint">@color/switch_thumb_tint_black</item>
+    </style>
+
+    <style name="Switch.HC.Light" parent="@android:style/Widget.Material.Light.CompoundButton.Switch">
+        <item name="android:trackTint">@color/switch_track_tint_hc_light</item>
+        <item name="android:thumbTint">@color/switch_thumb_tint_hc_light</item>
+    </style>
+
+    <style name="Switch.HC.Dark" parent="@android:style/Widget.Material.CompoundButton.Switch">
+        <item name="android:trackTint">@color/switch_track_tint_hc_dark</item>
+        <item name="android:thumbTint">@color/switch_thumb_tint_hc_dark</item>
+    </style>
+
+    <style name="Theme.Light" parent="@style/Theme.White">
+        <item name="android:windowBackground">@drawable/background_tiled_light</item>
+        <item name="android:colorBackground">#ffe0e0e0</item>
+        <item name="android:listViewStyle">@style/ListView.Light</item>
+        <item name="android:listViewWhiteStyle">@style/ListView.Light</item>
+        <item name="android:checkboxStyle">@style/CheckBox.Light</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.Light</item>
+        <item name="android:switchStyle">@style/Switch.Light</item>
+        <item name="android:seekBarStyle">@style/SeekBar.Light</item>
+        <item name="textColorToolBarLabel">?android:attr/textColorPrimary</item>
+        <item name="textColorOptionLabel">@color/label_light</item>
+        <item name="textColorOptionValue">@color/value_light</item>
+        <item name="colorControlActivated">@color/common_tint_light</item>
+
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_light</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_light</item>
+    </style>
+
+    <style name="Theme.Dark" parent="@style/Theme.Black">
+        <item name="android:windowBackground">@drawable/background_tiled_dark</item>
+        <item name="android:colorBackground">#ff302030</item>
+        <item name="android:listViewStyle">@style/ListView.Dark</item>
+        <item name="android:listViewWhiteStyle">@style/ListView.Dark</item>
+        <item name="android:checkboxStyle">@style/CheckBox.Dark</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.Dark</item>
+        <item name="android:switchStyle">@style/Switch.Dark</item>
+        <item name="android:seekBarStyle">@style/SeekBar.Dark</item>
+        <item name="textColorOptionLabel">@color/label_dark</item>
+        <item name="textColorOptionValue">@color/value_dark</item>
+        <item name="colorControlActivated">@color/common_tint_dark</item>
+
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_dark</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_dark</item>
+    </style>
+
+    <style name="Theme.White" parent="@android:style/Theme.Material.Light">
+        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:colorBackground">@android:color/white</item>
+        <!-- item name="android:textColor">@android:color/black</item-->
+        <item name="android:listViewStyle">@style/ListView.White</item>
+        <item name="android:listViewWhiteStyle">@style/ListView.White</item>
+        <item name="android:checkboxStyle">@style/CheckBox.White</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.White</item>
+        <item name="android:switchStyle">@style/Switch.White</item>
+        <item name="android:seekBarStyle">@style/SeekBar.White</item>
+        <item name="android:buttonStyle">@android:style/Widget.Material.Light.Button</item>
+        <item name="android:buttonStyleSmall">@android:style/Widget.Material.Light.Button.Small</item>
+        <item name="android:imageButtonStyle">@android:style/Widget.Material.Light.ImageButton</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+        <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+        <item name="android:textAppearanceLarge">@style/TextAppearance.MediumLarge</item>
+
+        <!-- toolbar button background -->
+        <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#40404040</item>
+        <item name="textColorToolBarLabel">?android:attr/textColorSecondary</item>
+        <item name="textColorOptionLabel">?android:attr/textColorPrimary</item>
+        <item name="textColorOptionValue">?android:attr/textColorSecondary</item>
+        <item name="tts_toolbar_background">#D0808080</item>
+        <item name="tabIndicatorBackground">@drawable/tab_indicator_material</item>
+        <item name="colorControlActivated">@color/common_tint_white</item>
+
+        <!-- icons -->
+        <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev</item>
+        <item name="cr3_button_next_drawable">@drawable/cr3_button_next</item>
+        <item name="cr3_viewer_toc_drawable">@drawable/cr3_viewer_toc</item>
+        <item name="cr3_viewer_find_drawable">@drawable/cr3_viewer_find</item>
+        <item name="cr3_viewer_settings_drawable">@drawable/cr3_viewer_settings</item>
+        <item name="cr3_button_bookmarks_drawable">@drawable/cr3_button_bookmarks</item>
+        <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root</item>
+        <item name="cr3_option_night_drawable">@drawable/cr3_option_night</item>
+        <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts</item>
+        <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent</item>
+        <item name="cr3_button_scroll_go_drawable">@drawable/cr3_button_scroll_go</item>
+        <item name="cr3_btn_books_swap_drawable">@drawable/cr3_btn_books_swap</item>
+        <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
+        <item name="cr3_viewer_exit_drawable">@drawable/cr3_viewer_exit</item>
+        <item name="cr3_button_book_open_drawable">@drawable/cr3_button_book_open</item>
+        <item name="cr3_browser_folder_current_book_drawable">@drawable/cr3_browser_folder_current_book</item>
+        <item name="cr3_browser_folder_opds_drawable">@drawable/cr3_browser_folder_opds</item>
+        <item name="cr3_browser_folder_opds_add_drawable">@drawable/cr3_browser_folder_opds_add</item>
+        <item name="cr3_button_folder_go_drawable">@drawable/cr3_button_folder_go</item>
+        <item name="cr3_option_font_face_drawable">@drawable/cr3_option_font_face</item>
+        <item name="cr3_option_font_size_drawable">@drawable/cr3_option_font_size</item>
+        <item name="cr3_option_text_bold_drawable">@drawable/cr3_option_text_bold</item>
+        <item name="cr3_option_text_italic_drawable">@drawable/cr3_option_text_italic</item>
+        <item name="cr3_option_text_underline_drawable">@drawable/cr3_option_text_underline</item>
+        <item name="cr3_option_text_superscript_drawable">@drawable/cr3_option_text_superscript</item>
+        <item name="cr3_option_text_antialias_drawable">@drawable/cr3_option_text_antialias</item>
+        <item name="cr3_option_line_spacing_drawable">@drawable/cr3_option_line_spacing</item>
+        <item name="cr3_option_text_hyphenation_drawable">@drawable/cr3_option_text_hyphenation</item>
+        <item name="cr3_option_text_floating_punct_drawable">@drawable/cr3_option_text_other</item>
+        <item name="cr3_option_text_kerning_drawable">@drawable/cr3_option_text_kerning</item>
+        <item name="cr3_option_text_ligatures_drawable">@drawable/cr3_option_text_ligatures</item>
+        <item name="cr3_option_text_multilang_drawable">@drawable/cr3_option_text_multilang</item>
+        <item name="cr3_option_images_drawable">@drawable/cr3_option_images</item>
+        <item name="cr3_option_font_gamma_drawable">@drawable/cr3_option_font_gamma</item>
+        <item name="cr3_option_text_width_drawable">@drawable/cr3_option_text_width</item>
+        <item name="cr3_option_fullscreen_drawable">@drawable/cr3_option_fullscreen</item>
+        <item name="cr3_option_view_mode_scroll_drawable">@drawable/cr3_option_view_mode_scroll</item>
+        <item name="cr3_option_page_orientation_landscape_drawable">@drawable/cr3_option_page_orientation_landscape</item>
+        <item name="cr3_option_pages_two_drawable">@drawable/cr3_option_pages_two</item>
+        <item name="cr3_option_text_margin_left_drawable">@drawable/cr3_option_text_margin_left</item>
+        <item name="cr3_option_text_margin_right_drawable">@drawable/cr3_option_text_margin_right</item>
+        <item name="cr3_option_text_margin_top_drawable">@drawable/cr3_option_text_margin_top</item>
+        <item name="cr3_option_text_margin_bottom_drawable">@drawable/cr3_option_text_margin_bottom</item>
+        <item name="cr3_option_text_align_drawable">@drawable/cr3_option_text_align</item>
+        <item name="cr3_option_text_indent_drawable">@drawable/cr3_option_text_indent</item>
+        <item name="cr3_option_text_hinting_drawable">@drawable/cr3_option_text_hinting</item>
+        <item name="cr3_option_controls_keys_drawable">@drawable/cr3_option_controls_keys</item>
+        <item name="cr3_option_controls_tapzones_drawable">@drawable/cr3_option_controls_tapzones</item>
+        <item name="cr3_option_other_drawable">@drawable/cr3_option_other</item>
+        <item name="cr3_browser_folder_authors_drawable">@drawable/cr3_browser_folder_authors</item>
+        <item name="cr3_browser_folder_zip_drawable">@drawable/cr3_browser_folder_zip</item>
+        <item name="cr3_browser_find_drawable">@drawable/cr3_browser_find</item>
+        <item name="cr3_browser_back_drawable">@drawable/cr3_browser_back</item>
+        <item name="cr3_button_add_drawable">@drawable/cr3_button_add</item>
+        <item name="cr3_button_ok_drawable">@drawable/cr3_button_ok</item>
+        <item name="cr3_button_cancel_drawable">@drawable/cr3_button_cancel</item>
+        <item name="cr3_button_remove_drawable">@drawable/cr3_button_remove</item>
+        <item name="cr3_button_more_drawable">@drawable/cr3_button_more</item>
+        <item name="cr3_browser_book_drawable">@drawable/cr3_browser_book</item>
+        <item name="cr3_button_info_drawable">@drawable/cr3_button_info</item>
+        <item name="cr3_button_log_drawable">@drawable/cr3_button_log</item>
+        <item name="cr3_button_light_drawable">@drawable/cr3_button_light</item>
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_white</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_white</item>
+
+        <item name="ic_media_ff_drawable">@drawable/ic_media_ff</item>
+        <item name="ic_media_play_drawable">@drawable/ic_media_play</item>
+        <item name="ic_media_rew_drawable">@drawable/ic_media_rew</item>
+        <item name="ic_media_stop_drawable">@drawable/ic_media_stop</item>
+        <item name="ic_media_pause_drawable">@drawable/ic_media_pause</item>
+        <item name="ic_menu_copy_drawable">@drawable/ic_menu_copy</item>
+        <item name="ic_menu_sort_alphabetically_drawable">@drawable/ic_menu_sort_alphabetically</item>
+        <item name="ic_menu_star_drawable">@drawable/ic_menu_star</item>
+        <item name="ic_menu_compose_drawable">@drawable/ic_menu_compose</item>
+        <item name="ic_menu_search_drawable">@drawable/ic_menu_search</item>
+        <item name="ic_menu_close_clear_cancel_drawable">@drawable/ic_menu_close_clear_cancel</item>
+
+        <item name="google_drive_drawable">@drawable/google_drive</item>
+
+        <item name="folder_big_drawable">@drawable/folder_blue</item>
+        <item name="folder_big_bookmark_drawable">@drawable/folder_bookmark</item>
+        <item name="media_flash_microsd_drawable">@drawable/media_flash_sd_mmc</item>
+    </style>
+
+    <style name="Theme.Black" parent="@android:style/Theme.Material">
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:colorBackground">@android:color/black</item>
+        <!-- item name="android:textColor">@android:color/white</item-->
+        <item name="android:listViewStyle">@style/ListView.Black</item>
+        <item name="android:listViewWhiteStyle">@style/ListView.Black</item>
+        <item name="android:checkboxStyle">@style/CheckBox.Black</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.Black</item>
+        <item name="android:switchStyle">@style/Switch.Black</item>
+        <item name="android:seekBarStyle">@style/SeekBar.Black</item>
+        <item name="android:buttonStyle">@android:style/Widget.Material.Button</item>
+        <item name="android:buttonStyleSmall">@android:style/Widget.Material.Button.Small</item>
+        <item name="android:imageButtonStyle">@android:style/Widget.Material.ImageButton</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+        <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+        <item name="android:textAppearanceLarge">@style/TextAppearance.MediumLarge</item>
+        <item name="colorControlActivated">@color/common_tint_black</item>
+
+        <!-- toolbar button background -->
+        <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#40404040</item>
+        <item name="textColorToolBarLabel">?android:attr/textColorSecondary</item>
+        <item name="textColorOptionLabel">?android:attr/textColorPrimary</item>
+        <item name="textColorOptionValue">?android:attr/textColorSecondary</item>
+        <item name="tts_toolbar_background">#D0808080</item>
+        <item name="tabIndicatorBackground">@drawable/tab_indicator_material</item>
+
+        <!-- icons -->
+        <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev</item>
+        <item name="cr3_button_next_drawable">@drawable/cr3_button_next</item>
+        <item name="cr3_viewer_toc_drawable">@drawable/cr3_viewer_toc</item>
+        <item name="cr3_viewer_find_drawable">@drawable/cr3_viewer_find</item>
+        <item name="cr3_viewer_settings_drawable">@drawable/cr3_viewer_settings</item>
+        <item name="cr3_button_bookmarks_drawable">@drawable/cr3_button_bookmarks</item>
+        <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root</item>
+        <item name="cr3_option_night_drawable">@drawable/cr3_option_night</item>
+        <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts</item>
+        <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent</item>
+        <item name="cr3_button_scroll_go_drawable">@drawable/cr3_button_scroll_go</item>
+        <item name="cr3_btn_books_swap_drawable">@drawable/cr3_btn_books_swap</item>
+        <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
+        <item name="cr3_viewer_exit_drawable">@drawable/cr3_viewer_exit</item>
+        <item name="cr3_button_book_open_drawable">@drawable/cr3_button_book_open</item>
+        <item name="cr3_browser_folder_current_book_drawable">@drawable/cr3_browser_folder_current_book</item>
+        <item name="cr3_browser_folder_opds_drawable">@drawable/cr3_browser_folder_opds</item>
+        <item name="cr3_browser_folder_opds_add_drawable">@drawable/cr3_browser_folder_opds_add</item>
+        <item name="cr3_button_folder_go_drawable">@drawable/cr3_button_folder_go</item>
+        <item name="cr3_option_font_face_drawable">@drawable/cr3_option_font_face</item>
+        <item name="cr3_option_font_size_drawable">@drawable/cr3_option_font_size</item>
+        <item name="cr3_option_text_bold_drawable">@drawable/cr3_option_text_bold</item>
+        <item name="cr3_option_text_italic_drawable">@drawable/cr3_option_text_italic</item>
+        <item name="cr3_option_text_underline_drawable">@drawable/cr3_option_text_underline</item>
+        <item name="cr3_option_text_superscript_drawable">@drawable/cr3_option_text_superscript</item>
+        <item name="cr3_option_text_antialias_drawable">@drawable/cr3_option_text_antialias</item>
+        <item name="cr3_option_line_spacing_drawable">@drawable/cr3_option_line_spacing</item>
+        <item name="cr3_option_text_hyphenation_drawable">@drawable/cr3_option_text_hyphenation</item>
+        <item name="cr3_option_text_floating_punct_drawable">@drawable/cr3_option_text_other</item>
+        <item name="cr3_option_text_kerning_drawable">@drawable/cr3_option_text_kerning</item>
+        <item name="cr3_option_text_ligatures_drawable">@drawable/cr3_option_text_ligatures</item>
+        <item name="cr3_option_text_multilang_drawable">@drawable/cr3_option_text_multilang</item>
+        <item name="cr3_option_images_drawable">@drawable/cr3_option_images</item>
+        <item name="cr3_option_font_gamma_drawable">@drawable/cr3_option_font_gamma</item>
+        <item name="cr3_option_text_width_drawable">@drawable/cr3_option_text_width</item>
+        <item name="cr3_option_fullscreen_drawable">@drawable/cr3_option_fullscreen</item>
+        <item name="cr3_option_view_mode_scroll_drawable">@drawable/cr3_option_view_mode_scroll</item>
+        <item name="cr3_option_page_orientation_landscape_drawable">@drawable/cr3_option_page_orientation_landscape</item>
+        <item name="cr3_option_pages_two_drawable">@drawable/cr3_option_pages_two</item>
+        <item name="cr3_option_text_margin_left_drawable">@drawable/cr3_option_text_margin_left</item>
+        <item name="cr3_option_text_margin_right_drawable">@drawable/cr3_option_text_margin_right</item>
+        <item name="cr3_option_text_margin_top_drawable">@drawable/cr3_option_text_margin_top</item>
+        <item name="cr3_option_text_margin_bottom_drawable">@drawable/cr3_option_text_margin_bottom</item>
+        <item name="cr3_option_text_align_drawable">@drawable/cr3_option_text_align</item>
+        <item name="cr3_option_text_indent_drawable">@drawable/cr3_option_text_indent</item>
+        <item name="cr3_option_text_hinting_drawable">@drawable/cr3_option_text_hinting</item>
+        <item name="cr3_option_controls_keys_drawable">@drawable/cr3_option_controls_keys</item>
+        <item name="cr3_option_controls_tapzones_drawable">@drawable/cr3_option_controls_tapzones</item>
+        <item name="cr3_option_other_drawable">@drawable/cr3_option_other</item>
+        <item name="cr3_browser_folder_authors_drawable">@drawable/cr3_browser_folder_authors</item>
+        <item name="cr3_browser_folder_zip_drawable">@drawable/cr3_browser_folder_zip</item>
+        <item name="cr3_browser_find_drawable">@drawable/cr3_browser_find</item>
+        <item name="cr3_browser_back_drawable">@drawable/cr3_browser_back</item>
+        <item name="cr3_button_add_drawable">@drawable/cr3_button_add</item>
+        <item name="cr3_button_ok_drawable">@drawable/cr3_button_ok</item>
+        <item name="cr3_button_cancel_drawable">@drawable/cr3_button_cancel</item>
+        <item name="cr3_button_remove_drawable">@drawable/cr3_button_remove</item>
+        <item name="cr3_button_more_drawable">@drawable/cr3_button_more</item>
+        <item name="cr3_browser_book_drawable">@drawable/cr3_browser_book</item>
+        <item name="cr3_button_info_drawable">@drawable/cr3_button_info</item>
+        <item name="cr3_button_log_drawable">@drawable/cr3_button_log</item>
+        <item name="cr3_button_light_drawable">@drawable/cr3_button_light</item>
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_dark</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_dark</item>
+
+        <item name="ic_media_ff_drawable">@drawable/ic_media_ff</item>
+        <item name="ic_media_play_drawable">@drawable/ic_media_play</item>
+        <item name="ic_media_rew_drawable">@drawable/ic_media_rew</item>
+        <item name="ic_media_stop_drawable">@drawable/ic_media_stop</item>
+        <item name="ic_media_pause_drawable">@drawable/ic_media_pause</item>
+        <item name="ic_menu_copy_drawable">@drawable/ic_menu_copy</item>
+        <item name="ic_menu_sort_alphabetically_drawable">@drawable/ic_menu_sort_alphabetically</item>
+        <item name="ic_menu_star_drawable">@drawable/ic_menu_star</item>
+        <item name="ic_menu_compose_drawable">@drawable/ic_menu_compose</item>
+        <item name="ic_menu_search_drawable">@drawable/ic_menu_search</item>
+        <item name="ic_menu_close_clear_cancel_drawable">@drawable/ic_menu_close_clear_cancel</item>
+
+        <item name="google_drive_drawable">@drawable/google_drive</item>
+
+        <item name="folder_big_drawable">@drawable/folder_blue</item>
+        <item name="folder_big_bookmark_drawable">@drawable/folder_bookmark</item>
+        <item name="media_flash_microsd_drawable">@drawable/media_flash_sd_mmc</item>
+    </style>
+
+    <style name="Theme.HiContrast1" parent="@android:style/Theme.Material.Light">
+        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:colorBackground">@android:color/white</item>
+        <!-- item name="android:textColor">@android:color/black</item -->
+        <item name="android:listViewStyle">@style/ListView.White</item>
+        <item name="android:listViewWhiteStyle">@style/ListView.White</item>
+        <item name="android:checkboxStyle">@style/CheckBox.HC.Light</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.HC.Light</item>
+        <item name="android:switchStyle">@style/Switch.HC.Light</item>
+        <item name="android:seekBarStyle">@style/SeekBar.HC.Light</item>
+        <item name="android:buttonStyle">@style/Button.HC.Light</item>
+        <item name="android:buttonStyleSmall">@style/Button.HC.Light.Small</item>
+        <item name="android:imageButtonStyle">@style/ImageButton.HC.Light</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+        <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+        <item name="android:textAppearanceLarge">@style/TextAppearance.MediumLarge</item>
+
+        <!-- toolbar button background -->
+        <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background_hc</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#FFFFFFFF</item>
+        <item name="textColorToolBarLabel">@color/label_hc_light</item>
+        <item name="textColorOptionLabel">@color/label_hc_light</item>
+        <item name="textColorOptionValue">@color/label_hc_light</item>
+        <item name="tts_toolbar_background">#FFFFFFFF</item>
+        <item name="tabIndicatorBackground">@drawable/tab_indicator_hc_light</item>
+        <item name="colorControlActivated">@color/common_tint_hc_light</item>
+
+        <!-- icons -->
+        <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev_hc</item>
+        <item name="cr3_button_next_drawable">@drawable/cr3_button_next_hc</item>
+        <item name="cr3_viewer_toc_drawable">@drawable/cr3_viewer_toc_hc</item>
+        <item name="cr3_viewer_find_drawable">@drawable/cr3_viewer_find_hc</item>
+        <item name="cr3_viewer_settings_drawable">@drawable/cr3_viewer_settings_hc</item>
+        <item name="cr3_button_bookmarks_drawable">@drawable/cr3_button_bookmarks_hc</item>
+        <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root_hc</item>
+        <item name="cr3_option_night_drawable">@drawable/cr3_option_night_hc</item>
+        <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch_hc</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page_hc</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent_hc</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder_hc</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts_hc</item>
+        <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent_hc</item>
+        <item name="cr3_button_scroll_go_drawable">@drawable/cr3_button_scroll_go_hc</item>
+        <item name="cr3_btn_books_swap_drawable">@drawable/cr3_btn_books_swap_hc</item>
+        <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button_hc</item>
+        <item name="cr3_viewer_exit_drawable">@drawable/cr3_viewer_exit_hc</item>
+        <item name="cr3_button_book_open_drawable">@drawable/cr3_button_book_open_hc</item>
+        <item name="cr3_browser_folder_current_book_drawable">@drawable/cr3_browser_folder_current_book_hc</item>
+        <item name="cr3_browser_folder_opds_drawable">@drawable/cr3_browser_folder_opds_hc</item>
+        <item name="cr3_browser_folder_opds_add_drawable">@drawable/cr3_browser_folder_opds_add_hc</item>
+        <item name="cr3_button_folder_go_drawable">@drawable/cr3_button_folder_go_hc</item>
+        <item name="cr3_option_font_face_drawable">@drawable/cr3_option_font_face_hc</item>
+        <item name="cr3_option_font_size_drawable">@drawable/cr3_option_font_size_hc</item>
+        <item name="cr3_option_text_bold_drawable">@drawable/cr3_option_text_bold_hc</item>
+        <item name="cr3_option_text_italic_drawable">@drawable/cr3_option_text_italic_hc</item>
+        <item name="cr3_option_text_underline_drawable">@drawable/cr3_option_text_underline_hc</item>
+        <item name="cr3_option_text_superscript_drawable">@drawable/cr3_option_text_superscript_hc</item>
+        <item name="cr3_option_text_antialias_drawable">@drawable/cr3_option_text_antialias_hc</item>
+        <item name="cr3_option_line_spacing_drawable">@drawable/cr3_option_line_spacing_hc</item>
+        <item name="cr3_option_text_hyphenation_drawable">@drawable/cr3_option_text_hyphenation_hc</item>
+        <item name="cr3_option_text_floating_punct_drawable">@drawable/cr3_option_text_floating_punct_hc</item>
+        <item name="cr3_option_text_kerning_drawable">@drawable/cr3_option_text_kerning_hc</item>
+        <item name="cr3_option_text_ligatures_drawable">@drawable/cr3_option_text_ligatures_hc</item>
+        <item name="cr3_option_text_multilang_drawable">@drawable/cr3_option_text_multilang_hc</item>
+        <item name="cr3_option_images_drawable">@drawable/cr3_option_images_hc</item>
+        <item name="cr3_option_font_gamma_drawable">@drawable/cr3_option_font_gamma_hc</item>
+        <item name="cr3_option_text_width_drawable">@drawable/cr3_option_text_width_hc</item>
+        <item name="cr3_option_fullscreen_drawable">@drawable/cr3_option_fullscreen_hc</item>
+        <item name="cr3_option_view_mode_scroll_drawable">@drawable/cr3_option_view_mode_scroll_hc</item>
+        <item name="cr3_option_page_orientation_landscape_drawable">@drawable/cr3_option_page_orientation_landscape_hc</item>
+        <item name="cr3_option_pages_two_drawable">@drawable/cr3_option_pages_two_hc</item>
+        <item name="cr3_option_text_margin_left_drawable">@drawable/cr3_option_text_margin_left_hc</item>
+        <item name="cr3_option_text_margin_right_drawable">@drawable/cr3_option_text_margin_right_hc</item>
+        <item name="cr3_option_text_margin_top_drawable">@drawable/cr3_option_text_margin_top_hc</item>
+        <item name="cr3_option_text_margin_bottom_drawable">@drawable/cr3_option_text_margin_bottom_hc</item>
+        <item name="cr3_option_text_align_drawable">@drawable/cr3_option_text_align_hc</item>
+        <item name="cr3_option_text_indent_drawable">@drawable/cr3_option_text_indent_hc</item>
+        <item name="cr3_option_text_hinting_drawable">@drawable/cr3_option_text_hinting_hc</item>
+        <item name="cr3_option_controls_keys_drawable">@drawable/cr3_option_controls_keys_hc</item>
+        <item name="cr3_option_controls_tapzones_drawable">@drawable/cr3_option_controls_tapzones_hc</item>
+        <item name="cr3_option_other_drawable">@drawable/cr3_option_other_hc</item>
+        <item name="cr3_browser_folder_authors_drawable">@drawable/cr3_browser_folder_authors_hc</item>
+        <item name="cr3_browser_folder_zip_drawable">@drawable/cr3_browser_folder_zip_hc</item>
+        <item name="cr3_browser_find_drawable">@drawable/cr3_browser_find_hc</item>
+        <item name="cr3_browser_back_drawable">@drawable/cr3_browser_back_hc</item>
+        <item name="cr3_button_add_drawable">@drawable/cr3_button_add_hc</item>
+        <item name="cr3_button_ok_drawable">@drawable/cr3_button_ok_hc</item>
+        <item name="cr3_button_cancel_drawable">@drawable/cr3_button_cancel_hc</item>
+        <item name="cr3_button_remove_drawable">@drawable/cr3_button_remove_hc</item>
+        <item name="cr3_button_more_drawable">@drawable/cr3_button_more_hc</item>
+        <item name="cr3_browser_book_drawable">@drawable/cr3_browser_book_hc</item>
+        <item name="cr3_button_info_drawable">@drawable/cr3_button_info_hc</item>
+        <item name="cr3_button_log_drawable">@drawable/cr3_button_log_hc</item>
+        <item name="cr3_button_light_drawable">@drawable/cr3_button_light_hc</item>
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_hc</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_hc</item>
+
+        <item name="ic_media_ff_drawable">@drawable/ic_media_ff_hc</item>
+        <item name="ic_media_play_drawable">@drawable/ic_media_play_hc</item>
+        <item name="ic_media_rew_drawable">@drawable/ic_media_rew_hc</item>
+        <item name="ic_media_stop_drawable">@drawable/ic_media_stop_hc</item>
+        <item name="ic_media_pause_drawable">@drawable/ic_media_pause_hc</item>
+        <item name="ic_menu_copy_drawable">@drawable/ic_menu_copy_hc</item>
+        <item name="ic_menu_sort_alphabetically_drawable">@drawable/ic_menu_sort_alphabetically_hc</item>
+        <item name="ic_menu_star_drawable">@drawable/ic_menu_star_hc</item>
+        <item name="ic_menu_compose_drawable">@drawable/ic_menu_compose_hc</item>
+        <item name="ic_menu_search_drawable">@drawable/ic_menu_search_hc</item>
+        <item name="ic_menu_close_clear_cancel_drawable">@drawable/ic_menu_close_clear_cancel_hc</item>
+
+        <item name="google_drive_drawable">@drawable/google_drive_mono</item>
+
+        <item name="folder_big_drawable">@drawable/folder_big_hc</item>
+        <item name="folder_big_bookmark_drawable">@drawable/folder_big_bookmark_hc</item>
+        <item name="media_flash_microsd_drawable">@drawable/media_flash_microsd</item>
+    </style>
+
+    <style name="Theme.HiContrast2" parent="@android:style/Theme.Material">
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:colorBackground">@android:color/black</item>
+        <!-- item name="android:textColor">@android:color/white</item-->
+        <item name="android:listViewStyle">@style/ListView.Black</item>
+        <item name="android:listViewWhiteStyle">@style/ListView.Black</item>
+        <item name="android:checkboxStyle">@style/CheckBox.HC.Dark</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.HC.Dark</item>
+        <item name="android:switchStyle">@style/Switch.HC.Dark</item>
+        <item name="android:seekBarStyle">@style/SeekBar.HC.Dark</item>
+        <item name="android:buttonStyle">@style/Button.HC.Dark</item>
+        <item name="android:buttonStyleSmall">@style/Button.HC.Dark.Small</item>
+        <item name="android:imageButtonStyle">@style/ImageButton.HC.Dark</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+        <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+        <item name="android:textAppearanceLarge">@style/TextAppearance.MediumLarge</item>
+
+        <!-- toolbar button background -->
+        <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background_hc</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#40404040</item>
+        <item name="textColorToolBarLabel">@color/label_hc_dark</item>
+        <item name="textColorOptionLabel">@color/label_hc_dark</item>
+        <item name="textColorOptionValue">@color/label_hc_dark</item>
+        <item name="tts_toolbar_background">#FFFFFFFF</item>
+        <item name="tabIndicatorBackground">@drawable/tab_indicator_hc_dark</item>
+        <item name="colorControlActivated">@color/common_tint_hc_dark</item>
+
+        <!-- icons -->
+        <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev_hc</item>
+        <item name="cr3_button_next_drawable">@drawable/cr3_button_next_hc</item>
+        <item name="cr3_viewer_toc_drawable">@drawable/cr3_viewer_toc_hc</item>
+        <item name="cr3_viewer_find_drawable">@drawable/cr3_viewer_find_hc</item>
+        <item name="cr3_viewer_settings_drawable">@drawable/cr3_viewer_settings_hc</item>
+        <item name="cr3_button_bookmarks_drawable">@drawable/cr3_button_bookmarks_hc</item>
+        <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root_hc</item>
+        <item name="cr3_option_night_drawable">@drawable/cr3_option_night_hc</item>
+        <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch_hc</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page_hc</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent_hc</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder_hc</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts_hc</item>
+        <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent_hc</item>
+        <item name="cr3_button_scroll_go_drawable">@drawable/cr3_button_scroll_go_hc</item>
+        <item name="cr3_btn_books_swap_drawable">@drawable/cr3_btn_books_swap_hc</item>
+        <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button_hc</item>
+        <item name="cr3_viewer_exit_drawable">@drawable/cr3_viewer_exit_hc</item>
+        <item name="cr3_button_book_open_drawable">@drawable/cr3_button_book_open_hc</item>
+        <item name="cr3_browser_folder_current_book_drawable">@drawable/cr3_browser_folder_current_book_hc</item>
+        <item name="cr3_browser_folder_opds_drawable">@drawable/cr3_browser_folder_opds_hc</item>
+        <item name="cr3_browser_folder_opds_add_drawable">@drawable/cr3_browser_folder_opds_add_hc</item>
+        <item name="cr3_button_folder_go_drawable">@drawable/cr3_button_folder_go_hc</item>
+        <item name="cr3_option_font_face_drawable">@drawable/cr3_option_font_face_hc</item>
+        <item name="cr3_option_font_size_drawable">@drawable/cr3_option_font_size_hc</item>
+        <item name="cr3_option_text_bold_drawable">@drawable/cr3_option_text_bold_hc</item>
+        <item name="cr3_option_text_italic_drawable">@drawable/cr3_option_text_italic_hc</item>
+        <item name="cr3_option_text_underline_drawable">@drawable/cr3_option_text_underline_hc</item>
+        <item name="cr3_option_text_superscript_drawable">@drawable/cr3_option_text_superscript_hc</item>
+        <item name="cr3_option_text_antialias_drawable">@drawable/cr3_option_text_antialias_hc</item>
+        <item name="cr3_option_line_spacing_drawable">@drawable/cr3_option_line_spacing_hc</item>
+        <item name="cr3_option_text_hyphenation_drawable">@drawable/cr3_option_text_hyphenation_hc</item>
+        <item name="cr3_option_text_floating_punct_drawable">@drawable/cr3_option_text_floating_punct_hc</item>
+        <item name="cr3_option_text_kerning_drawable">@drawable/cr3_option_text_kerning_hc</item>
+        <item name="cr3_option_text_ligatures_drawable">@drawable/cr3_option_text_ligatures_hc</item>
+        <item name="cr3_option_text_multilang_drawable">@drawable/cr3_option_text_multilang_hc</item>
+        <item name="cr3_option_images_drawable">@drawable/cr3_option_images_hc</item>
+        <item name="cr3_option_font_gamma_drawable">@drawable/cr3_option_font_gamma_hc</item>
+        <item name="cr3_option_text_width_drawable">@drawable/cr3_option_text_width_hc</item>
+        <item name="cr3_option_fullscreen_drawable">@drawable/cr3_option_fullscreen_hc</item>
+        <item name="cr3_option_view_mode_scroll_drawable">@drawable/cr3_option_view_mode_scroll_hc</item>
+        <item name="cr3_option_page_orientation_landscape_drawable">@drawable/cr3_option_page_orientation_landscape_hc</item>
+        <item name="cr3_option_pages_two_drawable">@drawable/cr3_option_pages_two_hc</item>
+        <item name="cr3_option_text_margin_left_drawable">@drawable/cr3_option_text_margin_left_hc</item>
+        <item name="cr3_option_text_margin_right_drawable">@drawable/cr3_option_text_margin_right_hc</item>
+        <item name="cr3_option_text_margin_top_drawable">@drawable/cr3_option_text_margin_top_hc</item>
+        <item name="cr3_option_text_margin_bottom_drawable">@drawable/cr3_option_text_margin_bottom_hc</item>
+        <item name="cr3_option_text_align_drawable">@drawable/cr3_option_text_align_hc</item>
+        <item name="cr3_option_text_indent_drawable">@drawable/cr3_option_text_indent_hc</item>
+        <item name="cr3_option_text_hinting_drawable">@drawable/cr3_option_text_hinting_hc</item>
+        <item name="cr3_option_controls_keys_drawable">@drawable/cr3_option_controls_keys_hc</item>
+        <item name="cr3_option_controls_tapzones_drawable">@drawable/cr3_option_controls_tapzones_hc</item>
+        <item name="cr3_option_other_drawable">@drawable/cr3_option_other_hc</item>
+        <item name="cr3_browser_folder_authors_drawable">@drawable/cr3_browser_folder_authors_hc</item>
+        <item name="cr3_browser_folder_zip_drawable">@drawable/cr3_browser_folder_zip_hc</item>
+        <item name="cr3_browser_find_drawable">@drawable/cr3_browser_find_hc</item>
+        <item name="cr3_browser_back_drawable">@drawable/cr3_browser_back_hc</item>
+        <item name="cr3_button_add_drawable">@drawable/cr3_button_add_hc</item>
+        <item name="cr3_button_ok_drawable">@drawable/cr3_button_ok_hc</item>
+        <item name="cr3_button_cancel_drawable">@drawable/cr3_button_cancel_hc</item>
+        <item name="cr3_button_remove_drawable">@drawable/cr3_button_remove_hc</item>
+        <item name="cr3_button_more_drawable">@drawable/cr3_button_more_hc</item>
+        <item name="cr3_browser_book_drawable">@drawable/cr3_browser_book_hc</item>
+        <item name="cr3_button_info_drawable">@drawable/cr3_button_info_hc</item>
+        <item name="cr3_button_log_drawable">@drawable/cr3_button_log_hc</item>
+        <item name="cr3_button_light_drawable">@drawable/cr3_button_light_hc</item>
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_hc</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_hc</item>
+
+        <item name="ic_media_ff_drawable">@drawable/ic_media_ff_hc</item>
+        <item name="ic_media_play_drawable">@drawable/ic_media_play_hc</item>
+        <item name="ic_media_rew_drawable">@drawable/ic_media_rew_hc</item>
+        <item name="ic_media_stop_drawable">@drawable/ic_media_stop_hc</item>
+        <item name="ic_media_pause_drawable">@drawable/ic_media_pause_hc</item>
+        <item name="ic_menu_copy_drawable">@drawable/ic_menu_copy_hc</item>
+        <item name="ic_menu_sort_alphabetically_drawable">@drawable/ic_menu_sort_alphabetically_hc</item>
+        <item name="ic_menu_star_drawable">@drawable/ic_menu_star_hc</item>
+        <item name="ic_menu_compose_drawable">@drawable/ic_menu_compose_hc</item>
+        <item name="ic_menu_search_drawable">@drawable/ic_menu_search_hc</item>
+        <item name="ic_menu_close_clear_cancel_drawable">@drawable/ic_menu_close_clear_cancel_hc</item>
+
+        <item name="google_drive_drawable">@drawable/google_drive_mono</item>
+
+        <item name="folder_big_drawable">@drawable/folder_big_hc</item>
+        <item name="folder_big_bookmark_drawable">@drawable/folder_big_bookmark_hc</item>
+        <item name="media_flash_microsd_drawable">@drawable/media_flash_microsd</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/android/res/values/attrs.xml b/android/res/values/attrs.xml
index 51815ac785..52384388e8 100644
--- a/android/res/values/attrs.xml
+++ b/android/res/values/attrs.xml
@@ -17,6 +17,7 @@
     <attr name="tabbarBackground" format="reference|color" />
     <attr name="tabIndicatorBackground" format="reference|color" />
     <attr name="tts_toolbar_background" format="reference|color" />
+    <attr name="colorControlActivated" format="reference|color" />
     <attr name="cr3_toolbar_button_background_drawable" format="reference" />
     <attr name="cr3_button_prev_drawable" format="reference" />
     <attr name="cr3_button_next_drawable" format="reference" />
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 4bfbaca1f7..81cfdc9a58 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -771,4 +771,7 @@
     <string name="options_disabled_document_styles">disabled embedded document styles or unsupported document type</string>
     <string name="options_multilingual_enabled">disabled because support for multilingual documents is enabled</string>
     <string name="options_multilingual_disabled">disabled because support for multilingual documents is disabled or legacy rendering is enabled</string>
+    <string name="filter_by_book_language_s">Filter by book language (%s)</string>
+    <string name="scanning_font_files">Scanning font files…</string>
+    <string name="undetermined">Undetermined</string>
 </resources>
diff --git a/android/src/org/coolreader/CoolReader.java b/android/src/org/coolreader/CoolReader.java
index 903ab7bedf..ab5035a2f5 100644
--- a/android/src/org/coolreader/CoolReader.java
+++ b/android/src/org/coolreader/CoolReader.java
@@ -12,6 +12,7 @@
 import android.content.pm.PackageManager;
 import android.media.AudioManager;
 import android.net.Uri;
+import android.os.BatteryManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Debug;
@@ -115,8 +116,9 @@ public class CoolReader extends BaseActivity {
 
 	private boolean isFirstStart = true;
 	private boolean phoneStateChangeHandlerInstalled = false;
-	private int initialBatteryState = -1;
-	private BroadcastReceiver intentReceiver;
+	private int initialBatteryState = ReaderView.BATTERY_STATE_NO_BATTERY;
+	private int initialBatteryChargeConn = ReaderView.BATTERY_CHARGER_NO;
+	private int initialBatteryLevel = 0;
 
 	private boolean justCreated = false;
 	private boolean activityIsRunning = false;
@@ -137,6 +139,57 @@ public class CoolReader extends BaseActivity {
 	private static final int ODT_CMD_DEL_FOLDER = 2;
 	private static final int ODT_CMD_SAVE_LOGCAT = 3;
 
+	private final BroadcastReceiver batteryChangeReceiver = new BroadcastReceiver() {
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			// TODO: When minSDK increases to 5 or higher replace string constants:
+			//  "status" -> BatteryManager.EXTRA_STATUS
+			//  "plugged" -> BatteryManager.EXTRA_PLUGGED
+			//  "level" -> BatteryManager.EXTRA_LEVEL
+			int status = intent.getIntExtra("status", 0);
+			int plugged = intent.getIntExtra("plugged", 0);
+			int level = intent.getIntExtra("level", 0);
+			// Translate android values to cr3 values
+			switch (plugged) {
+				case BatteryManager.BATTERY_PLUGGED_AC:
+					plugged = ReaderView.BATTERY_CHARGER_AC;
+					break;
+				case BatteryManager.BATTERY_PLUGGED_USB:
+					plugged = ReaderView.BATTERY_CHARGER_USB;
+					break;
+				case BatteryManager.BATTERY_PLUGGED_WIRELESS:
+					plugged = ReaderView.BATTERY_CHARGER_WIRELESS;
+					break;
+				default:
+					plugged = ReaderView.BATTERY_CHARGER_NO;
+			}
+			switch (status) {
+				case BatteryManager.BATTERY_STATUS_CHARGING:
+					status = ReaderView.BATTERY_STATE_CHARGING;
+					break;
+				case BatteryManager.BATTERY_STATUS_DISCHARGING:
+				default:
+					status = ReaderView.BATTERY_STATE_DISCHARGING;
+					break;
+			}
+			if (mReaderView != null)
+				mReaderView.setBatteryState(status, plugged, level);
+			else {
+				initialBatteryState = status;
+				initialBatteryChargeConn = plugged;
+				initialBatteryLevel = level;
+			}
+		}
+	};
+	private BroadcastReceiver timeTickReceiver = new BroadcastReceiver() {
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			if (activityIsRunning && null != mReaderView) {
+				mReaderView.onTimeTickReceived();
+			}
+		}
+	};
+
 	/**
 	 * Called when the activity is first created.
 	 */
@@ -162,29 +215,19 @@ protected void onCreate(Bundle savedInstanceState) {
 
 		//requestWindowFeature(Window.FEATURE_NO_TITLE);
 
-		//==========================================
-		// Battery state listener
-		intentReceiver = new BroadcastReceiver() {
-
-			@Override
-			public void onReceive(Context context, Intent intent) {
-				int level = intent.getIntExtra("level", 0);
-				if (mReaderView != null)
-					mReaderView.setBatteryState(level);
-				else
-					initialBatteryState = level;
-			}
-
-		};
-		registerReceiver(intentReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+		// Get battery level
+		// ACTION_BATTERY_CHANGED is a sticky broadcast & we pass null instead of receiver, then
+		// no receiver is registered -- the function simply returns the sticky Intent that matches filter.
+		Intent intent = registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+		if (null != intent) {
+			// and process this Intent: save received values
+			batteryChangeReceiver.onReceive(null, intent);
+		}
 
 		// For TTS volume control
 		//  See TTSControlService
 		setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
-		if (initialBatteryState >= 0 && mReaderView != null)
-			mReaderView.setBatteryState(initialBatteryState);
-
 		//==========================================
 		// Donations related code
 		try {
@@ -250,10 +293,6 @@ protected void onDestroy() {
 //		}
 
 		//mEngine = null;
-		if (intentReceiver != null) {
-			unregisterReceiver(intentReceiver);
-			intentReceiver = null;
-		}
 
 		//===========================
 		// Donations support code
@@ -787,6 +826,16 @@ protected void onPause() {
 		if (mBrowser != null) {
 			mBrowser.stopCurrentScan();
 		}
+		try {
+			unregisterReceiver(batteryChangeReceiver);
+		} catch (IllegalArgumentException e) {
+			log.e("Failed to unregister receiver: " + e.toString());
+		}
+		try {
+			unregisterReceiver(timeTickReceiver);
+		} catch (IllegalArgumentException e) {
+			log.e("Failed to unregister receiver: " + e.toString());
+		}
 		Services.getCoverpageManager().removeCoverpageReadyListener(mHomeFrame);
 		if (BuildConfig.GSUITE_AVAILABLE && Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
 			if (mSyncGoogleDriveEnabled && mGoogleDriveSync != null && !mGoogleDriveSync.isBusy()) {
@@ -833,6 +882,14 @@ protected void onResume() {
 
 		if (mReaderView != null)
 			mReaderView.onAppResume();
+		// ACTION_BATTERY_CHANGED: This is a sticky broadcast containing the charging state, level, and other information about the battery.
+		Intent intent = registerReceiver(batteryChangeReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+		if (null != intent) {
+			// process this Intent
+			batteryChangeReceiver.onReceive(null, intent);
+		}
+		// ACTION_TIME_TICK: The current time has changed. Sent every minute.
+		registerReceiver(timeTickReceiver, new IntentFilter(Intent.ACTION_TIME_TICK));
 
 		if (DeviceInfo.EINK_SCREEN) {
 			if (DeviceInfo.EINK_SONY) {
@@ -1234,8 +1291,7 @@ private void runInReader(final Runnable task) {
 					mReaderView.getSurface().setFocusableInTouchMode(true);
 					mReaderView.getSurface().requestFocus();
 				}
-				if (initialBatteryState >= 0)
-					mReaderView.setBatteryState(initialBatteryState);
+				mReaderView.setBatteryState(initialBatteryState, initialBatteryChargeConn, initialBatteryLevel);
 				mReaderView.doEngineCommand(ReaderCommand.DCMD_SET_ROTATION_INFO_FOR_AA, screenRotation);
 			}
 		});
diff --git a/android/src/org/coolreader/crengine/BaseActivity.java b/android/src/org/coolreader/crengine/BaseActivity.java
index 44d64fd17b..c3b194b0ca 100644
--- a/android/src/org/coolreader/crengine/BaseActivity.java
+++ b/android/src/org/coolreader/crengine/BaseActivity.java
@@ -137,6 +137,13 @@ else if (DeviceInfo.EINK_ONYX)
 		diagonalInches = (float) Math.sqrt(widthInches * widthInches + heightInches * heightInches);
 		log.i("diagonal=" + diagonalInches + "  isSmartphone=" + isSmartphone());
 
+		int sz = dm.widthPixels;
+		if (sz > dm.heightPixels)
+			sz = dm.heightPixels;
+		minFontSize = 5*densityDpi/72;			// 5pt
+		//maxFontSize = 100*densityDpi/72;		// 100pt
+		maxFontSize = sz/8;
+
 		// create settings
 		mSettingsManager = new SettingsManager(this);
 		// create rest of settings
@@ -404,16 +411,6 @@ public void updateBackground() {
 //				getWindow().setBackgroundDrawable(Utils.solidColorDrawable(clBackground));
 		}
 		a.recycle();
-		Display display = getWindowManager().getDefaultDisplay();
-		int sz = display.getWidth();
-		if (sz > display.getHeight())
-			sz = display.getHeight();
-		minFontSize = sz / 45;
-		maxFontSize = sz / 8;
-		if (maxFontSize > 340)
-			maxFontSize = 340;
-		if (minFontSize < 9)
-			minFontSize = 9;
 	}
 
 	@SuppressLint("ResourceType")
@@ -1518,17 +1515,13 @@ private static class SettingsManager {
 
 		public static final Logger log = L.create("cr");
 
-		private BaseActivity mActivity;
+		private final BaseActivity mActivity;
 		private Properties mSettings;
-
-		private final DisplayMetrics displayMetrics = new DisplayMetrics();
 		private final File defaultSettingsDir;
 
 		public SettingsManager(BaseActivity activity) {
 			this.mActivity = activity;
-			activity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
 			defaultSettingsDir = activity.getDir("settings", Context.MODE_PRIVATE);
-
 			mSettings = loadSettings();
 		}
 
@@ -1882,40 +1875,10 @@ public Properties loadSettings(BaseActivity activity, File file) {
 			props.applyDefault(ReaderView.PROP_LANDSCAPE_PAGES, DeviceInfo.ONE_COLUMN_IN_LANDSCAPE ? "0" : "1");
 			//props.applyDefault(ReaderView.PROP_TOOLBAR_APPEARANCE, "0");
 			// autodetect best initial font size based on display resolution
-			int screenHeight = displayMetrics.heightPixels;
-			int screenWidth = displayMetrics.widthPixels;//getWindowManager().getDefaultDisplay().getWidth();
-			if (screenWidth > screenHeight)
-				screenWidth = screenHeight;
-			int fontSize = 20;
-			int statusFontSize = 16;
-			String hmargin = "4";
-			String vmargin = "2";
-			if (screenWidth <= 320) {
-				fontSize = 20;
-				statusFontSize = 16;
-				hmargin = "4";
-				vmargin = "2";
-			} else if (screenWidth <= 400) {
-				fontSize = 24;
-				statusFontSize = 20;
-				hmargin = "10";
-				vmargin = "4";
-			} else if (screenWidth <= 600) {
-				fontSize = 28;
-				statusFontSize = 24;
-				hmargin = "20";
-				vmargin = "8";
-			} else if (screenWidth <= 800) {
-				fontSize = 32;
-				statusFontSize = 28;
-				hmargin = "25";
-				vmargin = "15";
-			} else {
-				fontSize = 48;
-				statusFontSize = 32;
-				hmargin = "30";
-				vmargin = "20";
-			}
+			int fontSize = 12*activity.densityDpi/72;			// 12pt
+			int statusFontSize = 8*activity.densityDpi/72;		// 8pt
+			int hmargin = activity.densityDpi/16;
+			int vmargin = activity.densityDpi/32;
 			if (DeviceInfo.DEF_FONT_SIZE != null)
 				fontSize = DeviceInfo.DEF_FONT_SIZE;
 
diff --git a/android/src/org/coolreader/crengine/BookInfoDialog.java b/android/src/org/coolreader/crengine/BookInfoDialog.java
index c6583a48ce..e99cb6bfeb 100644
--- a/android/src/org/coolreader/crengine/BookInfoDialog.java
+++ b/android/src/org/coolreader/crengine/BookInfoDialog.java
@@ -79,6 +79,8 @@ private void addItem(TableLayout table, String item) {
 			if ( title!=null )
 				name = title;
 		} else {
+			if ("book.language".equals(name))
+				value = Engine.getHumanReadableLocaleName(value);
 			Integer id = mLabelMap.get(name);
 			String title = id!=null ? getContext().getString(id) : name;
 			if ( title!=null )
diff --git a/android/src/org/coolreader/crengine/BookInfoEditDialog.java b/android/src/org/coolreader/crengine/BookInfoEditDialog.java
index 7465730569..436f27bd3e 100644
--- a/android/src/org/coolreader/crengine/BookInfoEditDialog.java
+++ b/android/src/org/coolreader/crengine/BookInfoEditDialog.java
@@ -29,7 +29,6 @@
 
 import org.coolreader.CoolReader;
 import org.coolreader.R;
-import org.coolreader.genrescollection.GenresCollection;
 
 import java.util.ArrayList;
 
@@ -230,6 +229,7 @@ public void setColorFilter(ColorFilter cf) {
     LinearLayout mainView;
 	ScrollView scrollView;
     EditText edTitle;
+    EditText edLanguage;
     EditText edSeriesName;
     EditText edSeriesNumber;
     TextView lblGenres;
@@ -258,6 +258,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         scrollView = mainView.findViewById(R.id.book_scrollview);
         edTitle = mainView.findViewById(R.id.book_title);
+        edLanguage = mainView.findViewById(R.id.book_lang);
         edSeriesName = mainView.findViewById(R.id.book_series_name);
         edSeriesNumber = mainView.findViewById(R.id.book_series_number);
         lblGenres = mainView.findViewById(R.id.lbl_book_genres);
@@ -307,6 +308,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         edTitle.setText(file.title);
         //edAuthor.setText(file.authors);
+        edLanguage.setText(Engine.getHumanReadableLocaleName(file.language));
         edSeriesName.setText(file.series);
         if (file.series != null && file.series.trim().length() > 0 && file.seriesNumber > 0)
         	edSeriesNumber.setText(String.valueOf(file.seriesNumber));
diff --git a/android/src/org/coolreader/crengine/DocView.java b/android/src/org/coolreader/crengine/DocView.java
index b279a511a5..c8d8fa95e8 100644
--- a/android/src/org/coolreader/crengine/DocView.java
+++ b/android/src/org/coolreader/crengine/DocView.java
@@ -111,9 +111,9 @@ public boolean moveSelection(Selection sel,
 	 * Send battery state to native object.
 	 * @param state
 	 */
-	public void setBatteryState(int state) {
+	public void setBatteryState(int state, int chargingConn, int chargeLevel) {
 		synchronized(mutex) {
-			setBatteryStateInternal(state);
+			setBatteryStateInternal(state, chargingConn, chargeLevel);
 		}
 	}
 
@@ -433,10 +433,16 @@ public void hilightBookmarks(Bookmark[] bookmarks) {
 			hilightBookmarksInternal(bookmarks);
 		}
 	}
-	
+
+	public boolean isTimeChanged() {
+		synchronized(mutex) {
+			return isTimeChangedInternal();
+		}
+	}
+
 	//========================================================================================
 	// Native functions
-	/* implementend by libcr3engine.so */
+	/* implemented by libcr3engine.so */
 	//========================================================================================
 	private native void getPageImageInternal(Bitmap bitmap, int bpp);
 
@@ -478,7 +484,7 @@ private native boolean applySettingsInternal(
 	private native boolean findTextInternal(String pattern, int origin,
 			int reverse, int caseInsensitive);
 
-	private native void setBatteryStateInternal(int state);
+	private native void setBatteryStateInternal(int state, int chargingConn, int chargeLevel);
 
 	private native byte[] getCoverPageDataInternal();
 
@@ -509,6 +515,8 @@ private native boolean moveSelectionInternal(Selection sel,
 	// / returns either SWAP_DONE, SWAP_TIMEOUT or SWAP_ERROR
 	private native int swapToCacheInternal();
 
+	private native boolean isTimeChangedInternal();
+
 	private long mNativeObject; // used from JNI
 
 	private ReaderCallback readerCallback;  // used from JNI
diff --git a/android/src/org/coolreader/crengine/FileInfo.java b/android/src/org/coolreader/crengine/FileInfo.java
index 091b10b2c6..167b8e8e8c 100644
--- a/android/src/org/coolreader/crengine/FileInfo.java
+++ b/android/src/org/coolreader/crengine/FileInfo.java
@@ -1277,13 +1277,12 @@ public boolean equals(Object obj) {
 				return false;
 		} else if (!title.equals(other.title))
 			return false;
-		if (crc32 != other.crc32)
-			return false;
 		if (domVersion != other.domVersion)
 			return false;
 		if (blockRenderingFlags != other.blockRenderingFlags)
 			return false;
-		return true;
+		// Base check: fingerprint (for now only crc32)
+		return crc32 == other.crc32;
 	}
 
 	public boolean baseEquals(FileInfo other) {
@@ -1291,11 +1290,6 @@ public boolean baseEquals(FileInfo other) {
 			return true;
 		if (other == null)
 			return false;
-		if (arcname == null) {
-			if (other.arcname != null)
-				return false;
-		} else if (!arcname.equals(other.arcname))
-			return false;
 		if (arcsize != other.arcsize)
 			return false;
 		if (authors == null) {
@@ -1303,15 +1297,15 @@ public boolean baseEquals(FileInfo other) {
 				return false;
 		} else if (!authors.equals(other.authors))
 			return false;
+		// TODO: potentially filename may not match. Perhaps we need to remove this check.
 		if (filename == null) {
 			if (other.filename != null)
 				return false;
 		} else if (!filename.equals(other.filename))
 			return false;
-		if (flags != other.flags)
-			return false;
 		if (format != other.format)
 			return false;
+		// TODO: potentially isArchive may not match. Perhaps we need to remove this check.
 		if (isArchive != other.isArchive)
 			return false;
 		if (isDirectory != other.isDirectory)
@@ -1332,16 +1326,6 @@ public boolean baseEquals(FileInfo other) {
 				return false;
 		} else if (!description.equals(other.description))
 			return false;
-		if (path == null) {
-			if (other.path != null)
-				return false;
-		} else if (!path.equals(other.path))
-			return false;
-		if (pathname == null) {
-			if (other.pathname != null)
-				return false;
-		} else if (!pathname.equals(other.pathname))
-			return false;
 		if (series == null) {
 			if (other.series != null && other.series.length() != 0)
 				return false;
@@ -1356,9 +1340,8 @@ public boolean baseEquals(FileInfo other) {
 				return false;
 		} else if (!title.equals(other.title))
 			return false;
-		if (crc32 != other.crc32)
-			return false;
-		return true;
+		// Base check: fingerprint (for now only crc32)
+		return crc32 == other.crc32;
 	}
 
 	private static boolean eqGenre(String g1, String g2) {
diff --git a/android/src/org/coolreader/crengine/OptionsDialog.java b/android/src/org/coolreader/crengine/OptionsDialog.java
index e0fd32f0fa..74fcf55c88 100644
--- a/android/src/org/coolreader/crengine/OptionsDialog.java
+++ b/android/src/org/coolreader/crengine/OptionsDialog.java
@@ -16,10 +16,12 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.BaseAdapter;
-import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.RadioButton;
@@ -287,23 +289,13 @@ public static int findBacklightSettingIndex( int value ) {
 			R.string.options_selection_action_dictionary, 
 			R.string.options_selection_action_bookmark, 
 		};
-	int[] mAntialiasEINK = new int[] {
+	// possible values see in crengine/include/lvfont.h: enum font_antialiasing_t
+	int[] mAntialias = new int[] {
 			0, 1, 2
 	};
-	int[] mAntialiasEINKTitles = new int[] {
+	int[] mAntialiasTitles = new int[] {
 			R.string.options_font_antialias_off, R.string.options_font_antialias_on_for_big, R.string.options_font_antialias_on_for_all
 	};
-	// possible values see in crengine/include/lvfont.h: enum font_antialiasing_t
-	int[] mAntialias = new int[] {
-			0, 1, 2,
-			4, 5,
-			8, 9
-		};
-	int[] mAntialiasTitles = new int[] {
-			R.string.options_font_antialias_off, R.string.options_font_antialias_on_for_big, R.string.options_font_antialias_on_for_all,
-			R.string.options_font_antialias_lcd_rgb, R.string.options_font_antialias_lcd_bgr,
-			R.string.options_font_antialias_lcd_v_rgb, R.string.options_font_antialias_lcd_v_bgr
-		};
 	int[] mLandscapePages = new int[] {
 			1, 2
 		};
@@ -657,7 +649,6 @@ public View getView(View convertView, ViewGroup parent) {
 			View view;
 			convertView = myView;
 			if ( convertView==null ) {
-				//view = new TextView(getContext());
 				view = mInflater.inflate(R.layout.option_item_boolean, null);
 			} else {
 				view = convertView;
@@ -665,7 +656,7 @@ public View getView(View convertView, ViewGroup parent) {
 			myView = view;
 			TextView labelView = view.findViewById(R.id.option_label);
 			TextView commentView = view.findViewById(R.id.option_comment);
-			CheckBox valueView = view.findViewById(R.id.option_value_cb);
+			CompoundButton valueView = view.findViewById(R.id.option_value_cb);
 			labelView.setText(label);
 			labelView.setEnabled(enabled);
 			String commentLabel = null;
@@ -710,7 +701,6 @@ public View getView(View convertView, ViewGroup parent) {
 			View view;
 			convertView = myView;
 			if ( convertView==null ) {
-				//view = new TextView(getContext());
 				view = mInflater.inflate(R.layout.option_item_boolean, null);
 			} else {
 				view = convertView;
@@ -718,9 +708,7 @@ public View getView(View convertView, ViewGroup parent) {
 			myView = view;
 			TextView labelView = view.findViewById(R.id.option_label);
 			TextView commentView = view.findViewById(R.id.option_comment);
-			CheckBox valueView = view.findViewById(R.id.option_value_cb);
-//			valueView.setFocusable(false);
-//			valueView.setClickable(false);
+			CompoundButton valueView = view.findViewById(R.id.option_value_cb);
 			labelView.setText(label);
 			labelView.setEnabled(enabled);
 			String commentLabel = comment;
@@ -738,13 +726,13 @@ public View getView(View convertView, ViewGroup parent) {
 				commentView.setVisibility(View.GONE);
 			}
 			valueView.setChecked(getValueBoolean());
-			valueView.setOnCheckedChangeListener((arg0, checked) -> {
-//						mProperties.setBool(property, checked);
-//						refreshList();
-			});
+			// For this view, the "focusable" and "clickable" properties are
+			// disabled in the layout, so there is no need to set a change listener.
+			//valueView.setOnCheckedChangeListener((arg0, checked) -> {
+			//			mProperties.setBool(property, checked);
+			//			refreshList();
+			//});
 			setupIconView((ImageView)view.findViewById(R.id.option_icon));
-//			view.setClickable(true);
-//			view.setFocusable(true);
 			valueView.setEnabled(enabled);
 			return view;
 		}
@@ -1163,7 +1151,79 @@ public View getView(View convertView, ViewGroup parent) {
 	}
 	
 	public static class ListOption extends OptionBase {
-		private ArrayList<Pair> list = new ArrayList<>();
+		protected ArrayList<Pair> list = new ArrayList<>();
+
+		class ListOptionAdapter extends BaseAdapter {
+
+			private final ListView mListView;
+			private final List<Pair> mList;
+
+			ListOptionAdapter(ListView listView, List<Pair> list) {
+				super();
+				mListView = listView;
+				mList = list;
+			}
+
+			public boolean areAllItemsEnabled() {
+				return true;
+			}
+
+			public boolean isEnabled(int position) {
+				return true;
+			}
+
+			public int getCount() {
+				return mList.size();
+			}
+
+			public Object getItem(int position) {
+				return mList.get(position);
+			}
+
+			public long getItemId(int position) {
+				return position;
+			}
+
+			public int getItemViewType(int position) {
+				return 0;
+			}
+
+			public View getView(final int position, View convertView, ViewGroup parent) {
+				ViewGroup layout;
+				if ( convertView==null ) {
+					layout = (ViewGroup)mInflater.inflate(getItemLayoutId(), null);
+				} else {
+					layout = (ViewGroup)convertView;
+				}
+				final Pair item = mList.get(position);
+				updateItemContents( layout, item, mListView, position );
+				return layout;
+			}
+
+			public int getViewTypeCount() {
+				return 1;
+			}
+
+			public boolean hasStableIds() {
+				return true;
+			}
+
+			public boolean isEmpty() {
+				return mList.size()==0;
+			}
+
+			private ArrayList<DataSetObserver> observers = new ArrayList<>();
+
+			public void registerDataSetObserver(DataSetObserver observer) {
+				observers.add(observer);
+			}
+
+			public void unregisterDataSetObserver(DataSetObserver observer) {
+				observers.remove(observer);
+			}
+
+		};
+
 		public ListOption( OptionOwner owner, String label, String property ) {
 			super(owner, label, property);
 		}
@@ -1275,7 +1335,6 @@ public int getSelectedItemIndex() {
 		}
 
 		protected void closed() {
-			
 		}
 		
 		protected int getItemLayoutId() {
@@ -1292,10 +1351,9 @@ protected void updateItemContents( final View layout, final Pair item, final Lis
 			boolean isSelected = item.value != null && item.value.equals(currValue);//getSelectedItemIndex()==position;
 			cb.setChecked(isSelected);
 			cb.setOnClickListener(v -> {
-				listView.getOnItemClickListener().onItemClick(listView, listView, position, 0);
-//					mProperties.setProperty(property, item.value);
-//					dismiss();
-//					optionsListView.refresh();
+				AdapterView.OnItemClickListener listener = listView.getOnItemClickListener();
+				if (null != listener)
+					listener.onItemClick(listView, listView, position, 0);
 			});
 		}
 		
@@ -1304,82 +1362,9 @@ protected void updateItemContents( final View layout, final Pair item, final Lis
 		public void onSelect() {
 			if (!enabled)
 				return;
-
 			final BaseDialog dlg = new BaseDialog(mActivity, label, false, false);
-
 			final ListView listView = new BaseListView(mActivity, false);
-			
-			
-			ListAdapter listAdapter = new BaseAdapter() {
-
-				public boolean areAllItemsEnabled() {
-					return true;
-				}
-
-				public boolean isEnabled(int position) {
-					return true;
-				}
-
-				public int getCount() {
-					return list.size();
-				}
-
-				public Object getItem(int position) {
-					return list.get(position);
-				}
-
-				public long getItemId(int position) {
-					return position;
-				}
-
-				public int getItemViewType(int position) {
-					return 0;
-				}
-
-				public View getView(final int position, View convertView,
-						ViewGroup parent) {
-					ViewGroup layout;
-					if ( convertView==null ) {
-						layout = (ViewGroup)mInflater.inflate(getItemLayoutId(), null);
-						//view = new TextView(getContext());
-					} else {
-						layout = (ViewGroup)convertView;
-					}
-					final Pair item = list.get(position);
-					updateItemContents( layout, item, listView, position );
-					//cb.setClickable(false);
-//					cb.setOnClickListener(new View.OnClickListener() {
-//						@Override
-//						public void onClick(View v) {
-//							
-//						}
-//					});
-					return layout;
-				}
-
-				public int getViewTypeCount() {
-					return 1;
-				}
-
-				public boolean hasStableIds() {
-					return true;
-				}
-
-				public boolean isEmpty() {
-					return list.size()==0;
-				}
-
-				private ArrayList<DataSetObserver> observers = new ArrayList<>();
-				
-				public void registerDataSetObserver(DataSetObserver observer) {
-					observers.add(observer);
-				}
-
-				public void unregisterDataSetObserver(DataSetObserver observer) {
-					observers.remove(observer);
-				}
-				
-			};
+			ListOptionAdapter listAdapter = new ListOptionAdapter(listView, list);
 			int selItem = getSelectedItemIndex();
 			if ( selItem<0 )
 				selItem = 0;
@@ -1406,6 +1391,138 @@ public void onClick( Pair item ) {
 		}
 	}
 
+	protected interface FontScanCompleted {
+		void onComplete(ArrayList<Pair> list, boolean canceled);
+	}
+
+	protected class FontSelectOption extends ListOption {
+		protected ArrayList<Pair> sourceList;
+		private String langTag;
+		private String langDescr;
+		private ListOptionAdapter listAdapter;
+
+		public FontSelectOption(OptionOwner owner, String label, String property ) {
+			super(owner, label, property);
+			langTag = null;
+			langDescr = null;
+			BookInfo bookInfo = mReaderView.getBookInfo();
+			if (null != bookInfo) {
+				FileInfo fileInfo = bookInfo.getFileInfo();
+				if (null != fileInfo) {
+					langTag = fileInfo.language;
+					langDescr = Engine.getHumanReadableLocaleName(langTag);
+				}
+			}
+		}
+
+		private void asyncFilterFontsByLanguage(String langTag, FontScanCompleted onComplete) {
+			BackgroundThread.ensureGUI();
+			final Scanner.ScanControl control = new Scanner.ScanControl();
+			final Engine.ProgressControl progress = Services.getEngine().createProgress(R.string.scanning_font_files, control);
+			final ArrayList<Pair> filtered = new ArrayList<Pair>();
+			BackgroundThread.instance().postBackground(() -> {
+				int i = 0;
+				for (Pair pair : list) {
+					if (control.isStopped())
+						break;
+					String faceName = pair.value;
+					Engine.font_lang_compat status = Engine.checkFontLanguageCompatibility(faceName, langTag);
+					switch (status) {
+						case font_lang_compat_full:
+						case font_lang_compat_partial:
+							filtered.add(new Pair(faceName, faceName));
+							break;
+						default:
+							break;
+					}
+					i++;
+					progress.setProgress(10000*i/list.size());
+				}
+				onComplete.onComplete(filtered, control.isStopped());
+				progress.hide();
+			});
+		}
+
+		public void onSelect() {
+			if (!enabled)
+				return;
+			final BaseDialog dlg = new BaseDialog(mActivity, label, false, false);
+
+			LinearLayout layout = new LinearLayout(mActivity);
+			layout.setOrientation(LinearLayout.VERTICAL);
+
+			View panel = mInflater.inflate(R.layout.option_lang_filter, null);
+			layout.addView(panel);
+			CompoundButton filter_by_lang = panel.findViewById(R.id.filter_by_lang);
+			if (null != langDescr && langDescr.length() > 0) {
+				filter_by_lang.setText(mActivity.getString(R.string.filter_by_book_language_s, langDescr));
+			} else {
+				filter_by_lang.setText(mActivity.getString(R.string.filter_by_book_language_s, mActivity.getString(R.string.undetermined)));
+				filter_by_lang.setEnabled(false);
+			}
+			final ListView listView = new BaseListView(mActivity, false);
+			listAdapter = new ListOptionAdapter(listView, list);
+			int selItem = getSelectedItemIndex();
+			if ( selItem<0 )
+				selItem = 0;
+			listView.setAdapter(listAdapter);
+			listView.setSelection(selItem);
+			layout.addView(listView);
+
+			listView.setOnItemClickListener((adapter, listview, position, id) -> {
+				Pair item = (Pair) listAdapter.getItem(position);
+				onClick(item);
+				dlg.dismiss();
+				closed();
+			});
+
+			filter_by_lang.setOnCheckedChangeListener((buttonView, isChecked) -> {
+				if (isChecked) {
+					asyncFilterFontsByLanguage(langTag, (list, canceled) -> {
+						if (!canceled) {
+							BackgroundThread.instance().executeGUI(() -> {
+								FontSelectOption.this.sourceList = FontSelectOption.this.list;
+								FontSelectOption.this.list = list;
+								listAdapter = new ListOptionAdapter(listView, list);
+								int selindex = getSelectedItemIndex();
+								if ( selindex<0 )
+									selindex = 0;
+								listView.setAdapter(listAdapter);
+								listView.setSelection(selindex);
+							});
+						} else {
+							BackgroundThread.instance().executeGUI(() -> {
+								filter_by_lang.setChecked(false);
+							});
+						}
+					});
+				} else {
+					if (null != sourceList) {
+						list = sourceList;
+						listAdapter = new ListOptionAdapter(listView, list);
+						int selindex = getSelectedItemIndex();
+						if (selindex < 0)
+							selindex = 0;
+						listView.setAdapter(listAdapter);
+						listView.setSelection(selindex);
+					}
+				}
+			});
+
+			dlg.setOnDismissListener(dialog -> closed());
+
+			// TODO: set checked for for filter_by_lang (save in settings)
+
+			dlg.setView(layout);
+			dlg.show();
+		}
+
+		protected void closed() {
+			if (null != sourceList)
+				list = sourceList;
+		}
+	}
+
 	class FallbackFontItemOptions extends ListOption {
 
 		private final FallbackFontsOptions mParentOptions;	// parent option item
@@ -2629,7 +2746,7 @@ private void setupReaderOptions()
 
 		mOptionsStyles = new OptionsListView(getContext());
 		mFontHintingOption = new ListOption(this, getString(R.string.options_font_hinting), PROP_FONT_HINTING).add(mHinting, mHintingTitles).setDefaultValue("2").setIconIdByAttr(R.attr.cr3_option_text_hinting_drawable, R.drawable.cr3_option_text_hinting);
-		OptionBase fontOption = new ListOption(this, getString(R.string.options_font_face), PROP_FONT_FACE).add(mFontFaces).setDefaultValue(mFontFaces[0]).setIconIdByAttr(R.attr.cr3_option_font_face_drawable, R.drawable.cr3_option_font_face);
+		OptionBase fontOption = new FontSelectOption(this, getString(R.string.options_font_face), PROP_FONT_FACE).add(mFontFaces).setDefaultValue(mFontFaces[0]).setIconIdByAttr(R.attr.cr3_option_font_face_drawable, R.drawable.cr3_option_font_face);
 		mOptionsStyles.add(fontOption);
 		mOptionsStyles.add(new NumberPickerOption(this, getString(R.string.options_font_size), PROP_FONT_SIZE).setMinValue(mActivity.getMinFontSize()).setMaxValue(mActivity.getMaxFontSize()).setDefaultValue("24").setIconIdByAttr(R.attr.cr3_option_font_size_drawable, R.drawable.cr3_option_font_size));
 		mFontWeightOption = (ListOption) new ListOption(this, getString(R.string.options_font_weight), PROP_FONT_BASE_WEIGHT).setIconIdByAttr(R.attr.cr3_option_text_bold_drawable, R.drawable.cr3_option_text_bold);
@@ -2639,6 +2756,7 @@ private void setupReaderOptions()
 			String faceName = mProperties.getProperty(PROP_FONT_FACE, "");
 			updateFontWeightValues(mFontWeightOption, faceName);
 		});
+		/*
 		mFontWeightOption.setOnChangeHandler(() -> {
 			// enable/disable font hinting option
 			String faceName = mProperties.getProperty(PROP_FONT_FACE, "");
@@ -2647,14 +2765,12 @@ private void setupReaderOptions()
 				ArrayList<Integer> nativeWeightsArray = new ArrayList<>();    // for search
 				for (int w : nativeWeights)
 					nativeWeightsArray.add(w);
-				//int base_weight = mProperties.getInt(PROP_FONT_BASE_WEIGHT, 400);
-				//mFontHintingOption.setEnabled(nativeWeightsArray.contains(base_weight));
+				int base_weight = mProperties.getInt(PROP_FONT_BASE_WEIGHT, 400);
+				mFontHintingOption.setEnabled(nativeWeightsArray.contains(base_weight));
 			}
 		});
-		if ( DeviceInfo.EINK_SCREEN )
-			mOptionsStyles.add(new ListOption(this, getString(R.string.options_font_antialias), PROP_FONT_ANTIALIASING).add(mAntialiasEINK, mAntialiasEINKTitles).setDefaultValue("2").setIconIdByAttr(R.attr.cr3_option_text_antialias_drawable, R.drawable.cr3_option_text_antialias));
-		else
-			mOptionsStyles.add(new ListOption(this, getString(R.string.options_font_antialias), PROP_FONT_ANTIALIASING).add(mAntialias, mAntialiasTitles).setDefaultValue("2").setIconIdByAttr(R.attr.cr3_option_text_antialias_drawable, R.drawable.cr3_option_text_antialias));
+		 */
+		mOptionsStyles.add(new ListOption(this, getString(R.string.options_font_antialias), PROP_FONT_ANTIALIASING).add(mAntialias, mAntialiasTitles).setDefaultValue("2").setIconIdByAttr(R.attr.cr3_option_text_antialias_drawable, R.drawable.cr3_option_text_antialias));
 		mOptionsStyles.add(new ListOption(this, getString(R.string.options_interline_space), PROP_INTERLINE_SPACE).addPercents(mInterlineSpaces).setDefaultValue("100").setIconIdByAttr(R.attr.cr3_option_line_spacing_drawable, R.drawable.cr3_option_line_spacing));
 		//
 		mEnableMultiLangOption = new BoolOption(this, getString(R.string.options_style_multilang), PROP_TEXTLANG_EMBEDDED_LANGS_ENABLED).setDefaultValue("0").setIconIdByAttr(R.attr.cr3_option_text_multilang_drawable, R.drawable.cr3_option_text_multilang)
diff --git a/android/src/org/coolreader/crengine/ReaderView.java b/android/src/org/coolreader/crengine/ReaderView.java
index 3dde8bf8e5..87cd1cd00b 100644
--- a/android/src/org/coolreader/crengine/ReaderView.java
+++ b/android/src/org/coolreader/crengine/ReaderView.java
@@ -260,6 +260,22 @@ public void invalidate() {
 	private final static int BRIGHTNESS_TYPE_COMMON = 0;
 	private final static int BRIGHTNESS_TYPE_WARM = 1;
 
+	/// Always sync this constants with crengine/include/lvdocview.h!
+	/// Battery state: no battery
+	public static final int BATTERY_STATE_NO_BATTERY = -2;
+	/// Battery state: battery is charging
+	public static final int BATTERY_STATE_CHARGING = -1;
+	/// Battery state: battery is discharging
+	public static final int BATTERY_STATE_DISCHARGING = -3;
+	/// Battery charger connection: no connection
+	public static final int BATTERY_CHARGER_NO = 1;
+	/// Battery charger connection: AC adapter
+	public static final int BATTERY_CHARGER_AC = 2;
+	/// Battery charger connection: USB
+	public static final int BATTERY_CHARGER_USB = 3;
+	/// Battery charger connection: Wireless
+	public static final int BATTERY_CHARGER_WIRELESS = 4;
+
 	private ViewMode viewMode = ViewMode.PAGES;
 
 	private void execute(Engine.EngineTask task) {
@@ -1666,8 +1682,7 @@ public void showReadingPositionPopup() {
 		final StringBuilder buf = new StringBuilder();
 //		if (mActivity.isFullscreen()) {
 		buf.append(Utils.formatTime(mActivity, System.currentTimeMillis()) + " ");
-		if (mBatteryState >= 0)
-			buf.append(" [" + mBatteryState + "%]\n");
+		buf.append(" [" + mBatteryChargeLevel + "%]\n");
 //		}
 		execute(new Task() {
 			Bookmark bm;
@@ -1857,7 +1872,7 @@ public void showBookInfo() {
 		final ArrayList<String> items = new ArrayList<String>();
 		items.add("section=section.system");
 		items.add("system.version=Cool Reader " + mActivity.getVersion());
-		items.add("system.battery=" + mBatteryState + "%");
+		items.add("system.battery=" + mBatteryChargeLevel + "%");
 		items.add("system.time=" + Utils.formatTime(mActivity, System.currentTimeMillis()));
 		final BookInfo bi = mBookInfo;
 		if (bi != null) {
@@ -3187,14 +3202,30 @@ public BookInfo getBookInfo() {
 		return mBookInfo;
 	}
 
-	private int mBatteryState = 100;
+	private int mBatteryState = BATTERY_STATE_DISCHARGING;
+	private int mBatteryChargingConn = BATTERY_CHARGER_NO;
+	private int mBatteryChargeLevel = 0;
 
-	public void setBatteryState(int state) {
+	public void setBatteryState(int state, int chargingConn, int level) {
+		boolean needUpdate = false;
 		if (state != mBatteryState) {
 			log.i("Battery state changed: " + state);
 			mBatteryState = state;
+			needUpdate = true;
+		}
+		if (chargingConn != mBatteryChargingConn) {
+			log.i("Battery charging connection changed: " + chargingConn);
+			mBatteryChargingConn = chargingConn;
+			needUpdate = true;
+		}
+		if (level != mBatteryChargeLevel) {
+			log.i("Battery charging level changed: " + level);
+			mBatteryChargeLevel = level;
+			needUpdate = true;
+		}
+		if (needUpdate) {
 			if (!DeviceInfo.EINK_SCREEN && !isAutoScrollActive()) {
-				drawPage();
+				redraw();
 			}
 		}
 	}
@@ -3203,6 +3234,23 @@ public int getBatteryState() {
 		return mBatteryState;
 	}
 
+	public int getBatteryChargingConnection() {
+		return mBatteryChargingConn;
+	}
+
+	public int getBatteryChargeLevel() {
+		return mBatteryChargeLevel;
+	}
+
+	public void onTimeTickReceived() {
+		if (!DeviceInfo.EINK_SCREEN && !isAutoScrollActive()) {
+			if (doc.isTimeChanged()) {
+				log.i("The current time has been changed (minutes), redrawing is scheduled.");
+				redraw();
+			}
+		}
+	}
+
 	private static final VMRuntimeHack runtime = new VMRuntimeHack();
 
 	private static class BitmapFactory {
@@ -3383,7 +3431,7 @@ else if (mNextPageInfo != null && mNextPageInfo.position != null && mNextPageInf
 			bi.position = currpos;
 			bi.bitmap = factory.get(internalDX > 0 ? internalDX : requestedWidth,
 					internalDY > 0 ? internalDY : requestedHeight);
-			doc.setBatteryState(mBatteryState);
+			doc.setBatteryState(mBatteryState, mBatteryChargingConn, mBatteryChargeLevel);
 			doc.getPageImage(bi.bitmap);
 			mCurrentPageInfo = bi;
 			//log.v("Prepared new current page image " + mCurrentPageInfo);
@@ -3411,7 +3459,7 @@ else if (mNextPageInfo != null && mNextPageInfo.position != null && mNextPageInf
 					BitmapInfo bi = new BitmapInfo();
 					bi.position = nextpos;
 					bi.bitmap = factory.get(internalDX, internalDY);
-					doc.setBatteryState(mBatteryState);
+					doc.setBatteryState(mBatteryState, mBatteryChargingConn, mBatteryChargeLevel);
 					doc.getPageImage(bi.bitmap);
 					mNextPageInfo = bi;
 					nextposBitmap = bi;
@@ -3442,7 +3490,7 @@ else if (mNextPageInfo != null && mNextPageInfo.position != null && mNextPageInf
 					BitmapInfo bi = new BitmapInfo();
 					bi.position = nextpos;
 					bi.bitmap = factory.get(internalDX, internalDY);
-					doc.setBatteryState(mBatteryState);
+					doc.setBatteryState(mBatteryState, mBatteryChargingConn, mBatteryChargeLevel);
 					doc.getPageImage(bi.bitmap);
 					mNextPageInfo = bi;
 					nextposBitmap = bi;
@@ -6415,12 +6463,10 @@ public void onFocusChange(View arg0, boolean arg1) {
 	}
 
 	public void redraw() {
-		//BackgroundThread.instance().executeBackground(new Runnable() {
 		BackgroundThread.instance().executeGUI(() -> {
 			surface.invalidate();
 			invalidImages = true;
-			//preparePageImage(0);
-			bookView.draw();
+			drawPage();
 		});
 	}
 
diff --git a/android/src/org/coolreader/crengine/SelectionToolbarDlg.java b/android/src/org/coolreader/crengine/SelectionToolbarDlg.java
index 6c0a8565b7..c83e5bb554 100644
--- a/android/src/org/coolreader/crengine/SelectionToolbarDlg.java
+++ b/android/src/org/coolreader/crengine/SelectionToolbarDlg.java
@@ -270,7 +270,6 @@ public SelectionToolbarDlg(CoolReader coolReader, ReaderView readerView, Selecti
 				//mReaderView.doEngineCommand(ReaderCommand.DCMD_REQUEST_RENDER, 0);
 				BackgroundThread.instance().postBackground(() -> BackgroundThread.instance().postGUI(() -> {
 					mReaderView.doEngineCommand(ReaderCommand.DCMD_SCROLL_BY, mReaderView.getSurface().getHeight() / 3);
-					mReaderView.redraw();
 				}));
 			});
 		}
diff --git a/android/src/org/coolreader/crengine/StatusBar.java b/android/src/org/coolreader/crengine/StatusBar.java
index b0f8ed78da..7d0520eb4a 100644
--- a/android/src/org/coolreader/crengine/StatusBar.java
+++ b/android/src/org/coolreader/crengine/StatusBar.java
@@ -167,9 +167,8 @@ private void updateViews() {
 				append(pos, Utils.formatTime(activity, System.currentTimeMillis()), " ");
 			}
 			if (showBattery && fullscreen) {
-				int batteryState = activity.getReaderView() != null ? activity.getReaderView().getBatteryState() : 0;
-				if (batteryState >= 0)
-					append(pos, "[" + (batteryState < 10 ? "0" : "") + batteryState + "%]", " ");
+				int batteryLevel = activity.getReaderView() != null ? activity.getReaderView().getBatteryChargeLevel() : 0;
+				append(pos, "[" + (batteryLevel < 10 ? "0" : "") + batteryLevel + "%]", " ");
 			}
 			boolean updated = false;
 			if (!lblPosition.getText().equals(pos)) {
diff --git a/cmake/modules/FindFontConfig.cmake b/cmake/modules/FindFontConfig.cmake
index b8d6c3a5fa..921fc879da 100644
--- a/cmake/modules/FindFontConfig.cmake
+++ b/cmake/modules/FindFontConfig.cmake
@@ -1,25 +1,13 @@
-# - Try to find the  Fontconfig
+# - Try to find the FontConfig
 # Once done this will define
 #
-#  FONTCONFIG_FOUND - system has Fontconfig
-#  FONTCONFIG_INCLUDE_DIR - The include directory to use for the fontconfig headers
-#  FONTCONFIG_LIBRARIES - Link these to use FONTCONFIG
-#  FONTCONFIG_DEFINITIONS - Compiler switches required for using FONTCONFIG
+#  FONTCONFIG_FOUND - system has FontConfig
+#  FONTCONFIG_INCLUDE_DIR - The include directory to use for the FontConfig headers
+#  FONTCONFIG_INCLUDE_DIRS - The same
+#  FONTCONFIG_LIBRARIES - Link these to use FontConfig
+#  FONTCONFIG_DEFINITIONS - Compiler switches required for using FontConfig
+#  FONTCONFIG_VERSION - The version of the FontConfig library which was found.
 
-# Copyright (c) 2006,2007 Laurent Montel, <montel@kde.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products 
-#    derived from this software without specific prior written permission.
-#
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -32,38 +20,72 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-if (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
+mark_as_advanced(FONTCONFIG_LIBRARY FONTCONFIG_INCLUDE_DIR)
+
+if (FONTCONFIG_LIBRARY AND FONTCONFIG_INCLUDE_DIR)
 
   # in cache already
   set(FONTCONFIG_FOUND TRUE)
 
-else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
+else (FONTCONFIG_LIBRARY AND FONTCONFIG_INCLUDE_DIR)
 
   if (NOT MSVC)
     # use pkg-config to get the directories and then use these values
     # in the FIND_PATH() and FIND_LIBRARY() calls
-    find_package(PkgConfig)
-    pkg_check_modules(PC_FONTCONFIG fontconfig)
+    find_package(PkgConfig QUIET)
+    pkg_check_modules(PC_FONTCONFIG QUIET fontconfig)
 
     set(FONTCONFIG_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER})
+    set(FONTCONFIG_VERSION ${PC_FONTCONFIG_VERSION})
   endif (NOT MSVC)
 
   find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h
     PATHS
     ${PC_FONTCONFIG_INCLUDEDIR}
     ${PC_FONTCONFIG_INCLUDE_DIRS}
-    /usr/X11/include
   )
 
-  find_library(FONTCONFIG_LIBRARIES NAMES fontconfig
+  find_library(FONTCONFIG_LIBRARY NAMES fontconfig
     PATHS
     ${PC_FONTCONFIG_LIBDIR}
     ${PC_FONTCONFIG_LIBRARY_DIRS}
   )
 
+  if (NOT FONTCONFIG_VERSION)
+    if(EXISTS "${FONTCONFIG_INCLUDE_DIR}/fontconfig/fontconfig.h")
+      file(STRINGS "${FONTCONFIG_INCLUDE_DIR}/fontconfig/fontconfig.h"
+        _FONTCONFIG_VERSION_MAJOR REGEX "^#define FC_MAJOR")
+      string(REGEX MATCH "[0-9]+" FONTCONFIG_VERSION_MAJOR "${_FONTCONFIG_VERSION_MAJOR}")
+      file(STRINGS "${FONTCONFIG_INCLUDE_DIR}/fontconfig/fontconfig.h"
+        _FONTCONFIG_VERSION_MINOR REGEX "^#define FC_MINOR")
+      string(REGEX MATCH "[0-9]+" FONTCONFIG_VERSION_MINOR "${_FONTCONFIG_VERSION_MINOR}")
+      file(STRINGS "${FONTCONFIG_INCLUDE_DIR}/fontconfig/fontconfig.h"
+        _FONTCONFIG_VERSION_REVISION REGEX "^#define FC_REVISION")
+      string(REGEX MATCH "[0-9]+" FONTCONFIG_VERSION_REVISION "${_FONTCONFIG_VERSION_REVISION}")
+      set(FONTCONFIG_VERSION ${FONTCONFIG_VERSION_MAJOR}.${FONTCONFIG_VERSION_MINOR}.${FONTCONFIG_VERSION_REVISION})
+    endif()
+  endif()
+
   include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(FontConfig DEFAULT_MSG FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR )
-  
-  mark_as_advanced(FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR)
+  find_package_handle_standard_args(FontConfig
+    FOUND_VAR FONTCONFIG_FOUND
+    REQUIRED_VARS
+      FONTCONFIG_LIBRARY
+      FONTCONFIG_INCLUDE_DIR
+    VERSION_VAR FONTCONFIG_VERSION
+  )
+
+endif (FONTCONFIG_LIBRARY AND FONTCONFIG_INCLUDE_DIR)
 
-endif (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
+if(FONTCONFIG_FOUND)
+  set(FONTCONFIG_LIBRARIES ${FONTCONFIG_LIBRARY})
+  set(FONTCONFIG_INCLUDE_DIRS ${FONTCONFIG_INCLUDE_DIR})
+  if(NOT TARGET FontConfig::FontConfig)
+    add_library(FontConfig::FontConfig UNKNOWN IMPORTED)
+    set_target_properties(FontConfig::FontConfig PROPERTIES
+      IMPORTED_LOCATION "${FONTCONFIG_LIBRARIES}"
+      INTERFACE_COMPILE_DEFINITIONS "${FONTCONFIG_DEFINITIONS}"
+      INTERFACE_INCLUDE_DIRECTORIES "${FONTCONFIG_INCLUDE_DIRS}"
+    )
+  endif()
+endif(FONTCONFIG_FOUND)
diff --git a/cmake/modules/FindFriBidi.cmake b/cmake/modules/FindFriBidi.cmake
index 0ab6544fef..038978f379 100644
--- a/cmake/modules/FindFriBidi.cmake
+++ b/cmake/modules/FindFriBidi.cmake
@@ -1,10 +1,11 @@
-# - Try to find the  FriBidi
+# - Try to find the FriBidi
 # Once done this will define
 #
 #  FRIBIDI_FOUND - system has FriBidi
-#  FRIBIDI_INCLUDE_DIR - The include directory to use for the fribidi headers
+#  FRIBIDI_INCLUDE_DIRS - The include directory to use for the FriBidi headers
 #  FRIBIDI_LIBRARIES - Link these to use FriBidi
 #  FRIBIDI_DEFINITIONS - Compiler switches required for using FriBidi
+#  FRIBIDI_VERSION - The version of the FriBidi library which was found.
 
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -18,37 +19,72 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-if (FRIBIDI_LIBRARIES AND FRIBIDI_INCLUDE_DIR)
+mark_as_advanced(FRIBIDI_LIBRARY FRIBIDI_INCLUDE_DIR)
+
+if (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR)
 
   # in cache already
   set(FRIBIDI_FOUND TRUE)
 
-else (FRIBIDI_LIBRARIES AND FRIBIDI_INCLUDE_DIR)
+else (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR)
 
   if (NOT MSVC)
     # use pkg-config to get the directories and then use these values
     # in the FIND_PATH() and FIND_LIBRARY() calls
-    find_package(PkgConfig)
-    pkg_check_modules(PC_FRIBIDI fribidi)
+    find_package(PkgConfig QUIET)
+    pkg_check_modules(PC_FRIBIDI QUIET fribidi)
 
     set(FRIBIDI_DEFINITIONS ${PC_FRIBIDI_CFLAGS_OTHER})
+    set(FRIBIDI_VERSION ${PC_FRIBIDI_VERSION})
   endif (NOT MSVC)
 
-  find_path(FRIBIDI_INCLUDE_DIR fribidi.h
+  find_path(FRIBIDI_INCLUDE_DIR fribidi/fribidi.h
     PATHS
     ${PC_FRIBIDI_INCLUDEDIR}
     ${PC_FRIBIDI_INCLUDE_DIRS}
   )
 
-  find_library(FRIBIDI_LIBRARIES NAMES fribidi
+  find_library(FRIBIDI_LIBRARY NAMES fribidi
     PATHS
     ${PC_FRIBIDI_LIBDIR}
     ${PC_FRIBIDI_LIBRARY_DIRS}
   )
 
+  if (NOT FRIBIDI_VERSION)
+    if(EXISTS "${FRIBIDI_INCLUDE_DIR}/fribidi/fribidi-config.h")
+      file(STRINGS "${FRIBIDI_INCLUDE_DIR}/fribidi/fribidi-config.h"
+        _FRIBIDI_VERSION_MAJOR REGEX "^#define FRIBIDI_MAJOR_VERSION")
+      string(REGEX MATCH "[0-9]+" FRIBIDI_VERSION_MAJOR "${_FRIBIDI_VERSION_MAJOR}")
+      file(STRINGS "${FRIBIDI_INCLUDE_DIR}/fribidi/fribidi-config.h"
+        _FRIBIDI_VERSION_MINOR REGEX "^#define FRIBIDI_MINOR_VERSION")
+      string(REGEX MATCH "[0-9]+" FRIBIDI_VERSION_MINOR "${_FRIBIDI_VERSION_MINOR}")
+      file(STRINGS "${FRIBIDI_INCLUDE_DIR}/fribidi/fribidi-config.h"
+        _FRIBIDI_VERSION_MICRO REGEX "^#define FRIBIDI_MICRO_VERSION")
+      string(REGEX MATCH "[0-9]+" FRIBIDI_VERSION_MICRO "${_FRIBIDI_VERSION_MICRO}")
+      set(FRIBIDI_VERSION ${FRIBIDI_VERSION_MAJOR}.${FRIBIDI_VERSION_MINOR}.${FRIBIDI_VERSION_MICRO})
+    endif()
+  endif()
+
   include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(FriBidi DEFAULT_MSG FRIBIDI_LIBRARIES FRIBIDI_INCLUDE_DIR )
-  
-  mark_as_advanced(FRIBIDI_LIBRARIES FRIBIDI_INCLUDE_DIR)
+  find_package_handle_standard_args(FriBidi
+    FOUND_VAR FRIBIDI_FOUND
+    REQUIRED_VARS
+      FRIBIDI_LIBRARY
+      FRIBIDI_INCLUDE_DIR
+    VERSION_VAR FRIBIDI_VERSION
+  )
+
+endif (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR)
 
-endif (FRIBIDI_LIBRARIES AND FRIBIDI_INCLUDE_DIR)
+if(FRIBIDI_FOUND)
+  set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
+  set(FRIBIDI_INCLUDE_DIRS ${FRIBIDI_INCLUDE_DIR})
+  if(NOT TARGET FriBidi::FriBidi)
+    add_library(FriBidi::FriBidi UNKNOWN IMPORTED)
+    set_target_properties(FriBidi::FriBidi PROPERTIES
+      IMPORTED_LOCATION "${FRIBIDI_LIBRARIES}"
+      INTERFACE_COMPILE_DEFINITIONS "${FRIBIDI_DEFINITIONS}"
+      INTERFACE_INCLUDE_DIRECTORIES "${FRIBIDI_INCLUDE_DIRS}"
+    )
+  endif()
+endif(FRIBIDI_FOUND)
diff --git a/cmake/modules/FindHarfBuzz.cmake b/cmake/modules/FindHarfBuzz.cmake
index 2a1dba1315..17e77a2577 100644
--- a/cmake/modules/FindHarfBuzz.cmake
+++ b/cmake/modules/FindHarfBuzz.cmake
@@ -1,66 +1,91 @@
-#.rst:
-# Find HarfBuzz
-# -------------
-#
-# Finds the HarfBuzz library. This module defines:
-#
-#  HarfBuzz_FOUND           - True if HarfBuzz library is found
-#  HarfBuzz::HarfBuzz       - HarfBuzz imported target
-#
-# Additionally these variables are defined for internal usage:
-#
-#  HARFBUZZ_LIBRARY         - HarfBuzz library
-#  HARFBUZZ_LIBRARIES       - Same as HARFBUZZ_LIBRARY
-#  HARFBUZZ_INCLUDE_DIRS    - Include dir
+# - Try to find the HarfBuzz
+# Once done this will define
 #
+#  HarfBuzz_FOUND - system has HarfBuzz
+#  HarfBuzz_INCLUDE_DIRS - The include directory to use for the HarfBuzz headers
+#  HarfBuzz_LIBRARIES - Link these to use HarfBuzz
+#  HarfBuzz_DEFINITIONS - Compiler switches required for using HarfBuzz
+#  HarfBuzz_VERSION - The version of the HarfBuzz library which was found.
 
-#
-#   This file is part of Magnum.
-#
-#   Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
-#             Vladimír Vondruš <mosra@centrum.cz>
-#
-#   Permission is hereby granted, free of charge, to any person obtaining a
-#   copy of this software and associated documentation files (the "Software"),
-#   to deal in the Software without restriction, including without limitation
-#   the rights to use, copy, modify, merge, publish, distribute, sublicense,
-#   and/or sell copies of the Software, and to permit persons to whom the
-#   Software is furnished to do so, subject to the following conditions:
-#
-#   The above copyright notice and this permission notice shall be included
-#   in all copies or substantial portions of the Software.
-#
-#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-#   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-#   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-#   DEALINGS IN THE SOFTWARE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-# Library
-find_library(HARFBUZZ_LIBRARY NAMES harfbuzz)
+mark_as_advanced(HarfBuzz_LIBRARY HarfBuzz_INCLUDE_DIR)
 
-# Include dir
-find_path(HARFBUZZ_INCLUDE_DIRS
-    NAMES hb.h
-    PATH_SUFFIXES harfbuzz)
+if (HarfBuzz_LIBRARY AND HarfBuzz_INCLUDE_DIR)
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(HarfBuzz DEFAULT_MSG
-    HARFBUZZ_LIBRARY
-    HARFBUZZ_INCLUDE_DIRS)
+  # in cache already
+  set(HarfBuzz_FOUND TRUE)
 
-mark_as_advanced(FORCE
-    HARFBUZZ_LIBRARY
-    HARFBUZZ_INCLUDE_DIRS)
+else (HarfBuzz_LIBRARY AND HarfBuzz_INCLUDE_DIR)
 
-if(NOT TARGET HarfBuzz::HarfBuzz)
+  if (NOT MSVC)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig QUIET)
+    pkg_check_modules(PC_HARFBUZZ QUIET harfbuzz)
+
+    set(HarfBuzz_DEFINITIONS ${PC_HARFBUZZ_CFLAGS_OTHER})
+    set(HarfBuzz_VERSION ${PC_HARFBUZZ_VERSION})
+  endif (NOT MSVC)
+
+  find_path(HarfBuzz_INCLUDE_DIR hb.h
+    PATH_SUFFIXES harfbuzz
+    PATHS
+    ${PC_HARFBUZZ_INCLUDEDIR}
+    ${PC_HARFBUZZ_INCLUDE_DIRS}
+  )
+
+  find_library(HarfBuzz_LIBRARY NAMES harfbuzz
+    PATHS
+    ${PC_HARFBUZZ_LIBDIR}
+    ${PC_HARFBUZZ_LIBRARY_DIRS}
+  )
+
+  if (NOT HarfBuzz_VERSION)
+    if(EXISTS "${HarfBuzz_INCLUDE_DIR}/hb-version.h")
+      file(STRINGS "${HarfBuzz_INCLUDE_DIR}/hb-version.h"
+        _HARFBUZZ_VERSION_MAJOR REGEX "^#define HB_VERSION_MAJOR")
+      string(REGEX MATCH "[0-9]+" HarfBuzz_VERSION_MAJOR "${_HARFBUZZ_VERSION_MAJOR}")
+      file(STRINGS "${HarfBuzz_INCLUDE_DIR}/hb-version.h"
+        _HARFBUZZ_VERSION_MINOR REGEX "^#define HB_VERSION_MINOR")
+      string(REGEX MATCH "[0-9]+" HarfBuzz_VERSION_MINOR "${_HARFBUZZ_VERSION_MINOR}")
+      file(STRINGS "${HarfBuzz_INCLUDE_DIR}/hb-version.h"
+        _HARFBUZZ_VERSION_MICRO REGEX "^#define HB_VERSION_MICRO")
+      string(REGEX MATCH "[0-9]+" HarfBuzz_VERSION_MICRO "${_HARFBUZZ_VERSION_MICRO}")
+      set(HarfBuzz_VERSION ${HarfBuzz_VERSION_MAJOR}.${HarfBuzz_VERSION_MINOR}.${HarfBuzz_VERSION_MICRO})
+    endif()
+  endif()
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(HarfBuzz
+    FOUND_VAR HarfBuzz_FOUND
+    REQUIRED_VARS
+      HarfBuzz_LIBRARY
+      HarfBuzz_INCLUDE_DIR
+    VERSION_VAR HarfBuzz_VERSION
+  )
+
+endif (HarfBuzz_LIBRARY AND HarfBuzz_INCLUDE_DIR)
+
+if(HarfBuzz_FOUND)
+  set(HarfBuzz_LIBRARIES ${HarfBuzz_LIBRARY})
+  set(HarfBuzz_INCLUDE_DIRS ${HarfBuzz_INCLUDE_DIR})
+  if(NOT TARGET HarfBuzz::HarfBuzz)
     add_library(HarfBuzz::HarfBuzz UNKNOWN IMPORTED)
     set_target_properties(HarfBuzz::HarfBuzz PROPERTIES
-        IMPORTED_LOCATION ${HARFBUZZ_LIBRARY}
-        INTERFACE_INCLUDE_DIRECTORIES ${HARFBUZZ_INCLUDE_DIRS})
-endif()
-
-set(HARFBUZZ_LIBRARIES ${HARFBUZZ_LIBRARY})
+      IMPORTED_LOCATION "${HarfBuzz_LIBRARIES}"
+      INTERFACE_COMPILE_DEFINITIONS "${HarfBuzz_DEFINITIONS}"
+      INTERFACE_INCLUDE_DIRECTORIES "${HarfBuzz_INCLUDE_DIRS}"
+    )
+  endif()
+endif(HarfBuzz_FOUND)
diff --git a/cmake/modules/FindZSTD.cmake b/cmake/modules/FindZSTD.cmake
index 273d019242..007bc0ea99 100644
--- a/cmake/modules/FindZSTD.cmake
+++ b/cmake/modules/FindZSTD.cmake
@@ -90,7 +90,7 @@ endif()
 
 # Additionally try and use pkconfig to find libzstd
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_ZSTD QUIET libzstd)
 
 # ------------------------------------------------------------------------
@@ -114,13 +114,13 @@ find_path(ZSTD_INCLUDE_DIR zstd.h
 if(EXISTS "${ZSTD_INCLUDE_DIR}/zstd.h")
   file(STRINGS "${ZSTD_INCLUDE_DIR}/zstd.h" 
     _ZSTD_VERSION_MAJOR REGEX "^#define ZSTD_VERSION_MAJOR")
-  string(REGEX MATCH "[0-9]+" ZSTD_VERSION_MAJOR ${_ZSTD_VERSION_MAJOR})
+  string(REGEX MATCH "[0-9]+" ZSTD_VERSION_MAJOR "${_ZSTD_VERSION_MAJOR}")
   file(STRINGS "${ZSTD_INCLUDE_DIR}/zstd.h" 
     _ZSTD_VERSION_MINOR REGEX "^#define ZSTD_VERSION_MINOR")
-  string(REGEX MATCH "[0-9]+" ZSTD_VERSION_MINOR ${_ZSTD_VERSION_MINOR} )
+  string(REGEX MATCH "[0-9]+" ZSTD_VERSION_MINOR "${_ZSTD_VERSION_MINOR}")
   file(STRINGS "${ZSTD_INCLUDE_DIR}/zstd.h" 
     _ZSTD_VERSION_RELEASE REGEX "^#define ZSTD_VERSION_RELEASE")
-  string(REGEX MATCH "[0-9]+" ZSTD_VERSION_RELEASE ${_ZSTD_VERSION_RELEASE} )
+  string(REGEX MATCH "[0-9]+" ZSTD_VERSION_RELEASE "${_ZSTD_VERSION_RELEASE}")
   set(ZSTD_VERSION ${ZSTD_VERSION_MAJOR}.${ZSTD_VERSION_MINOR}.${ZSTD_VERSION_RELEASE})
 endif()
 
diff --git a/cmake/modules/Findlibunibreak.cmake b/cmake/modules/Findlibunibreak.cmake
index 34bb3b6f37..4a01e646f9 100644
--- a/cmake/modules/Findlibunibreak.cmake
+++ b/cmake/modules/Findlibunibreak.cmake
@@ -3,8 +3,10 @@
 #
 #  LIBUNIBREAK_FOUND - system has libunibreak
 #  LIBUNIBREAK_INCLUDE_DIR - The include directory to use for the libunibreak headers
+#  LIBUNIBREAK_INCLUDE_DIRS - The same
 #  LIBUNIBREAK_LIBRARIES - Link these to use libunibreak
 #  LIBUNIBREAK_DEFINITIONS - Compiler switches required for using libunibreak
+#  LIBUNIBREAK_VERSION - The version of the libunibreak library which was found.
 
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -18,20 +20,23 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-if (LIBUNIBREAK_LIBRARIES AND LIBUNIBREAK_INCLUDE_DIR)
+mark_as_advanced(LIBUNIBREAK_LIBRARY LIBUNIBREAK_INCLUDE_DIR)
+
+if (LIBUNIBREAK_LIBRARY AND LIBUNIBREAK_INCLUDE_DIR)
 
   # in cache already
   set(LIBUNIBREAK_FOUND TRUE)
 
-else (LIBUNIBREAK_LIBRARIES AND LIBUNIBREAK_INCLUDE_DIR)
+else (LIBUNIBREAK_LIBRARY AND LIBUNIBREAK_INCLUDE_DIR)
 
   if (NOT MSVC)
     # use pkg-config to get the directories and then use these values
     # in the FIND_PATH() and FIND_LIBRARY() calls
-    find_package(PkgConfig)
-    pkg_check_modules(PC_LIBUNIBREAK libunibreak)
+    find_package(PkgConfig QUIET)
+    pkg_check_modules(PC_LIBUNIBREAK QUIET libunibreak)
 
     set(LIBUNIBREAK_DEFINITIONS ${PC_LIBUNIBREAK_CFLAGS_OTHER})
+    set(LIBUNIBREAK_VERSION ${PC_LIBUNIBREAK_VERSION})
   endif (NOT MSVC)
 
   find_path(LIBUNIBREAK_INCLUDE_DIR linebreak.h
@@ -40,15 +45,48 @@ else (LIBUNIBREAK_LIBRARIES AND LIBUNIBREAK_INCLUDE_DIR)
     ${PC_LIBUNIBREAK_INCLUDE_DIRS}
   )
 
-  find_library(LIBUNIBREAK_LIBRARIES NAMES unibreak
+  find_library(LIBUNIBREAK_LIBRARY NAMES unibreak
     PATHS
     ${PC_LIBUNIBREAK_LIBDIR}
     ${PC_LIBUNIBREAK_LIBRARY_DIRS}
   )
 
+  if (NOT LIBUNIBREAK_VERSION)
+    if(EXISTS "${LIBUNIBREAK_INCLUDE_DIR}/unibreakbase.h")
+      file(STRINGS "${LIBUNIBREAK_INCLUDE_DIR}/unibreakbase.h"
+        _LIBUNIBREAK_VERSION_MAJOR REGEX "^#define UNIBREAK_VERSION")
+      string(REGEX MATCH "0x[0-9]+" _LIBUNIBREAK_VERSION_MAJOR "${_LIBUNIBREAK_VERSION_MAJOR}")
+      string(REGEX REPLACE "0x([0-9][0-9])[0-9]+" "\\1" LIBUNIBREAK_VERSION_MAJOR "${_LIBUNIBREAK_VERSION_MAJOR}")
+      string(REGEX REPLACE "0([0-9])" "\\1" LIBUNIBREAK_VERSION_MAJOR "${LIBUNIBREAK_VERSION_MAJOR}")
+      file(STRINGS "${LIBUNIBREAK_INCLUDE_DIR}/unibreakbase.h"
+        _LIBUNIBREAK_VERSION_MINOR REGEX "^#define UNIBREAK_VERSION")
+      string(REGEX MATCH "0x[0-9]+" _LIBUNIBREAK_VERSION_MINOR "${_LIBUNIBREAK_VERSION_MINOR}")
+      string(REGEX REPLACE "0x[0-9][0-9]([0-9][0-9])" "\\1" LIBUNIBREAK_VERSION_MINOR "${_LIBUNIBREAK_VERSION_MINOR}")
+      string(REGEX REPLACE "0([0-9])" "\\1" LIBUNIBREAK_VERSION_MINOR "${LIBUNIBREAK_VERSION_MINOR}")
+      set(LIBUNIBREAK_VERSION ${LIBUNIBREAK_VERSION_MAJOR}.${LIBUNIBREAK_VERSION_MINOR})
+    endif()
+  endif()
+
   include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(libunibreak DEFAULT_MSG LIBUNIBREAK_LIBRARIES LIBUNIBREAK_INCLUDE_DIR)
+  find_package_handle_standard_args(libunibreak
+    FOUND_VAR LIBUNIBREAK_FOUND
+    REQUIRED_VARS
+      LIBUNIBREAK_LIBRARY
+      LIBUNIBREAK_INCLUDE_DIR
+    VERSION_VAR LIBUNIBREAK_VERSION
+  )
 
-  mark_as_advanced(LIBUNIBREAK_LIBRARIES LIBUNIBREAK_INCLUDE_DIR)
+endif (LIBUNIBREAK_LIBRARY AND LIBUNIBREAK_INCLUDE_DIR)
 
-endif (LIBUNIBREAK_LIBRARIES AND LIBUNIBREAK_INCLUDE_DIR)
+if(LIBUNIBREAK_FOUND)
+  set(LIBUNIBREAK_LIBRARIES ${LIBUNIBREAK_LIBRARY})
+  set(LIBUNIBREAK_INCLUDE_DIRS ${LIBUNIBREAK_INCLUDE_DIR})
+  if(NOT TARGET LIBUNIBREAK::libunibreak)
+    add_library(LIBUNIBREAK::libunibreak UNKNOWN IMPORTED)
+    set_target_properties(LIBUNIBREAK::libunibreak PROPERTIES
+      IMPORTED_LOCATION "${LIBUNIBREAK_LIBRARIES}"
+      INTERFACE_COMPILE_DEFINITIONS "${LIBUNIBREAK_DEFINITIONS}"
+      INTERFACE_INCLUDE_DIRECTORIES "${LIBUNIBREAK_INCLUDE_DIRS}"
+    )
+  endif()
+endif(LIBUNIBREAK_FOUND)
diff --git a/cmake/modules/Findutf8proc.cmake b/cmake/modules/Findutf8proc.cmake
index a1011a6e33..0e022f0bc2 100644
--- a/cmake/modules/Findutf8proc.cmake
+++ b/cmake/modules/Findutf8proc.cmake
@@ -37,7 +37,7 @@ endif()
 
 # Additionally try and use pkconfig to find libutf8proc
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_UTF8PROC QUIET libutf8proc)
 
 # ------------------------------------------------------------------------
diff --git a/cr3qt/src/cr3widget.cpp b/cr3qt/src/cr3widget.cpp
index 67f959fd3f..7b9eb644d4 100644
--- a/cr3qt/src/cr3widget.cpp
+++ b/cr3qt/src/cr3widget.cpp
@@ -31,10 +31,6 @@
 #include <QDesktopServices>
 #include <QLocale>
 
-#if USE_LOCALE_DATA==1
-#include "crlocaledata.h"
-#endif
-
 /// to hide non-qt implementation, place all crengine-related fields here
 class CR3View::DocViewData
 {
@@ -44,7 +40,9 @@ class CR3View::DocViewData
     CRPropRef _props;
 };
 
+#if USE_LIMITED_FONT_SIZES_SET
 DECL_DEF_CR_FONT_SIZES;
+#endif
 
 static void replaceColor( char * str, lUInt32 color )
 {
@@ -90,8 +88,6 @@ static LVRefVec<LVImageSource>& getBatteryIcons( lUInt32 color )
         ".0..0.XXXX.XXXX.XXXX.XXXX.0.",
         ".0..0.XXXX.XXXX.XXXX.XXXX.0.",
         ".0..0.XXXX.XXXX.XXXX.XXXX.0.",
-        ".0..0.XXXX.XXXX.XXXX.XXXX.0.",
-        ".0..0.XXXX.XXXX.XXXX.XXXX.0.",
         ".0000.XXXX.XXXX.XXXX.XXXX.0.",
         "....0.XXXX.XXXX.XXXX.XXXX.0.",
         "   .0.....................0.",
@@ -313,7 +309,10 @@ CR3View::CR3View( QWidget *parent)
         : QWidget( parent, Qt::WindowFlags() ), _scroll(NULL), _propsCallback(NULL)
         , _normalCursor(Qt::ArrowCursor), _linkCursor(Qt::PointingHandCursor)
         , _selCursor(Qt::IBeamCursor), _waitCursor(Qt::WaitCursor)
-        , _selecting(false), _selected(false), _editMode(false), _lastBatteryState(CR_BATTERY_STATE_NO_BATTERY)
+        , _selecting(false), _selected(false), _editMode(false)
+        , _lastBatteryState(CR_BATTERY_STATE_NO_BATTERY)
+        , _lastBatteryChargingConn(CR_BATTERY_CHARGER_NO)
+        , _lastBatteryChargeLevel(0)
 {
 #if WORD_SELECTOR_ENABLED==1
     _wordSelector = NULL;
@@ -329,11 +328,13 @@ CR3View::CR3View( QWidget *parent)
     ldomXPointerEx p2;
     _selRange.setStart(p1);
     _selRange.setEnd(p2);
+#if USE_LIMITED_FONT_SIZES_SET
     LVArray<int> sizes( cr_font_sizes, sizeof(cr_font_sizes)/sizeof(int) );
     _docview->setFontSizes( sizes, false );
+#endif
 
     _docview->setBatteryIcons( getBatteryIcons(0x000000) );
-    _docview->setBatteryState(CR_BATTERY_STATE_NO_BATTERY); // don't show battery
+    _docview->setBatteryState(CR_BATTERY_STATE_NO_BATTERY, CR_BATTERY_CHARGER_NO, 0); // don't show battery
     //_docview->setBatteryState( 75 ); // 75%
 //    LVStreamRef stream;
 //    stream = LVOpenFileStream("/home/lve/.cr3/textures/old_paper.png", LVOM_READ);
@@ -529,21 +530,31 @@ void CR3View::resizeEvent ( QResizeEvent * event )
     _docview->Resize( sz.width(), sz.height() );
 }
 
-int getBatteryState()
+static bool getBatteryState(int& state, int& chargingConn, int& level)
 {
 #ifdef _WIN32
     // update battery state
     SYSTEM_POWER_STATUS bstatus;
     BOOL pow = GetSystemPowerStatus(&bstatus);
-    if (bstatus.BatteryFlag & 128)
-        return CR_BATTERY_STATE_NO_BATTERY; // no system battery
-	if (bstatus.ACLineStatus==8 && bstatus.BatteryLifePercent<100 )
-		return CR_BATTERY_STATE_CHARGING; // charging
-    if (bstatus.BatteryLifePercent>=0 && bstatus.BatteryLifePercent<=100)
-		return bstatus.BatteryLifePercent;
-    return CR_BATTERY_STATE_NO_BATTERY;
+    if (pow) {
+        state = CR_BATTERY_STATE_DISCHARGING;
+        if (bstatus.BatteryFlag & 128)
+            state = CR_BATTERY_STATE_NO_BATTERY;  // no system battery
+        else if (bstatus.BatteryFlag & 8)
+            state = CR_BATTERY_STATE_CHARGING;    // charging
+        chargingConn = CR_BATTERY_CHARGER_NO;
+        if (bstatus.ACLineStatus==1)
+            chargingConn = CR_BATTERY_CHARGER_AC; // AC power charging connected
+        if (bstatus.BatteryLifePercent>=0 && bstatus.BatteryLifePercent<=100)
+            level = bstatus.BatteryLifePercent;
+        return true;
+    }
+    return false;
 #else
-	return CR_BATTERY_STATE_NO_BATTERY;
+    state = CR_BATTERY_STATE_NO_BATTERY;
+    chargingConn = CR_BATTERY_CHARGER_NO;
+    level = 0;
+    return true;
 #endif
 }
 
@@ -551,11 +562,18 @@ void CR3View::paintEvent ( QPaintEvent * event )
 {
     QPainter painter(this);
     QRect rc = rect();
-	int newBatteryState = getBatteryState();
-	if (_lastBatteryState != newBatteryState) {
-		_docview->setBatteryState( newBatteryState );
-		_lastBatteryState = newBatteryState;
-	}
+    int newBatteryState;
+    int newChargingConn;
+    int newChargeLevel;
+    if (getBatteryState(newBatteryState, newChargingConn, newChargeLevel) &&
+            (_lastBatteryState != newBatteryState ||
+             _lastBatteryChargingConn != newChargingConn ||
+             _lastBatteryChargeLevel != newChargeLevel)) {
+        _docview->setBatteryState( newBatteryState, newChargingConn, newChargeLevel );
+        _lastBatteryState = newBatteryState;
+        _lastBatteryChargingConn = newChargingConn;
+        _lastBatteryChargeLevel = newChargeLevel;
+    }
     LVDocImageRef ref = _docview->getPageImage(0);
     if ( ref.isNull() ) {
         //painter.fillRect();
@@ -1109,18 +1127,8 @@ void CR3View::checkFontLanguageCompatibility()
         return;
     }
     if (fontFace_u8.length() > 0) {
-        CRLocaleData loc(langCode_u8);
-        if (loc.isValid()) {
-            QString langDescr = loc.langName().c_str();
-            if (loc.scriptNumeric() > 0) {
-                langDescr.append("-");
-                langDescr.append(loc.scriptName().c_str());
-            }
-            if (loc.regionNumeric() > 0) {
-                langDescr.append(" (");
-                langDescr.append(loc.regionAlpha3().c_str());
-                langDescr.append(")");
-            }
+        QString langDescr = getHumanReadableLocaleName(langCode);
+        if (!langDescr.isEmpty()) {
             font_lang_compat compat = fontMan->checkFontLangCompat(fontFace_u8, langCode_u8);
             CRLog::debug("Checking font \"%s\" for compatibility with language \"%s\": %d", fontFace_u8.c_str(), langCode_u8.c_str(), (int)compat);
             switch (compat) {
diff --git a/cr3qt/src/cr3widget.h b/cr3qt/src/cr3widget.h
index 8f8a00a42d..3fdf20b3c9 100644
--- a/cr3qt/src/cr3widget.h
+++ b/cr3qt/src/cr3widget.h
@@ -188,7 +188,9 @@ class CR3View : public QWidget, public LVDocViewCallback
         QString _cssDir;
         QString _bookmarkDir;
         bool _editMode;
-		int _lastBatteryState;
+        int _lastBatteryState;
+        int _lastBatteryChargingConn;
+        int _lastBatteryChargeLevel;
 };
 
 #endif // CR3WIDGET_H
diff --git a/cr3qt/src/crqtutil.cpp b/cr3qt/src/crqtutil.cpp
index 20e7dffbbf..70b246ad7e 100644
--- a/cr3qt/src/crqtutil.cpp
+++ b/cr3qt/src/crqtutil.cpp
@@ -1,5 +1,6 @@
 #include "crqtutil.h"
 #include "../crengine/include/props.h"
+#include "../crengine/include/crlocaledata.h"
 #include <QStringList>
 #include <QWidget>
 #include <QPoint>
@@ -140,6 +141,29 @@ void crGetFontFaceList( QStringList & dst )
     cr2qt( dst, faceList );
 }
 
+QString getHumanReadableLocaleName(lString32 langTag)
+{
+#if USE_LOCALE_DATA==1
+    QString res;
+    CRLocaleData loc(UnicodeToUtf8(langTag));
+    if (loc.isValid()) {
+        res = loc.langName().c_str();
+        if (loc.scriptNumeric() > 0) {
+            res.append("-");
+            res.append(loc.scriptName().c_str());
+        }
+        if (loc.regionNumeric() > 0) {
+            res.append(" (");
+            res.append(loc.regionAlpha3().c_str());
+            res.append(")");
+        }
+    }
+#else
+    QString res = QT_TRANSLATE_NOOP("crqtutils", "Undetermined");
+#endif
+    return res;
+}
+
 QString crpercent( int p )
 {
     return QString("%1.%2%").arg(p/100).arg(p%100,2, 10,QLatin1Char('0'));
diff --git a/cr3qt/src/crqtutil.h b/cr3qt/src/crqtutil.h
index 9076e48eb2..4a3f982bc6 100644
--- a/cr3qt/src/crqtutil.h
+++ b/cr3qt/src/crqtutil.h
@@ -57,6 +57,8 @@ QString crpercent( int p );
 
 void crGetFontFaceList( QStringList & dst );
 
+QString getHumanReadableLocaleName(lString32 langTag);
+
 class QWidget;
 /// save window position to properties
 void saveWindowPosition( QWidget * window, CRPropRef props, const char * prefix );
diff --git a/cr3qt/src/filepropsdlg.cpp b/cr3qt/src/filepropsdlg.cpp
index 30e9f89d9c..3ea3bae399 100644
--- a/cr3qt/src/filepropsdlg.cpp
+++ b/cr3qt/src/filepropsdlg.cpp
@@ -172,7 +172,7 @@ void FilePropsDialog::fillItems()
 
     addPropLine( tr("Current page"), cr2qt(lString32::itoa(_docview->getCurPage())) );
     addPropLine( tr("Total pages"), cr2qt(lString32::itoa(_docview->getPageCount())) );
-    addPropLine( tr("Battery state"), cr2qt(lString32::itoa(_docview->getBatteryState()) + "%") );
+    addPropLine( tr("Battery state"), cr2qt(lString32::itoa(_docview->getBatteryChargeLevel()) + "%") );
     addPropLine( tr("Current Time"), cr2qt(_docview->getTimeString()) );
     // TODO:
     if ( hist ) {
@@ -198,6 +198,7 @@ void FilePropsDialog::fillItems()
     addPropLine( tr("Series number"), cr2qt(props->getStringDef(DOC_PROP_SERIES_NUMBER)) );
     addPropLine( tr("Date"), getDocText( "/FictionBook/description/title-info/date", ", " ) );
     addPropLine( tr("Genres"), getDocText( "/FictionBook/description/title-info/genre", ", " ) );
+    addPropLine( tr("Language"), getHumanReadableLocaleName(props->getStringDef(DOC_PROP_LANGUAGE)) );
     addPropLine( tr("Translator"), getDocText( "/FictionBook/description/title-info/translator", ", " ) );
     addInfoSection( tr("Book info") );
 
diff --git a/cr3qt/src/i18n/cr3_ru.ts b/cr3qt/src/i18n/cr3_ru.ts
index 876b013458..ab66539e4b 100644
--- a/cr3qt/src/i18n/cr3_ru.ts
+++ b/cr3qt/src/i18n/cr3_ru.ts
@@ -485,6 +485,10 @@ p, li { white-space: pre-wrap; }
         <source>Dialog</source>
         <translation>Диалог</translation>
     </message>
+    <message>
+        <source>Language</source>
+        <translation>Язык</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -2035,4 +2039,11 @@ p, li { white-space: pre-wrap; }
         <translation>3</translation>
     </message>
 </context>
+<context>
+    <name>crqtutils</name>
+    <message>
+        <source>Undetermined</source>
+        <translation>Неопределенный</translation>
+    </message>
+</context>
 </TS>
diff --git a/cr3qt/src/settings.cpp b/cr3qt/src/settings.cpp
index 6424e54578..9aff7b3279 100644
--- a/cr3qt/src/settings.cpp
+++ b/cr3qt/src/settings.cpp
@@ -195,7 +195,6 @@ SettingsDlg::SettingsDlg(QWidget *parent, CR3View * docView ) :
     optionToUi( PROP_EMBEDDED_STYLES, m_ui->cbEnableDocumentStyles );
     optionToUi( PROP_EMBEDDED_FONTS, m_ui->cbEnableEmbeddedFonts );
     m_ui->cbEnableEmbeddedFonts->setEnabled(m_props->getBoolDef(PROP_EMBEDDED_STYLES, true));
-    optionToUi( PROP_TXT_OPTION_PREFORMATTED, m_ui->cbTxtPreFormatted );
     optionToUi( PROP_FONT_KERNING_ENABLED, m_ui->cbFontKerning );
     optionToUi( PROP_FLOATING_PUNCTUATION, m_ui->cbFloatingPunctuation );
     optionToUiIndex( PROP_IMG_SCALING_ZOOMIN_INLINE_MODE, m_ui->cbImageInlineZoominMode );
@@ -447,8 +446,8 @@ void SettingsDlg::on_buttonBox_accepted()
 
 void SettingsDlg::optionToUi( const char * optionName, QCheckBox * cb )
 {
-    int state = ( m_props->getIntDef( optionName, 1 ) != 0 ) ? 1 : 0;
-    CRLog::debug("optionToUI(%s,%d)", optionName, state);
+    bool state = m_props->getBoolDef( optionName, true );
+    CRLog::debug("optionToUI(%s,%d)", optionName, (int)state);
     cb->setCheckState( state ? Qt::Checked : Qt::Unchecked );
 }
 
diff --git a/crengine/include/cr3version.h b/crengine/include/cr3version.h
index 8237f7ee76..328bd4bd26 100644
--- a/crengine/include/cr3version.h
+++ b/crengine/include/cr3version.h
@@ -1,2 +1,2 @@
-#define CR_ENGINE_VERSION "3.2.56-1"
-#define CR_ENGINE_BUILD_DATE "2021-04-02"
+#define CR_ENGINE_VERSION "3.2.58-1"
+#define CR_ENGINE_BUILD_DATE "2021-06-13"
diff --git a/crengine/include/lvdocview.h b/crengine/include/lvdocview.h
index f783703de8..4a86174045 100644
--- a/crengine/include/lvdocview.h
+++ b/crengine/include/lvdocview.h
@@ -33,11 +33,21 @@ typedef enum {
     txt_format_auto  // autodetect format
 } txt_format_t;
 
-/// no battery
+/// Battery state: no battery
 #define CR_BATTERY_STATE_NO_BATTERY -2
-/// battery is charging
+/// Battery state: battery is charging
 #define CR_BATTERY_STATE_CHARGING -1
-// values 0..100 -- battery life percent
+/// Battery state: battery is discharging
+#define CR_BATTERY_STATE_DISCHARGING -3
+
+/// Battery charger connection: no connection
+#define CR_BATTERY_CHARGER_NO 1
+/// Battery charger connection: AC adapter
+#define CR_BATTERY_CHARGER_AC 2
+/// Battery charger connection: USB
+#define CR_BATTERY_CHARGER_USB 3
+/// Battery charger connection: Wireless
+#define CR_BATTERY_CHARGER_WIRELESS 4
 
 #ifndef CR_ENABLE_PAGE_IMAGE_CACHE
 #ifdef ANDROID
@@ -259,6 +269,8 @@ class LVDocView : public CacheLoadingCallback
     ldomXPointer _posBookmark; // bookmark for current position
 
     int m_battery_state;
+    int m_battery_charging_conn;
+    int m_battery_charge_level;
     int m_requested_font_size;
     int m_font_size; // = m_requested_font_size, possibly scaled according to DPI
     int m_status_font_size;
@@ -391,13 +403,6 @@ class LVDocView : public CacheLoadingCallback
     void updateDocStyleSheet();
 
 protected:
-    // deprecated: ready to remove
-    virtual void drawNavigationBar( LVDrawBuf * drawbuf, int pageIndex, int percent );
-    // deprecated: ready to remove
-    virtual void getNavigationBarRectangle( lvRect & rc );
-    // deprecated: ready to remove
-    virtual void getNavigationBarRectangle( int pageIndex, lvRect & rc );
-
     /// returns document offset for next page
     int getNextPageOffset();
     /// returns document offset for previous page
@@ -410,6 +415,8 @@ class LVDocView : public CacheLoadingCallback
     bool getCursorDocRect( ldomXPointer ptr, lvRect & rc );
     /// load document from stream (internal)
     bool loadDocumentInt( LVStreamRef stream, bool metadataOnly = false );
+    /// get section bounds for specific root node and specific section depth level, in 1/100 of percent
+    void getSectionBoundsInt( LVArray<int>& bounds, ldomNode* node , lUInt16 section_id, int target_level, int level );
 public:
     /// get outer (before margins are applied) page rectangle
     virtual void getPageRectangle( int pageIndex, lvRect & pageRect ) const;
@@ -646,11 +653,15 @@ class LVDocView : public CacheLoadingCallback
     /// returns true if document is opened
     bool isDocumentOpened();
     /// returns section bounds, in 1/100 of percent
-    LVArray<int> & getSectionBounds( bool for_external_update=false );
+    LVArray<int> & getSectionBounds( int max_count, int depth, bool for_external_update=false );
     /// sets battery state
-    virtual bool setBatteryState( int newState );
+    virtual bool setBatteryState( int newState, int newChargingConn, int newChargeLevel );
     /// returns battery state
     int getBatteryState() const { return m_battery_state; }
+    /// returns battery charging connection
+    int getBatteryChargingConn() const { return m_battery_charging_conn; }
+    /// returns battery charge level
+    int getBatteryChargeLevel() const { return m_battery_charge_level; }
     /// returns current time representation string
     virtual lString32 getTimeString() const;
     /// returns true if time changed since clock has been last drawed
@@ -702,7 +713,7 @@ class LVDocView : public CacheLoadingCallback
     /// draw page header to buffer
     virtual void drawPageHeader( LVDrawBuf * drawBuf, const lvRect & headerRc, int pageIndex, int headerInfoFlags, int pageCount );
     /// draw battery state to buffer
-    virtual void drawBatteryState( LVDrawBuf * drawBuf, const lvRect & rc, bool isVertical );
+    virtual void drawBatteryState(LVDrawBuf * drawBuf, const lvRect & rc);
 
     /// returns background color
     lUInt32 getBackgroundColor() const { return m_backgroundColor; }
diff --git a/crengine/include/lvfntman.h b/crengine/include/lvfntman.h
index 55fa3e662f..cd87b6d454 100644
--- a/crengine/include/lvfntman.h
+++ b/crengine/include/lvfntman.h
@@ -126,7 +126,7 @@ class LVFontManager {
     /// returns available font files
     virtual void getFontFileNameList( lString32Collection & ) { }
     /// check font language compatibility
-    virtual font_lang_compat checkFontLangCompat(const lString8 &typeface, const lString8 &langCode) { return font_lang_compat_invalid_tag; }
+    virtual font_lang_compat checkFontLangCompat(const lString8 &typeface, const lString8 &langTag) { return font_lang_compat_invalid_tag; }
     /// returns first found face from passed list, or return face for font found by family only
     virtual lString8 findFontFace(lString8 commaSeparatedFaceList, css_font_family_t fallbackByFamily);
     /// fills array with list of available gamma levels
diff --git a/crengine/include/lvfont.h b/crengine/include/lvfont.h
index 7dd06e1104..eeb9a63fe6 100644
--- a/crengine/include/lvfont.h
+++ b/crengine/include/lvfont.h
@@ -419,8 +419,6 @@ class LVFont : public LVRefCounter {
         return 0;
     }
 
-    virtual font_lang_compat checkFontLangCompat(const lString8 &langCode) { return font_lang_compat_invalid_tag; }
-
     /// set fallback font for this font
     virtual void setFallbackFont(LVFontRef font) { CR_UNUSED(font); }
 
diff --git a/crengine/include/lvhashtable.h b/crengine/include/lvhashtable.h
index 13297c4d54..56c0f447a4 100644
--- a/crengine/include/lvhashtable.h
+++ b/crengine/include/lvhashtable.h
@@ -217,6 +217,11 @@ template <typename keyT, typename valueT> class LVHashTable
         }
         return false;
     }
+    void compact()
+    {
+        if (_count > 0 && _count < _size)
+            resize(_count);
+    }
 private:
     int _size;
     int _count;
diff --git a/crengine/include/lvstring.h b/crengine/include/lvstring.h
index 55819b1a4a..8cbc9dbeea 100644
--- a/crengine/include/lvstring.h
+++ b/crengine/include/lvstring.h
@@ -1042,6 +1042,10 @@ class lString32
     bool atoi( int &n ) const;
     /// converts to 64 bit integer, returns true if success
     bool atoi( lInt64 &n ) const;
+    /// convert to double
+    double atod() const;
+    /// convert to double, returns true if success
+    bool atod( double &d, char dp = '.' ) const;
     /// returns constant c-string pointer
     const value_type * c_str() const { return pchunk->buf32; }
     /// returns constant c-string pointer, same as c_str()
diff --git a/crengine/include/props.h b/crengine/include/props.h
index 265451d643..f12e7ee46b 100644
--- a/crengine/include/props.h
+++ b/crengine/include/props.h
@@ -66,9 +66,9 @@ class CRPropAccessor : public LVRefCounter {
     /// do validation and corrections
     virtual void limitValueList( const char * propName, const char * values[] );
     /// do validation and corrections
-    virtual void limitValueList( const char * propName, int values[], int value_count );
+    virtual void limitValueList( const char * propName, int values[], int valuesCount, int defValueIndex );
     /// do validation and corrections
-    virtual void limitValueList( const char * propName, int values[], int value_count, int defValueIndex );
+    virtual void limitValueMinMax( const char * propName, int minValue, int maxValue, int defValue );
 
     /// get int property by name, returns false if not found
     virtual bool getInt( const char * propName, int &result ) const;
@@ -93,6 +93,8 @@ class CRPropAccessor : public LVRefCounter {
     virtual bool getBoolDef( const char * propName, bool defValue=false ) const;
     /// set bool property by name
     virtual void setBool( const char * propName, bool value );
+    /// set bool property by name, if not exist or incorrect
+    virtual void setBoolDef( const char * propName, bool defValue );
 
     /// get lInt64 property by name, returns false if not found
     virtual bool getInt64( const char * propName, lInt64 &result ) const;
diff --git a/crengine/src/locale_data/iso-639-3_data.c b/crengine/src/locale_data/iso-639-3_data.c
index d7a21f7814..ca5a482632 100644
--- a/crengine/src/locale_data/iso-639-3_data.c
+++ b/crengine/src/locale_data/iso-639-3_data.c
@@ -7903,5 +7903,6 @@ const struct iso639_3_rec iso639_3_data[] = {
 	{"zyp", NULL, NULL, NULL, "Zyphe Chin"},
 	{"zza", "zza", "zza", NULL, "Zaza"},
 	{"zzj", NULL, NULL, NULL, "Zuojiang Zhuang"},
+	{"mol", NULL, NULL, "mo", "Moldavian"},
 };
 
diff --git a/crengine/src/locale_data/iso-639-3_data.h b/crengine/src/locale_data/iso-639-3_data.h
index be18eb9f09..14b83030c5 100644
--- a/crengine/src/locale_data/iso-639-3_data.h
+++ b/crengine/src/locale_data/iso-639-3_data.h
@@ -12,7 +12,7 @@
 extern "C" {
 #endif
 
-#define ISO639_3_DATA_SZ	7893
+#define ISO639_3_DATA_SZ	7894
 #define ISO639_3_UND_INDEX	6780
 
 struct iso639_3_rec {
diff --git a/crengine/src/lvdocview.cpp b/crengine/src/lvdocview.cpp
index 2034023dab..e729e81aa5 100644
--- a/crengine/src/lvdocview.cpp
+++ b/crengine/src/lvdocview.cpp
@@ -156,7 +156,9 @@ static int def_font_sizes[] = { 18, 20, 22, 24, 29, 33, 39, 44 };
 
 LVDocView::LVDocView(int bitsPerPixel, bool noDefaultDocument) :
 	m_bitsPerPixel(bitsPerPixel), m_dx(400), m_dy(200), _pos(0), _page(0),
-			_posIsSet(false), m_battery_state(CR_BATTERY_STATE_NO_BATTERY)
+			_posIsSet(false), m_battery_state(CR_BATTERY_STATE_NO_BATTERY),
+			m_battery_charging_conn(CR_BATTERY_CHARGER_NO),
+			m_battery_charge_level(0)
 #if (LBOOK==1)
 			, m_requested_font_size(32)
 #elif defined(__SYMBIAN32__)
@@ -1377,8 +1379,8 @@ int LVDocView::getPageHeaderHeight() const {
 	int h = getInfoFont()->getHeight();
 	int navbarh = scaleForRenderDPI(HEADER_NAVBAR_H);
 	int bh = m_batteryIcons.length()>0 ? m_batteryIcons[0]->GetHeight() : 0;
-	if ( bh>h )
-		h = bh;
+	if ( bh + 2 > h )
+		h = bh + 2;
 	return h + (navbarh + HEADER_MARGIN + 1)/2;
 }
 
@@ -1426,8 +1428,7 @@ lString32 LVDocView::getTimeString() const {
 }
 
 /// draw battery state to buffer
-void LVDocView::drawBatteryState(LVDrawBuf * drawbuf, const lvRect & batteryRc,
-		bool /*isVertical*/) {
+void LVDocView::drawBatteryState(LVDrawBuf * drawbuf, const lvRect & batteryRc) {
 	if (m_battery_state == CR_BATTERY_STATE_NO_BATTERY)
 		return;
 	LVDrawStateSaver saver(*drawbuf);
@@ -1451,7 +1452,7 @@ void LVDocView::drawBatteryState(LVDrawBuf * drawbuf, const lvRect & batteryRc,
 		if ( m_batteryIcons.size()==1 )
 			icons.add(m_batteryIcons[0]);
 	}
-	LVDrawBatteryIcon(drawbuf, batteryRc, m_battery_state, m_battery_state
+	LVDrawBatteryIcon(drawbuf, batteryRc, m_battery_charge_level, m_battery_state
 			== CR_BATTERY_STATE_CHARGING, icons, drawPercent ? m_batteryFont.get() : NULL);
 #if 0
 	if ( m_batteryIcons.length()>1 ) {
@@ -1590,57 +1591,80 @@ void LVDocView::drawBatteryState(LVDrawBuf * drawbuf, const lvRect & batteryRc,
 #endif
 }
 
+/// get section bounds for specific root node and specific section depth level, in 1/100 of percent
+void LVDocView::getSectionBoundsInt( LVArray<int>& bounds, ldomNode* node, lUInt16 section_id , int target_level, int level ) {
+    int pc = getVisiblePageCount();
+    int fh = GetFullHeight();
+    for (int i = 0; i < node->getChildCount(); i++) {
+        ldomNode * section = node->getChildElementNode(i, section_id);
+        if (section) {
+            if (level == target_level) {
+                lvRect rc;
+                section->getAbsRect(rc);
+                if (getViewMode() == DVM_SCROLL) {
+                    int p = (int) (((lInt64) rc.top * 10000) / fh);
+                    bounds.add(p);
+                } else {
+                    int pages_cnt = m_pages.length();
+                    if ( (pc==2 && (pages_cnt&1)) )
+                        pages_cnt++;
+                    int p = m_pages.FindNearestPage(rc.top, 0);
+                    if (pages_cnt > 1)
+                        bounds.add((int) (((lInt64) p * 10000) / pages_cnt));
+                }
+            } else if (level < target_level) {
+                getSectionBoundsInt(bounds, section, section_id, target_level, level + 1);
+            }
+        }
+    }
+}
+
+static int s_int_comparator(const void * n1, const void * n2) {
+    int* i1 = (int*)n1;
+    int* i2 = (int*)n2;
+    return *i1 == *i2 ? 0 : (*i1 < *i2 ? -1 : 1);
+}
+
 /// returns section bounds, in 1/100 of percent
-LVArray<int> & LVDocView::getSectionBounds( bool for_external_update ) {
-	if (for_external_update || m_section_bounds_externally_updated) {
-		// Progress bar markes will be externally updated: we don't care
-		// about m_section_bounds_valid and we never trash it here.
-		// It's the frontend responsability to notice it needs some
-		// update and to update it.
-		m_section_bounds_externally_updated = true;
-		return m_section_bounds;
-	}
-	if (m_section_bounds_valid)
-		return m_section_bounds;
-	m_section_bounds.clear();
-	m_section_bounds.add(0);
+LVArray<int> & LVDocView::getSectionBounds( int max_count, int depth, bool for_external_update ) {
+    if (for_external_update || m_section_bounds_externally_updated) {
+        // Progress bar markes will be externally updated: we don't care
+        // about m_section_bounds_valid and we never trash it here.
+        // It's the frontend responsability to notice it needs some
+        // update and to update it.
+        m_section_bounds_externally_updated = true;
+        return m_section_bounds;
+    }
+    if (m_section_bounds_valid)
+        return m_section_bounds;
     // Get sections from FB2 books
     ldomNode * body = m_doc->nodeFromXPath(cs32("/FictionBook/body[1]"));
-	lUInt16 section_id = m_doc->getElementNameIndex(U"section");
+    lUInt16 section_id = m_doc->getElementNameIndex(U"section");
     if (body == NULL) {
         // Get sections from EPUB books
         body = m_doc->nodeFromXPath(cs32("/body[1]"));
         section_id = m_doc->getElementNameIndex(U"DocFragment");
     }
-	int fh = GetFullHeight();
-    int pc = getVisiblePageCount();
-	if (body && fh > 0) {
-		int cnt = body->getChildCount();
-		for (int i = 0; i < cnt; i++) {
-
-            ldomNode * l1section = body->getChildElementNode(i, section_id);
-            if (!l1section)
-				continue;
-
-            lvRect rc;
-            l1section->getAbsRect(rc);
-            if (getViewMode() == DVM_SCROLL) {
-                int p = (int) (((lInt64) rc.top * 10000) / fh);
-                m_section_bounds.add(p);
-            } else {
-                int fh = m_pages.length();
-                if ( (pc==2 && (fh&1)) )
-                    fh++;
-                int p = m_pages.FindNearestPage(rc.top, 0);
-                if (fh > 1)
-                    m_section_bounds.add((int) (((lInt64) p * 10000) / fh));
-            }
-
-		}
-	}
-	m_section_bounds.add(10000);
-	m_section_bounds_valid = true;
-	return m_section_bounds;
+    LVArray<int> bounds;
+    int fh = GetFullHeight();
+    if (body && fh > 0) {
+        for (int level = 0; level < depth; level++) {
+            LVArray<int> bounds_tmp;
+            getSectionBoundsInt(bounds_tmp, body, section_id, level, 0);
+            if (bounds.length() + bounds_tmp.length() < max_count)
+                bounds.add(bounds_tmp);
+            else
+                break;
+        }
+    }
+    if (bounds.length() > 1)
+        qsort(bounds.get(), (size_t)bounds.length(), sizeof(int), s_int_comparator);
+    m_section_bounds.clear();
+    m_section_bounds.add(0);
+    m_section_bounds.add(bounds);
+    m_section_bounds.add(10000);
+    m_section_bounds_valid = true;
+    return m_section_bounds;
 }
 
 int LVDocView::getPosEndPagePercent() {
@@ -1705,40 +1729,14 @@ void LVDocView::getPageRectangle(int pageIndex, lvRect & pageRect) const {
 		pageRect = m_pageRects[1];
 }
 
-// deprecated: ready to remove
-void LVDocView::getNavigationBarRectangle(lvRect & navRect) {
-	getNavigationBarRectangle(getVisiblePageCount() == 2 ? 1 : 2, navRect);
-}
-
-// deprecated: ready to remove
-void LVDocView::getNavigationBarRectangle(int pageIndex, lvRect & navRect) {
-	lvRect headerRect;
-	getPageHeaderRectangle(pageIndex, headerRect);
-	navRect = headerRect;
-	if (headerRect.bottom <= headerRect.top)
-		return;
-	navRect.top = navRect.bottom - 6;
-}
-
-// deprecated: ready to remove
-void LVDocView::drawNavigationBar(LVDrawBuf * drawbuf, int pageIndex,
-		int percent) {
-    CR_UNUSED2(drawbuf, percent);
-	//LVArray<int> & sbounds = getSectionBounds();
-	lvRect navBar;
-	getNavigationBarRectangle(pageIndex, navBar);
-	//bool leftPage = (getVisiblePageCount()==2 && !(pageIndex&1) );
-
-	//lUInt32 cl1 = 0xA0A0A0;
-	//lUInt32 cl2 = getBackgroundColor();
-}
-
 /// sets battery state
-bool LVDocView::setBatteryState(int newState) {
-	if (m_battery_state == newState)
+bool LVDocView::setBatteryState(int newState, int newChargingConn, int newChargeLevel) {
+	if (m_battery_state == newState && newChargingConn == m_battery_charging_conn && m_battery_charge_level == newChargeLevel)
 		return false;
-	CRLog::info("New battery state: %d", newState);
+	CRLog::info("New battery state: %d; chargingConn: %d; chargeLevel: %d", newState, newChargingConn, newChargeLevel);
 	m_battery_state = newState;
+	m_battery_charging_conn = newChargingConn;
+	m_battery_charge_level = newChargeLevel;
 	clearImageCache();
 	return true;
 }
@@ -1793,7 +1791,7 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 			gpos = info.bottom - (markh+1)/2;
 			break;
 		case PAGE_HEADER_POS_BOTTOM:
-			gpos = info.top + (markh+1)/2;
+			gpos = info.top + markh/2;
 			break;
 		default:
 			break;
@@ -1810,10 +1808,10 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 	bool leftPage = (getVisiblePageCount() == 2 && !(pageIndex & 1));
 	if (leftPage)
 		percent = 10000;
-	int percent_pos = /*info.left + */percent * info.width() / 10000;
-	LVArray<int> & sbounds = getSectionBounds();
+	int percent_pos = percent * info.width() / 10000;
+	LVArray<int> & sbounds = getSectionBounds(info.width()/3, 3);
 	int sbound_index = 0;
-	bool enableMarks = !leftPage && (phi & PGHDR_CHAPTER_MARKS) && sbounds.length()<info.width()/5;
+	bool enableMarks = !leftPage && (phi & PGHDR_CHAPTER_MARKS);
 	for ( int x = info.left; x<info.right; x++ ) {
 		lUInt32 cl = 0xFFFFFFFF;
 		int sz = thinw;
@@ -1857,13 +1855,13 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 	// draw icons & text info
 	drawbuf->SetTextColor(cl1);
 	lString32 text;
-	int iy = 0;
+	int texty = 0;
 	switch (m_pageHeaderPos) {
 		case PAGE_HEADER_POS_TOP:
-			iy = info.top - HEADER_MARGIN/2;
+			texty = info.top + (gpos - info.top - thinw - m_infoFont->getHeight())/2;
 			break;
 		case PAGE_HEADER_POS_BOTTOM:
-			iy = gpos + 2;
+			texty = gpos + thinw + 2 + (info.bottom - gpos - thinw - m_infoFont->getHeight())/2;
 			break;
 		default:
 			break;
@@ -1873,7 +1871,7 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 	} else {
 		if (getVisiblePageCount() == 1 || !(pageIndex & 1)) {
 			int dwIcons = 0;
-			int icony = iy + m_infoFont->getHeight() / 2;
+			int icony = texty + m_infoFont->getHeight() / 2;
 			for (int ni = 0; ni < m_headerIcons.length(); ni++) {
 				LVImageSourceRef icon = m_headerIcons[ni];
 				int h = icon->GetHeight();
@@ -1884,59 +1882,81 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 			info.left += dwIcons;
 		}
 		bool batteryPercentNormalFont = false; // PROP_SHOW_BATTERY_PERCENT
-		if ((phi & PGHDR_BATTERY) && m_battery_state >= CR_BATTERY_STATE_CHARGING) {
+		if ((phi & PGHDR_BATTERY) && m_battery_state != CR_BATTERY_STATE_NO_BATTERY) {
 			batteryPercentNormalFont = m_props->getBoolDef(PROP_SHOW_BATTERY_PERCENT, true) || m_batteryIcons.size()<=2;
 			if ( !batteryPercentNormalFont ) {
 				lvRect brc = info;
 				brc.right -= 2;
 				//brc.top += 1;
 				//brc.bottom -= 2;
-				int h = brc.height();
-				int batteryIconWidth = 32;
-				if (m_batteryIcons.length() > 0)
+				switch (m_pageHeaderPos) {
+				default:
+				case PAGE_HEADER_POS_TOP:
+					brc.bottom -= markh;
+					break;
+				case PAGE_HEADER_POS_BOTTOM:
+					brc.top = gpos + thinw + 1;
+					break;
+				}
+				int batteryIconWidth = 28;
+				int batteryIconHeight = 15;
+				if (m_batteryIcons.length() > 0) {
 					batteryIconWidth = m_batteryIcons[0]->GetWidth();
-				bool isVertical = (h > 30);
-				//if ( isVertical )
-				//    brc.left = brc.right - brc.height()/2;
-				//else
+					batteryIconHeight = m_batteryIcons[0]->GetHeight();
+				}
 				brc.left = brc.right - batteryIconWidth - 2;
-				brc.bottom -= markh;
-				drawBatteryState(drawbuf, brc, isVertical);
+				if (brc.height() < batteryIconHeight) {
+					int h_inc = batteryIconHeight - brc.height();
+					if (PAGE_HEADER_POS_TOP == m_pageHeaderPos) {
+						brc.bottom += h_inc;
+					} else if (PAGE_HEADER_POS_BOTTOM == m_pageHeaderPos) {
+						brc.top -= h_inc;
+					}
+				}
+				drawBatteryState(drawbuf, brc);
 				info.right = brc.left - info.height() / 2;
 			}
 		}
 		lString32 pageinfo;
 		if (pageCount > 0) {
 			if (phi & PGHDR_PAGE_NUMBER)
-                pageinfo += fmt::decimal(pageIndex + 1);
-            if (phi & PGHDR_PAGE_COUNT) {
-                if ( !pageinfo.empty() )
-                    pageinfo += " / ";
-                pageinfo += fmt::decimal(pageCount);
-            }
-            if (phi & PGHDR_PERCENT) {
-                if ( !pageinfo.empty() )
-                    pageinfo += "  ";
-                //pageinfo += lString32::itoa(percent/100)+U"%"; //+U"."+lString32::itoa(percent/10%10)+U"%";
-                pageinfo += fmt::decimal(percent/100);
-                pageinfo += ",";
-                int pp = percent%100;
-                if ( pp<10 )
-                    pageinfo << "0";
-                pageinfo << fmt::decimal(pp) << "%";
-            }
-            if ( batteryPercentNormalFont ) {
-                if (m_battery_state >= 0)
-                    pageinfo << "  [" << fmt::decimal(m_battery_state) << "%]";
-                else if (m_battery_state == CR_BATTERY_STATE_CHARGING)
-                    pageinfo << "  [ + ]";
-            }
-        }
+				pageinfo += fmt::decimal(pageIndex + 1);
+			if (phi & PGHDR_PAGE_COUNT) {
+				if (!pageinfo.empty())
+					pageinfo += " / ";
+				pageinfo += fmt::decimal(pageCount);
+			}
+			if (phi & PGHDR_PERCENT) {
+				if (!pageinfo.empty())
+					pageinfo += "  ";
+				pageinfo += fmt::decimal(percent / 100);
+				pageinfo += ",";
+				int pp = percent % 100;
+				if (pp < 10)
+					pageinfo << "0";
+				pageinfo << fmt::decimal(pp) << "%";
+			}
+			if (batteryPercentNormalFont) {
+				if (m_battery_charge_level >= 0 && m_battery_charge_level <= 100) {
+					pageinfo << "  [";
+					if (m_battery_state == CR_BATTERY_STATE_CHARGING) {
+						pageinfo << 0x21AF;
+					}
+					pageinfo << fmt::decimal(m_battery_charge_level) << "%]";
+				} else {
+					if (m_battery_state == CR_BATTERY_STATE_CHARGING) {
+						pageinfo << Utf8ToUnicode("  [ ↯ ]");
+					} else {
+						pageinfo << Utf8ToUnicode("  [ ? ]");
+					}
+				}
+			}
+		}
 
 		int piw = 0;
 		if (!pageinfo.empty()) {
 			piw = m_infoFont->getTextWidth(pageinfo.c_str(), pageinfo.length());
-			m_infoFont->DrawTextString(drawbuf, info.right - piw, iy,
+			m_infoFont->DrawTextString(drawbuf, info.right - piw, texty,
 					pageinfo.c_str(), pageinfo.length(), U' ', NULL, false);
 			info.right -= piw + info.height() / 2;
 		}
@@ -1944,7 +1964,7 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 			lString32 clock = getTimeString();
 			m_last_clock = clock;
 			int w = m_infoFont->getTextWidth(clock.c_str(), clock.length()) + 2;
-			m_infoFont->DrawTextString(drawbuf, info.right - w, iy,
+			m_infoFont->DrawTextString(drawbuf, info.right - w, texty,
 					clock.c_str(), clock.length(), U' ', NULL, false);
 			info.right -= w + info.height() / 2;
 		}
@@ -1987,7 +2007,7 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 	drawbuf->SetClipRect(&newcr);
 	text = fitTextWidthWithEllipsis(text, m_infoFont, newcr.width());
 	if (!text.empty()) {
-		m_infoFont->DrawTextString(drawbuf, info.left, iy, text.c_str(),
+		m_infoFont->DrawTextString(drawbuf, info.left, texty, text.c_str(),
 				text.length(), U' ', NULL, false);
 	}
 	drawbuf->SetClipRect(&oldcr);
@@ -2310,7 +2330,7 @@ bool LVDocView::goToPage(int page, bool updatePosBookmark, bool regulateTwoPages
 
 /// returns true if time changed since clock has been last drawed
 bool LVDocView::isTimeChanged() {
-	if ( m_pageHeaderInfo & PGHDR_CLOCK ) {
+	if ( m_pageHeaderPos != PAGE_HEADER_POS_NONE && m_pageHeaderInfo & PGHDR_CLOCK ) {
 		bool res = (m_last_clock != getTimeString());
 		if (res)
 			clearImageCache();
@@ -6442,141 +6462,115 @@ static const char * def_style_macros[] = {
 
 /// sets default property values if properties not found, checks ranges
 void LVDocView::propsUpdateDefaults(CRPropRef props) {
-	lString32Collection list;
-	fontMan->getFaceList(list);
-	static int def_aa_props[] = { font_aa_none, font_aa_big, font_aa_all, font_aa_gray, font_aa_lcd_rgb, font_aa_lcd_bgr, font_aa_lcd_pentile, font_aa_lcd_pentile_m, font_aa_lcd_v_rgb, font_aa_lcd_v_bgr, font_aa_lcd_v_pentile, font_aa_lcd_v_pentile_m };
-
-	props->setIntDef(PROP_MIN_FILE_SIZE_TO_CACHE,
-            300000); // ~6M
-	props->setIntDef(PROP_FORCED_MIN_FILE_SIZE_TO_CACHE,
-			DOCUMENT_CACHING_MIN_SIZE); // 32K
-	props->setIntDef(PROP_PROGRESS_SHOW_FIRST_PAGE, 1);
-
-	props->limitValueList(PROP_FONT_ANTIALIASING, def_aa_props,
-			sizeof(def_aa_props) / sizeof(int), 2);
-	props->setHexDef(PROP_FONT_COLOR, 0x000000);
-	props->setHexDef(PROP_BACKGROUND_COLOR, 0xFFFFFF);
-	props->setHexDef(PROP_STATUS_FONT_COLOR, 0xFF000000);
-//	props->setIntDef(PROP_TXT_OPTION_PREFORMATTED, 0);
-	props->setIntDef(PROP_AUTOSAVE_BOOKMARKS, 1);
-	props->setIntDef(PROP_DISPLAY_FULL_UPDATE_INTERVAL, 1);
-	props->setIntDef(PROP_DISPLAY_TURBO_UPDATE_MODE, 0);
-
-	lString8 defFontFace;
-	static const char * goodFonts[] = { "DejaVu Sans", "FreeSans",
-			"Liberation Sans", "Arial", "Verdana", NULL };
-	static const char * fallbackFonts = "Noto Color Emoji; Droid Sans Fallback; Noto Sans CJK SC; Noto Sans Arabic UI; Noto Sans Devanagari UI; FreeSans; FreeSerif; Noto Serif; Noto Sans; Arial Unicode MS";
-	for (int i = 0; goodFonts[i]; i++) {
-		if (list.contains(lString32(goodFonts[i]))) {
-			defFontFace = lString8(goodFonts[i]);
-			break;
-		}
-	}
-	if (defFontFace.empty())
-		defFontFace = UnicodeToUtf8(list[0]);
+    lString32Collection list;
+    fontMan->getFaceList(list);
+    static int aa_props[] = { font_aa_none, font_aa_big, font_aa_all, font_aa_gray, font_aa_lcd_rgb, font_aa_lcd_bgr, font_aa_lcd_pentile, font_aa_lcd_pentile_m, font_aa_lcd_v_rgb, font_aa_lcd_v_bgr, font_aa_lcd_v_pentile, font_aa_lcd_v_pentile_m };
+
+    props->setIntDef(PROP_MIN_FILE_SIZE_TO_CACHE,
+                     300000); // ~6M
+    props->setIntDef(PROP_FORCED_MIN_FILE_SIZE_TO_CACHE,
+                     DOCUMENT_CACHING_MIN_SIZE); // 32K
+    props->setIntDef(PROP_PROGRESS_SHOW_FIRST_PAGE, 1);
+
+    props->limitValueList(PROP_FONT_ANTIALIASING, aa_props,
+                          sizeof(aa_props) / sizeof(int), 2);
+    props->setHexDef(PROP_FONT_COLOR, 0x000000);
+    props->setHexDef(PROP_BACKGROUND_COLOR, 0xFFFFFF);
+    props->setHexDef(PROP_STATUS_FONT_COLOR, 0xFF000000);
+    props->setIntDef(PROP_AUTOSAVE_BOOKMARKS, 1);
+
+    lString8 defFontFace;
+    static const char * goodFonts[] = { "DejaVu Sans", "FreeSans",
+                                        "Noto Sans", "Liberation Sans", "Arial", "Verdana", NULL };
+    static const char * fallbackFonts = "Noto Color Emoji; Droid Sans Fallback; Noto Sans CJK SC; Noto Sans Arabic UI; Noto Sans Devanagari UI; FreeSans; FreeSerif; Noto Serif; Noto Sans; Arial Unicode MS";
+    for (int i = 0; goodFonts[i]; i++) {
+        if (list.contains(lString32(goodFonts[i]))) {
+            defFontFace = lString8(goodFonts[i]);
+            break;
+        }
+    }
+    if (defFontFace.empty())
+        defFontFace = UnicodeToUtf8(list[0]);
 
-	lString8 defStatusFontFace(DEFAULT_STATUS_FONT_NAME);
-	props->setStringDef(PROP_FONT_FACE, defFontFace.c_str());
-	props->setStringDef(PROP_STATUS_FONT_FACE, defStatusFontFace.c_str());
-	if (list.length() > 0 && !list.contains(props->getStringDef(PROP_FONT_FACE,
-			defFontFace.c_str())))
-		props->setString(PROP_FONT_FACE, list[0]);
-	props->setStringDef(PROP_FALLBACK_FONT_FACES, fallbackFonts);
+    lString8 defStatusFontFace(DEFAULT_STATUS_FONT_NAME);
+    props->setStringDef(PROP_FONT_FACE, defFontFace.c_str());
+    props->setStringDef(PROP_STATUS_FONT_FACE, defStatusFontFace.c_str());
+    if (list.length() > 0 && !list.contains(props->getStringDef(PROP_FONT_FACE,
+                                                                defFontFace.c_str())))
+        props->setString(PROP_FONT_FACE, list[0]);
+    props->setStringDef(PROP_FALLBACK_FONT_FACES, fallbackFonts);
 
 #if USE_LIMITED_FONT_SIZES_SET
-	props->setIntDef(PROP_FONT_SIZE,
-			m_font_sizes[m_font_sizes.length() * 2 / 3]);
-	props->limitValueList(PROP_FONT_SIZE, m_font_sizes.ptr(),
-			m_font_sizes.length());
+    props->limitValueList(PROP_FONT_SIZE, m_font_sizes.ptr(),
+                          m_font_sizes.length(), m_font_sizes.length() * 2 / 3);
 #else
-	props->setIntDef(PROP_FONT_SIZE, m_min_font_size + (m_min_font_size + m_max_font_size)/7);
+    props->limitValueMinMax(PROP_FONT_SIZE, m_min_font_size, m_max_font_size,
+                            m_min_font_size + (m_min_font_size + m_max_font_size)/7);
 #endif
-	props->limitValueList(PROP_INTERLINE_SPACE, cr_interline_spaces,
-			sizeof(cr_interline_spaces) / sizeof(int), 20);
+    props->limitValueList(PROP_INTERLINE_SPACE, cr_interline_spaces,
+                          sizeof(cr_interline_spaces) / sizeof(int), 20);
 #if CR_INTERNAL_PAGE_ORIENTATION==1
-	static int def_rot_angle[] = {0, 1, 2, 3};
-	props->limitValueList( PROP_ROTATE_ANGLE, def_rot_angle, 4 );
+    props->limitValueMinMax( PROP_ROTATE_ANGLE, 0, 3, 0 );
 #endif
-	static int bool_options_def_true[] = { 1, 0 };
-	static int bool_options_def_false[] = { 0, 1 };
-	static int int_option_weight[] = { 100, 200, 300, 400, 425, 450, 475, 500, 525, 550, 600, 650, 700, 800, 900, 950 };
-
-	props->limitValueList(PROP_FONT_BASE_WEIGHT, int_option_weight, sizeof(int_option_weight) / sizeof(int), 3);
+    static int int_option_weight[] = { 100, 200, 300, 400, 425, 450, 475, 500, 525, 550, 600, 650, 700, 800, 900, 950 };
+    props->limitValueList(PROP_FONT_BASE_WEIGHT, int_option_weight, sizeof(int_option_weight) / sizeof(int), 3);
 #ifndef ANDROID
-	props->limitValueList(PROP_EMBEDDED_STYLES, bool_options_def_true, 2);
-	props->limitValueList(PROP_EMBEDDED_FONTS, bool_options_def_true, 2);
+    props->setBoolDef(PROP_EMBEDDED_STYLES, true);
+    props->setBoolDef(PROP_EMBEDDED_FONTS, true);
+    props->setBoolDef(PROP_TXT_OPTION_PREFORMATTED, false);
 #endif
-	static int int_option_hinting[] = { 0, 1, 2 };
-	props->limitValueList(PROP_FONT_HINTING, int_option_hinting, 3);
-    static int int_option_shaping[] = { 1, 0, 2 };
-    props->limitValueList(PROP_FONT_SHAPING, int_option_shaping, 3);
-    static int int_options_1_2[] = { 2, 1 };
-	props->limitValueList(PROP_LANDSCAPE_PAGES, int_options_1_2, 2);
-	props->limitValueList(PROP_PAGE_VIEW_MODE, bool_options_def_true, 2);
-	props->limitValueList(PROP_FOOTNOTES, bool_options_def_true, 2);
-	props->limitValueList(PROP_SHOW_TIME, bool_options_def_false, 2);
-	props->limitValueList(PROP_DISPLAY_INVERSE, bool_options_def_false, 2);
-	props->limitValueList(PROP_BOOKMARK_ICONS, bool_options_def_false, 2);
-    props->limitValueList(PROP_FONT_KERNING_ENABLED, bool_options_def_false, 2);
-    //props->limitValueList(PROP_FLOATING_PUNCTUATION, bool_options_def_true, 2);
-    static int def_bookmark_highlight_modes[] = { 0, 1, 2 };
-    props->setIntDef(PROP_HIGHLIGHT_COMMENT_BOOKMARKS, highlight_mode_underline);
-    props->limitValueList(PROP_HIGHLIGHT_COMMENT_BOOKMARKS, def_bookmark_highlight_modes, sizeof(def_bookmark_highlight_modes)/sizeof(int));
+    props->limitValueMinMax(PROP_FONT_HINTING, 0, 2, 0);
+    props->limitValueMinMax(PROP_FONT_SHAPING, 0, 2, 1);
+    props->limitValueMinMax(PROP_LANDSCAPE_PAGES, 1, 2, 2);
+    props->setBoolDef(PROP_PAGE_VIEW_MODE, true);
+    props->setBoolDef(PROP_FOOTNOTES, true);
+    props->setBoolDef(PROP_DISPLAY_INVERSE, false);
+    props->setBoolDef(PROP_BOOKMARK_ICONS, false);
+    props->setBoolDef(PROP_FONT_KERNING_ENABLED, false);
+    props->setBoolDef(PROP_FLOATING_PUNCTUATION, true);
+    props->limitValueMinMax(PROP_HIGHLIGHT_COMMENT_BOOKMARKS, 0, 2, (int)highlight_mode_underline);
     props->setColorDef(PROP_HIGHLIGHT_SELECTION_COLOR, 0xC0C0C0); // silver
     props->setColorDef(PROP_HIGHLIGHT_BOOKMARK_COLOR_COMMENT, 0xA08020); // yellow
     props->setColorDef(PROP_HIGHLIGHT_BOOKMARK_COLOR_CORRECTION, 0xA04040); // red
 
-    static int def_status_line[] = { 0, 1, 2 };
-	props->limitValueList(PROP_STATUS_LINE, def_status_line, 3);
-    static int def_margin[] = {8, 0, 1, 2, 3, 4, 5, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 25, 30, 40, 50, 60, 80, 100, 130, 150, 200, 300};
-	props->limitValueList(PROP_PAGE_MARGIN_TOP, def_margin, sizeof(def_margin)/sizeof(int));
-	props->limitValueList(PROP_PAGE_MARGIN_BOTTOM, def_margin, sizeof(def_margin)/sizeof(int));
-	props->limitValueList(PROP_PAGE_MARGIN_LEFT, def_margin, sizeof(def_margin)/sizeof(int));
-	props->limitValueList(PROP_PAGE_MARGIN_RIGHT, def_margin, sizeof(def_margin)/sizeof(int));
-    static int def_rounded_corners_margin[] = {0, 5, 10, 15, 20, 30, 40, 50, 60, 70,80, 90, 100, 120, 140, 160};
-    props->limitValueList(PROP_ROUNDED_CORNERS_MARGIN, def_rounded_corners_margin, sizeof(def_rounded_corners_margin)/sizeof(int));
-
-    static int def_updates[] = { 1, 0, 2, 3, 4, 5, 6, 7, 8, 10, 14 };
-	props->limitValueList(PROP_DISPLAY_FULL_UPDATE_INTERVAL, def_updates, 11);
-	int fs = props->getIntDef(PROP_STATUS_FONT_SIZE, INFO_FONT_SIZE);
-    if (fs < MIN_STATUS_FONT_SIZE)
-        fs = MIN_STATUS_FONT_SIZE;
-    else if (fs > MAX_STATUS_FONT_SIZE)
-        fs = MAX_STATUS_FONT_SIZE;
-	props->setIntDef(PROP_STATUS_FONT_SIZE, fs);
-    props->limitValueList(PROP_TEXTLANG_EMBEDDED_LANGS_ENABLED, bool_options_def_false, 2);
-    props->limitValueList(PROP_TEXTLANG_HYPHENATION_ENABLED, bool_options_def_true, 2);
-	lString32 hyph = props->getStringDef(PROP_HYPHENATION_DICT,
-			DEF_HYPHENATION_DICT);
-	HyphDictionaryList * dictlist = HyphMan::getDictList();
-	if (dictlist) {
-		if (dictlist->find(hyph))
-			props->setStringDef(PROP_HYPHENATION_DICT, hyph);
-		else
-			props->setStringDef(PROP_HYPHENATION_DICT, lString32(
-					HYPH_DICT_ID_ALGORITHM));
-	}
-	props->setIntDef(PROP_STATUS_LINE, 1);
-	props->setIntDef(PROP_SHOW_TITLE, 1);
-	props->setIntDef(PROP_SHOW_TIME, 1);
-	props->setIntDef(PROP_SHOW_TIME_12HOURS, 0);
-	props->setIntDef(PROP_SHOW_BATTERY, 1);
-    props->setIntDef(PROP_SHOW_BATTERY_PERCENT, 0);
-    props->setIntDef(PROP_SHOW_PAGE_COUNT, 1);
-    props->setIntDef(PROP_SHOW_PAGE_NUMBER, 1);
-    props->setIntDef(PROP_SHOW_POS_PERCENT, 0);
-    props->setIntDef(PROP_STATUS_CHAPTER_MARKS, 1);
-    props->setIntDef(PROP_FLOATING_PUNCTUATION, 1);
-
-#ifndef ANDROID
-    props->setIntDef(PROP_EMBEDDED_STYLES, 1);
-    props->setIntDef(PROP_EMBEDDED_FONTS, 1);
-    props->setIntDef(PROP_TXT_OPTION_PREFORMATTED, 0);
-    props->limitValueList(PROP_TXT_OPTION_PREFORMATTED, bool_options_def_false,
-            2);
-#endif
+    props->limitValueMinMax(PROP_STATUS_LINE, 0, 2, 1);
+    props->setBoolDef(PROP_SHOW_TIME, true);
+    props->setBoolDef(PROP_SHOW_TITLE, true);
+    props->setBoolDef(PROP_SHOW_TIME_12HOURS, false);
+    props->setBoolDef(PROP_SHOW_BATTERY, true);
+    props->setBoolDef(PROP_SHOW_BATTERY_PERCENT, false);
+    props->setBoolDef(PROP_SHOW_PAGE_COUNT, true);
+    props->setBoolDef(PROP_SHOW_PAGE_NUMBER, true);
+    props->setBoolDef(PROP_SHOW_POS_PERCENT, false);
+    props->setBoolDef(PROP_STATUS_CHAPTER_MARKS, true);
+
+    static int margin_options[] = {0, 1, 2, 3, 4, 5, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 25, 30, 40, 50, 60, 80, 100, 130, 150, 200, 300};
+    props->limitValueList(PROP_PAGE_MARGIN_TOP, margin_options, sizeof(margin_options)/sizeof(int), 6);
+    props->limitValueList(PROP_PAGE_MARGIN_BOTTOM, margin_options, sizeof(margin_options)/sizeof(int), 6);
+    props->limitValueList(PROP_PAGE_MARGIN_LEFT, margin_options, sizeof(margin_options)/sizeof(int), 6);
+    props->limitValueList(PROP_PAGE_MARGIN_RIGHT, margin_options, sizeof(margin_options)/sizeof(int), 6);
+    static int rounded_corners_margin_options[] = {0, 5, 10, 15, 20, 30, 40, 50, 60, 70,80, 90, 100, 120, 140, 160};
+    props->limitValueList(PROP_ROUNDED_CORNERS_MARGIN, rounded_corners_margin_options, sizeof(rounded_corners_margin_options)/sizeof(int), 0);
+
+    static int screen_updates_options[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 14 };
+    props->limitValueList(PROP_DISPLAY_FULL_UPDATE_INTERVAL, screen_updates_options, sizeof(screen_updates_options)/sizeof(int), 1);
+    props->setBoolDef(PROP_DISPLAY_TURBO_UPDATE_MODE, false);
+    props->limitValueMinMax(PROP_STATUS_FONT_SIZE, MIN_STATUS_FONT_SIZE, MAX_STATUS_FONT_SIZE, INFO_FONT_SIZE);
+
+    props->setBoolDef(PROP_TEXTLANG_EMBEDDED_LANGS_ENABLED, false);
+    props->setBoolDef(PROP_TEXTLANG_HYPHENATION_ENABLED, true);
+    lString32 hyph = props->getStringDef(PROP_HYPHENATION_DICT,
+                                         DEF_HYPHENATION_DICT);
+    HyphDictionaryList * dictlist = HyphMan::getDictList();
+    if (dictlist) {
+        if (dictlist->find(hyph))
+            props->setStringDef(PROP_HYPHENATION_DICT, hyph);
+        else
+            props->setStringDef(PROP_HYPHENATION_DICT, lString32(
+                                    HYPH_DICT_ID_ALGORITHM));
+    }
 
-    props->setStringDef(PROP_FONT_GAMMA, "1.00");
+    props->setStringDef(PROP_FONT_GAMMA, "1.0");
 
     img_scaling_option_t defImgScaling;
     props->setIntDef(PROP_IMG_SCALING_ZOOMOUT_BLOCK_SCALE, defImgScaling.max_scale);
@@ -6588,33 +6582,10 @@ void LVDocView::propsUpdateDefaults(CRPropRef props) {
     props->setIntDef(PROP_IMG_SCALING_ZOOMIN_BLOCK_MODE, defImgScaling.mode);
     props->setIntDef(PROP_IMG_SCALING_ZOOMIN_INLINE_MODE, defImgScaling.mode);
 
-    int p = props->getIntDef(PROP_FORMAT_SPACE_WIDTH_SCALE_PERCENT, DEF_SPACE_WIDTH_SCALE_PERCENT);
-    if (p<10)
-        p = 10;
-    if (p>500)
-        p = 500;
-    props->setInt(PROP_FORMAT_SPACE_WIDTH_SCALE_PERCENT, p);
-
-    p = props->getIntDef(PROP_FORMAT_MIN_SPACE_CONDENSING_PERCENT, DEF_MIN_SPACE_CONDENSING_PERCENT);
-    if (p<25)
-        p = 25;
-    if (p>100)
-        p = 100;
-    props->setInt(PROP_FORMAT_MIN_SPACE_CONDENSING_PERCENT, p);
-
-    p = props->getIntDef(PROP_FORMAT_UNUSED_SPACE_THRESHOLD_PERCENT, DEF_UNUSED_SPACE_THRESHOLD_PERCENT);
-    if (p<0)
-        p = 0;
-    if (p>20)
-        p = 20;
-    props->setInt(PROP_FORMAT_UNUSED_SPACE_THRESHOLD_PERCENT, p);
-
-    p = props->getIntDef(PROP_FORMAT_MAX_ADDED_LETTER_SPACING_PERCENT, DEF_MAX_ADDED_LETTER_SPACING_PERCENT);
-    if (p<0)
-        p = 0;
-    if (p>20)
-        p = 20;
-    props->setInt(PROP_FORMAT_MAX_ADDED_LETTER_SPACING_PERCENT, p);
+    props->limitValueMinMax(PROP_FORMAT_SPACE_WIDTH_SCALE_PERCENT, 10, 500, DEF_SPACE_WIDTH_SCALE_PERCENT);
+    props->limitValueMinMax(PROP_FORMAT_MIN_SPACE_CONDENSING_PERCENT, 25, 100, DEF_MIN_SPACE_CONDENSING_PERCENT);
+    props->limitValueMinMax(PROP_FORMAT_UNUSED_SPACE_THRESHOLD_PERCENT, 0, 20, DEF_UNUSED_SPACE_THRESHOLD_PERCENT);
+    props->limitValueMinMax(PROP_FORMAT_MAX_ADDED_LETTER_SPACING_PERCENT, 0, 20, DEF_MAX_ADDED_LETTER_SPACING_PERCENT);
 
 #ifndef ANDROID
     props->setIntDef(PROP_RENDER_DPI, DEF_RENDER_DPI); // 96 dpi
@@ -6659,7 +6630,6 @@ CRPropRef LVDocView::propsApply(CRPropRef props) {
     CRLog::trace("LVDocView::propsApply( %d items )", props->getCount());
     CRPropRef unknown = LVCreatePropsContainer();
     bool needUpdateMargins = false;
-    bool needUpdateHyphenation = false;
     for (int i = 0; i < props->getCount(); i++) {
         lString8 name(props->getName(i));
         lString32 value = props->getValue(i);
@@ -6677,10 +6647,14 @@ CRPropRef LVDocView::propsApply(CRPropRef props) {
         } else if (name == PROP_FONT_GAMMA) {
             double gamma = 1.0;
             lString32 s = props->getStringDef(PROP_FONT_GAMMA, "1.0");
-            lString8 s8 = UnicodeToUtf8(s);
-            if ( sscanf(s8.c_str(), "%lf", &gamma)==1 ) {
+            // When parsing a gamma value string, the decimal point is always '.' char.
+            // So if a different decimal point character is used in the current locale,
+            // and if we use some library function to convert the string to floating point number, then it may fail.
+            if (s.atod(gamma, '.')) {
                 fontMan->SetGamma(gamma);
                 clearImageCache();
+            } else {
+                CRLog::error("Invalid gamma value (%s)", LCSTR(s));
             }
         } else if (name == PROP_FONT_HINTING) {
             int mode = props->getIntDef(PROP_FONT_HINTING, (int)HINTING_MODE_AUTOHINT);
@@ -6807,44 +6781,17 @@ CRPropRef LVDocView::propsApply(CRPropRef props) {
                 fontSize = MAX_STATUS_FONT_SIZE;
             setStatusFontSize(fontSize);//cr_font_sizes
             value = lString32::itoa(fontSize);
-        } else if (name == PROP_HYPHENATION_DICT) {
-            needUpdateHyphenation = true;
-        } else if (name == PROP_HYPHENATION_LEFT_HYPHEN_MIN) {
-            int leftHyphenMin = props->getIntDef(PROP_HYPHENATION_LEFT_HYPHEN_MIN, HYPH_DEFAULT_HYPHEN_MIN);
-            if (HyphMan::getLeftHyphenMin() != leftHyphenMin) {
-                HyphMan::setLeftHyphenMin(leftHyphenMin);
-                REQUEST_RENDER("propsApply hyphenation left_hyphen_min")
-            }
-        } else if (name == PROP_HYPHENATION_RIGHT_HYPHEN_MIN) {
-            int rightHyphenMin = props->getIntDef(PROP_HYPHENATION_RIGHT_HYPHEN_MIN, HYPH_DEFAULT_HYPHEN_MIN);
-            if (HyphMan::getRightHyphenMin() != rightHyphenMin) {
-                HyphMan::setRightHyphenMin(rightHyphenMin);
-                REQUEST_RENDER("propsApply hyphenation right_hyphen_min")
-            }
-        } else if (name == PROP_HYPHENATION_TRUST_SOFT_HYPHENS) {
-            int trustSoftHyphens = props->getIntDef(PROP_HYPHENATION_TRUST_SOFT_HYPHENS, HYPH_DEFAULT_TRUST_SOFT_HYPHENS);
-            if (HyphMan::getTrustSoftHyphens() != trustSoftHyphens) {
-                HyphMan::setTrustSoftHyphens(trustSoftHyphens);
-                REQUEST_RENDER("propsApply hyphenation trust_soft_hyphens")
-            }
-        } else if (name == PROP_TEXTLANG_MAIN_LANG) {
-            needUpdateHyphenation = true;
-        } else if (name == PROP_TEXTLANG_EMBEDDED_LANGS_ENABLED) {
-            needUpdateHyphenation = true;
-        } else if (name == PROP_TEXTLANG_HYPHENATION_ENABLED) {
-            needUpdateHyphenation = true;
-        } else if (name == PROP_TEXTLANG_HYPH_SOFT_HYPHENS_ONLY) {
-            bool enabled = props->getIntDef(PROP_TEXTLANG_HYPH_SOFT_HYPHENS_ONLY, TEXTLANG_DEFAULT_HYPH_SOFT_HYPHENS_ONLY);
-            if ( enabled != TextLangMan::getHyphenationSoftHyphensOnly() ) {
-                TextLangMan::setHyphenationSoftHyphensOnly( enabled );
-                REQUEST_RENDER("propsApply textlang hyphenation_soft_hyphens_only")
-            }
-        } else if (name == PROP_TEXTLANG_HYPH_FORCE_ALGORITHMIC) {
-            bool enabled = props->getIntDef(PROP_TEXTLANG_HYPH_FORCE_ALGORITHMIC, TEXTLANG_DEFAULT_HYPH_FORCE_ALGORITHMIC);
-            if ( enabled != TextLangMan::getHyphenationForceAlgorithmic() ) {
-                TextLangMan::setHyphenationForceAlgorithmic( enabled );
-                REQUEST_RENDER("propsApply textlang hyphenation_force_algorithmic")
-            }
+        } else if (name == PROP_HYPHENATION_DICT
+                   || name == PROP_HYPHENATION_LEFT_HYPHEN_MIN
+                   || name == PROP_HYPHENATION_RIGHT_HYPHEN_MIN
+                   || name == PROP_HYPHENATION_TRUST_SOFT_HYPHENS
+                   || name == PROP_TEXTLANG_MAIN_LANG
+                   || name == PROP_TEXTLANG_EMBEDDED_LANGS_ENABLED
+                   || name == PROP_TEXTLANG_HYPHENATION_ENABLED
+                   || name == PROP_TEXTLANG_HYPH_SOFT_HYPHENS_ONLY
+                   || name == PROP_TEXTLANG_HYPH_FORCE_ALGORITHMIC) {
+            // do nothings, see bellow
+            // just to not add this to the list of unknown props
         } else if (name == PROP_INTERLINE_SPACE) {
             int interlineSpace = props->getIntDef(PROP_INTERLINE_SPACE,
                                                   cr_interline_spaces[20]);
@@ -6888,7 +6835,6 @@ CRPropRef LVDocView::propsApply(CRPropRef props) {
             int value = props->getIntDef(PROP_REQUESTED_DOM_VERSION, gDOMVersionCurrent);
             if (m_doc) // not when noDefaultDocument=true
                 if (getDocument()->setDOMVersionRequested(value)) {
-                    needUpdateHyphenation = true;
                     REQUEST_RENDER("propsApply requested dom version")
                 }
         } else if (name == PROP_RENDER_BLOCK_RENDERING_FLAGS) {
@@ -6957,13 +6903,43 @@ CRPropRef LVDocView::propsApply(CRPropRef props) {
     }
     if (needUpdateMargins)
         updatePageMargins();
-    if (needUpdateHyphenation) {
-        bool legacyRendering = m_props->getIntDef(PROP_RENDER_BLOCK_RENDERING_FLAGS, BLOCK_RENDERING_FLAGS_DEFAULT) == 0 ||
-                m_props->getIntDef(PROP_REQUESTED_DOM_VERSION, gDOMVersionCurrent) < 20180524;
-        if (legacyRendering) {
+
+    // Always set/reset the TextLangMan & HyphMan properties, as this is one
+    // static instance and when using multiple document instances, the settings
+    // for one document may not match the settings for another document.
+    bool legacyRendering = m_props->getIntDef(PROP_RENDER_BLOCK_RENDERING_FLAGS, BLOCK_RENDERING_FLAGS_DEFAULT) == 0 ||
+            m_props->getIntDef(PROP_REQUESTED_DOM_VERSION, gDOMVersionCurrent) < 20180524;
+    if (legacyRendering) {
+        // hyphenation dictionary
+        lString32 id = m_props->getStringDef(PROP_HYPHENATION_DICT,
+                                            DEF_HYPHENATION_DICT);
+        CRLog::debug("PROP_HYPHENATION_DICT = %s", LCSTR(id));
+        HyphDictionaryList * list = HyphMan::getDictList();
+        if (list) {
+            CRLog::debug("Changing hyphenation to %s", LCSTR(id));
+            list->activate(id);
+            REQUEST_RENDER("propsApply hyphenation dict")
+        }
+    } else {
+        bool embeddedLang = m_props->getBoolDef(PROP_TEXTLANG_EMBEDDED_LANGS_ENABLED, 0);
+        lString32 mainLang = m_props->getStringDef(PROP_TEXTLANG_MAIN_LANG, TEXTLANG_DEFAULT_MAIN_LANG);
+        bool hyphEnabled = m_props->getBoolDef(PROP_TEXTLANG_HYPHENATION_ENABLED, TEXTLANG_DEFAULT_HYPHENATION_ENABLED);
+        if (embeddedLang != TextLangMan::getEmbeddedLangsEnabled()) {
+            TextLangMan::setEmbeddedLangsEnabled(embeddedLang);
+            REQUEST_RENDER("propsApply textlang embedded_langs_enabled")
+        }
+        if (mainLang != TextLangMan::getMainLang()) {
+            TextLangMan::setMainLang(mainLang);
+            REQUEST_RENDER("propsApply textlang main_lang")
+        }
+        if (hyphEnabled != TextLangMan::getHyphenationEnabled()) {
+            TextLangMan::setHyphenationEnabled(hyphEnabled);
+            REQUEST_RENDER("propsApply textlang hyphenation_enabled")
+        }
+        if (!TextLangMan::getEmbeddedLangsEnabled()) {
             // hyphenation dictionary
             lString32 id = m_props->getStringDef(PROP_HYPHENATION_DICT,
-                                               DEF_HYPHENATION_DICT);
+                                                 DEF_HYPHENATION_DICT);
             CRLog::debug("PROP_HYPHENATION_DICT = %s", LCSTR(id));
             HyphDictionaryList * list = HyphMan::getDictList();
             if (list) {
@@ -6971,36 +6947,33 @@ CRPropRef LVDocView::propsApply(CRPropRef props) {
                 list->activate(id);
                 REQUEST_RENDER("propsApply hyphenation dict")
             }
-        } else {
-            bool embeddedLang = m_props->getBoolDef(PROP_TEXTLANG_EMBEDDED_LANGS_ENABLED, 0) != 0;
-            lString32 mainLang = m_props->getStringDef(PROP_TEXTLANG_MAIN_LANG, TEXTLANG_DEFAULT_MAIN_LANG);
-            bool hyphEnabled = m_props->getIntDef(PROP_TEXTLANG_HYPHENATION_ENABLED, TEXTLANG_DEFAULT_HYPHENATION_ENABLED) != 0;
-            if (embeddedLang != TextLangMan::getEmbeddedLangsEnabled()) {
-                TextLangMan::setEmbeddedLangsEnabled(embeddedLang);
-                REQUEST_RENDER("propsApply textlang embedded_langs_enabled")
-            }
-            if (mainLang != TextLangMan::getMainLang()) {
-                TextLangMan::setMainLang(mainLang);
-                REQUEST_RENDER("propsApply textlang main_lang")
-            }
-            if (hyphEnabled != TextLangMan::getHyphenationEnabled()) {
-                TextLangMan::setHyphenationEnabled(hyphEnabled);
-                REQUEST_RENDER("propsApply textlang hyphenation_enabled")
-            }
-            if (!TextLangMan::getEmbeddedLangsEnabled()) {
-                // hyphenation dictionary
-                lString32 id = m_props->getStringDef(PROP_HYPHENATION_DICT,
-                                                   DEF_HYPHENATION_DICT);
-                CRLog::debug("PROP_HYPHENATION_DICT = %s", LCSTR(id));
-                HyphDictionaryList * list = HyphMan::getDictList();
-                if (list) {
-                    CRLog::debug("Changing hyphenation to %s", LCSTR(id));
-                    list->activate(id);
-                    REQUEST_RENDER("propsApply hyphenation dict")
-                }
-            }
         }
     }
+    bool hyph_soft_only_enabled = m_props->getBoolDef(PROP_TEXTLANG_HYPH_SOFT_HYPHENS_ONLY, TEXTLANG_DEFAULT_HYPH_SOFT_HYPHENS_ONLY);
+    if ( hyph_soft_only_enabled != TextLangMan::getHyphenationSoftHyphensOnly() ) {
+        TextLangMan::setHyphenationSoftHyphensOnly( hyph_soft_only_enabled );
+        REQUEST_RENDER("propsApply textlang hyphenation_soft_hyphens_only")
+    }
+    bool hyph_force_algo_enabled = m_props->getBoolDef(PROP_TEXTLANG_HYPH_FORCE_ALGORITHMIC, TEXTLANG_DEFAULT_HYPH_FORCE_ALGORITHMIC);
+    if ( hyph_force_algo_enabled != TextLangMan::getHyphenationForceAlgorithmic() ) {
+        TextLangMan::setHyphenationForceAlgorithmic( hyph_force_algo_enabled );
+        REQUEST_RENDER("propsApply textlang hyphenation_force_algorithmic")
+    }
+    int leftHyphenMin = m_props->getIntDef(PROP_HYPHENATION_LEFT_HYPHEN_MIN, HYPH_DEFAULT_HYPHEN_MIN);
+    if (HyphMan::getLeftHyphenMin() != leftHyphenMin) {
+        HyphMan::setLeftHyphenMin(leftHyphenMin);
+        REQUEST_RENDER("propsApply hyphenation left_hyphen_min")
+    }
+    int rightHyphenMin = m_props->getIntDef(PROP_HYPHENATION_RIGHT_HYPHEN_MIN, HYPH_DEFAULT_HYPHEN_MIN);
+    if (HyphMan::getRightHyphenMin() != rightHyphenMin) {
+        HyphMan::setRightHyphenMin(rightHyphenMin);
+        REQUEST_RENDER("propsApply hyphenation right_hyphen_min")
+    }
+    int trustSoftHyphens = m_props->getIntDef(PROP_HYPHENATION_TRUST_SOFT_HYPHENS, HYPH_DEFAULT_TRUST_SOFT_HYPHENS);
+    if (HyphMan::getTrustSoftHyphens() != trustSoftHyphens) {
+        HyphMan::setTrustSoftHyphens(trustSoftHyphens);
+        REQUEST_RENDER("propsApply hyphenation trust_soft_hyphens")
+    }
     return unknown;
 }
 
diff --git a/crengine/src/lvfont/lvfreetypeface.cpp b/crengine/src/lvfont/lvfreetypeface.cpp
index ea7beabed2..8fab2fbedb 100644
--- a/crengine/src/lvfont/lvfreetypeface.cpp
+++ b/crengine/src/lvfont/lvfreetypeface.cpp
@@ -136,6 +136,11 @@ static lChar32 getReplacementChar(lUInt32 code, bool * can_be_ignored = NULL) {
         case 0x25AA: // css_lst_square:
         case 0x25FE: // css_lst_square:
             return '-';
+        case 0x21AF: // DOWNWARDS ZIGZAG ARROW
+        case 0x26A1: // HIGH VOLTAGE SIGN
+        case 0x2B4D: // DOWNWARDS TRIANGLE-HEADED ZIGZAG ARROW
+        case 0x1F5F2:// LIGHTNING MOOD
+            return '+';
         default:
             break;
     }
@@ -1600,92 +1605,6 @@ bool LVFreeTypeFace::getGlyphExtraMetric( glyph_extra_metric_t metric, lUInt32 c
     return false;
 }
 
-font_lang_compat LVFreeTypeFace::checkFontLangCompat(const lString8 &langCode) {
-    font_lang_compat res = font_lang_compat_invalid_tag;
-#if USE_LOCALE_DATA==1
-#define FC_LANG_START_INTERVAL_CODE     0xF0F0FFFF
-    // find corresponding fc_lang record
-    CRLocaleData loc(langCode);
-    const struct fc_lang_rec* rec = NULL;
-    if (loc.isValid()) {
-        const struct fc_lang_rec* ptr = get_fc_lang_data();
-        int max_match = 0;
-        for (unsigned int i = 0; i < get_fc_lang_data_size(); i++) {
-            CRLocaleData fc_loc(ptr->lang_code);
-            int match = loc.calcMatch(fc_loc);
-            if (match > max_match) {
-                max_match = match;
-                rec = ptr;
-            }
-            ptr++;
-        }
-    }
-    // Check compatibility
-    bool fullSupport = false;
-    bool partialSupport = false;
-    if (rec) {
-        unsigned int codePoint = 0;
-        unsigned int tmp;
-        unsigned int first, second = 0;
-        unsigned int i;
-        bool inRange = false;
-        FT_UInt glyphIndex;
-        fullSupport = true;
-        for (i = 0;;) {
-            // get next codePoint
-            if (inRange && codePoint < second) {
-                codePoint++;
-            } else {
-                if (i >= rec->char_set_sz)
-                    break;
-                tmp = rec->char_set[i];
-                if (FC_LANG_START_INTERVAL_CODE == tmp) {       // code of start interval
-                    if (i + 2 < rec->char_set_sz) {
-                        i++;
-                        first = rec->char_set[i];
-                        i++;
-                        second = rec->char_set[i];
-                        inRange = true;
-                        codePoint = first;
-                        i++;
-                    } else {
-                        // broken language char set
-                        fullSupport = false;
-                        break;
-                    }
-                } else {
-                    codePoint = tmp;
-                    inRange = false;
-                    i++;
-                }
-            }
-            // check codePoint in this font
-            glyphIndex = FT_Get_Char_Index(_face, codePoint);
-            if (0 == glyphIndex) {
-                fullSupport = false;
-            } else {
-                partialSupport = true;
-            }
-        }
-        if (fullSupport) {
-            res = font_lang_compat_full;
-            CRLog::debug("checkFontLangCompat(): Font have full support of language %s",
-                         langCode.c_str());
-        } else if (partialSupport) {
-            res = font_lang_compat_partial;
-            CRLog::debug("checkFontLangCompat(): Font have partial support of language %s",
-                         langCode.c_str());
-        } else {
-            res = font_lang_compat_none;
-            CRLog::debug("checkFontLangCompat(): Font DON'T have support of language %s",
-                         langCode.c_str());
-        }
-    } else
-        CRLog::debug("checkFontLangCompat(): Unsupported language code: %s", langCode.c_str());
-#endif
-    return res;
-}
-
 lUInt16 LVFreeTypeFace::measureText(const lChar32 *text,
                                     int len,
                                     lUInt16 *widths,
diff --git a/crengine/src/lvfont/lvfreetypeface.h b/crengine/src/lvfont/lvfreetypeface.h
index 42fbb0a5ec..77d88c8567 100644
--- a/crengine/src/lvfont/lvfreetypeface.h
+++ b/crengine/src/lvfont/lvfreetypeface.h
@@ -273,13 +273,6 @@ class LVFreeTypeFace : public LVFont {
     */
     virtual bool getGlyphExtraMetric( glyph_extra_metric_t metric, lUInt32 code, int & value, bool scaled_to_px=true, lChar32 def_char=0, lUInt32 fallbackPassMask = 0 );
 
-    /**
-     * @brief Check font for compatibility with language with langCode
-     * @param langCode language code, for example, "en" - English, "ru" - Russian
-     * @return true if font contains all glyphs for given language, false otherwise.
-     */
-    virtual font_lang_compat checkFontLangCompat(const lString8 &langCode);
-
     /** \brief measure text
         \param text is text string pointer
         \param len is number of characters to measure
@@ -358,7 +351,7 @@ class LVFreeTypeFace : public LVFont {
 
     /// retrieves font handle
     virtual void *GetHandle() {
-        return NULL;
+        return (void*)_face;
     }
 
     /// returns font typeface name
diff --git a/crengine/src/lvfont/lvfreetypefontman.cpp b/crengine/src/lvfont/lvfreetypefontman.cpp
index 57d6f577e4..c6473230c6 100644
--- a/crengine/src/lvfont/lvfreetypefontman.cpp
+++ b/crengine/src/lvfont/lvfreetypefontman.cpp
@@ -28,6 +28,11 @@
 #include <fontconfig/fontconfig.h>
 #endif
 
+#include "crlocaledata.h"
+#if USE_LOCALE_DATA==1
+#include "fc-lang-data.h"
+#endif
+
 inline int myabs(int n) { return n < 0 ? -n : n; }
 
 lString8 familyName(FT_Face face) {
@@ -85,6 +90,78 @@ int getFontWeight(FT_Face face) {
     return weight;
 }
 
+#if USE_LOCALE_DATA==1
+LVHashTable<lString8, font_lang_compat>* getSupportedLangs(FT_Face face) {
+    LVHashTable<lString8, font_lang_compat>* langs = new LVHashTable<lString8, font_lang_compat>(16);
+#define FC_LANG_START_INTERVAL_CODE     0xF0F0FFFF
+    bool fullSupport;
+    bool partialSupport;
+    unsigned int codePoint = 0;
+    unsigned int tmp;
+    unsigned int first, second;
+    bool inRange;
+    const struct fc_lang_rec* rec = get_fc_lang_data();
+    for (unsigned int l = 0; l < get_fc_lang_data_size(); l++) {
+        CRLocaleData loc(rec->lang_code);
+        if (loc.isValid()) {
+            // Check compatibility
+            codePoint = 0;
+            second = 0;
+            inRange = false;
+            FT_UInt glyphIndex;
+            partialSupport = false;
+            fullSupport = true;
+            for (int i = 0;;) {
+                // get next codePoint
+                if (inRange && codePoint < second) {
+                    codePoint++;
+                } else {
+                    if (i >= rec->char_set_sz)
+                        break;
+                    tmp = rec->char_set[i];
+                    if (FC_LANG_START_INTERVAL_CODE == tmp) {       // code of start interval
+                        if (i + 2 < rec->char_set_sz) {
+                            i++;
+                            first = rec->char_set[i];
+                            i++;
+                            second = rec->char_set[i];
+                            inRange = true;
+                            codePoint = first;
+                            i++;
+                        } else {
+                            // broken language char set
+                            fullSupport = false;
+                            break;
+                        }
+                    } else {
+                        codePoint = tmp;
+                        inRange = false;
+                        i++;
+                    }
+                }
+                // check codePoint in this font
+                glyphIndex = FT_Get_Char_Index(face, codePoint);
+                if (0 == glyphIndex) {
+                    fullSupport = false;
+                } else {
+                    partialSupport = true;
+                }
+            }
+            if (fullSupport)
+                langs->set(loc.langTag(), font_lang_compat_full);
+            else if (partialSupport)
+                langs->set(loc.langTag(), font_lang_compat_partial);
+        } else {
+            CRLog::warn("getSupportedLangs(): invalid lang tag: %s", rec->lang_code);
+        }
+        // to next language
+        rec++;
+    }
+    langs->compact();
+    return langs;
+}
+#endif
+
 lUInt32 LVFreeTypeFontManager::GetFontListHash(int documentId) {
     FONT_MAN_GUARD
     return _cache.GetFontListHash(documentId) * 75 + _fallbackFontFaces.getHash();
@@ -393,7 +470,10 @@ bool LVFreeTypeFontManager::initSystemFonts() {
         
         FcObjectSet *os = FcObjectSetBuild(FC_FILE, FC_WEIGHT, FC_FAMILY,
                                            FC_SLANT, FC_SPACING, FC_INDEX,
-                                           FC_STYLE, FC_SCALABLE, FC_COLOR,
+                                           FC_STYLE, FC_SCALABLE,
+#ifdef FC_COLOR
+                                           FC_COLOR,
+#endif
                                            NULL);
         FcPattern *pat = FcPatternCreate();
         //FcBool b = 1;
@@ -445,7 +525,9 @@ bool LVFreeTypeFontManager::initSystemFonts() {
                 weight = 200;
                 break;
             case FC_WEIGHT_LIGHT:         //    50
+#ifdef FC_WEIGHT_DEMILIGHT
             case FC_WEIGHT_DEMILIGHT:     //    55
+#endif
                 weight = 300;
                 break;
             case FC_WEIGHT_BOOK:          //    75
@@ -618,6 +700,13 @@ bool LVFreeTypeFontManager::initSystemFonts() {
 
 LVFreeTypeFontManager::~LVFreeTypeFontManager() {
     FONT_MAN_GUARD
+    LVHashTable<lString8, LVHashTable<lString8, font_lang_compat>* >::iterator it = _supportedLangs.forwardIterator();
+    LVHashTable<lString8, LVHashTable<lString8, font_lang_compat>* >::pair* p;
+    while ((p = it.next()) != NULL) {
+        LVHashTable<lString8, font_lang_compat>* langTable = p->value;
+        if (langTable)
+            delete langTable;
+    }
     _globalCache.clear();
     _cache.clear();
     if (_library)
@@ -630,7 +719,7 @@ LVFreeTypeFontManager::~LVFreeTypeFontManager() {
 }
 
 LVFreeTypeFontManager::LVFreeTypeFontManager()
-        : _library(NULL), _globalCache(GLYPH_CACHE_SIZE) {
+        : _library(NULL), _globalCache(GLYPH_CACHE_SIZE), _supportedLangs(16) {
     FONT_MAN_GUARD
     int error = FT_Init_FreeType(&_library);
     if (error) {
@@ -925,12 +1014,25 @@ fprintf(_log, "GetFont(size=%d, weight=%d, italic=%d, family=%d, typeface='%s')\
             ref = LVFontRef( new LVFontBoldTransform( ref, &_globalCache ) );
         }
 #endif
+        // build fallback chain
         for (int i = 0; i < _fallbackFontFaces.length(); i++) {
             if (item->getDef()->getTypeFace() == _fallbackFontFaces[i]) {
                 ref->setFallbackMask(1 << i);
                 break;
             }
         }
+        // filling in the language support table if it is empty
+#if USE_LOCALE_DATA==1
+        LVHashTable<lString8, font_lang_compat>* langTable = NULL;
+        if (!_supportedLangs.get(font->getTypeFace(), langTable) || NULL == langTable) {
+            FT_Face face = (FT_Face) font->GetHandle();
+            if (NULL != face) {
+                langTable = getSupportedLangs(face);
+                _supportedLangs.set(font->getTypeFace(), langTable);
+            }
+        }
+#endif
+        // add to cache
         _cache.update( &newDef, ref );
         //            int rsz = ref->getSize();
         //            if ( rsz!=size ) {
@@ -965,13 +1067,56 @@ bool LVFreeTypeFontManager::checkCharSet(FT_Face face) {
     return true;
 }
 
-font_lang_compat LVFreeTypeFontManager::checkFontLangCompat(const lString8 &typeface, const lString8 &langCode) {
-    LVFontRef fntRef = GetFont(-1, 400, false, css_ff_inherit, typeface, -1);
-    if (!fntRef.isNull())
-        return fntRef->checkFontLangCompat(langCode);
-    else
-        CRLog::debug("checkFontLangCompat(): typeface not found: %s", typeface.c_str());
-    return font_lang_compat_invalid_tag;
+font_lang_compat LVFreeTypeFontManager::checkFontLangCompat(const lString8 &typeface, const lString8 &langTag) {
+    font_lang_compat res = font_lang_compat_invalid_tag;
+#if USE_LOCALE_DATA==1
+    CRLocaleData loc(langTag);
+    if (loc.isValid()) {
+        LVHashTable<lString8, font_lang_compat>* langTable = NULL;
+        res = font_lang_compat_none;
+        if (!_supportedLangs.get(typeface, langTable) || NULL == langTable) {
+            if (NULL != langTable) {
+                delete langTable;
+                langTable = NULL;
+                _supportedLangs.remove(typeface);
+            }
+            LVFontRef fntRef = GetFont(-1, 400, false, css_ff_inherit, typeface, -1);
+            if (!fntRef.isNull()) {
+                FT_Face face = (FT_Face) fntRef->GetHandle();
+                if (NULL != face) {
+                    langTable = getSupportedLangs(face);
+                    _supportedLangs.set(typeface, langTable);
+                }
+            }
+        }
+        if (NULL != langTable) {
+            lString8 best_lang;
+            LVHashTable<lString8, font_lang_compat>::iterator it = langTable->forwardIterator();
+            LVHashTable<lString8, font_lang_compat>::pair* p;
+            int max_match = 0;
+            font_lang_compat compat;
+            while ((p = it.next()) != NULL) {
+                lString8 lang = p->key;
+                compat = p->value;
+                CRLocaleData fc_loc(lang);
+                if (fc_loc.isValid()) {
+                    int match = loc.calcMatch(fc_loc);
+                    if (match > max_match) {
+                        max_match = match;
+                        best_lang = lang;
+                    }
+                }
+            }
+            if (!best_lang.empty()) {
+                if (langTable->get(best_lang, compat))
+                    res = compat;
+            }
+        }
+    } else {
+        CRLog::warn("checkFontLangCompat(): invalid langTag: %s", langTag.c_str());
+    }
+#endif
+    return res;
 }
 
 /*
diff --git a/crengine/src/lvfont/lvfreetypefontman.h b/crengine/src/lvfont/lvfreetypefontman.h
index adbc28cd23..06a5a49f3a 100644
--- a/crengine/src/lvfont/lvfreetypefontman.h
+++ b/crengine/src/lvfont/lvfreetypefontman.h
@@ -39,6 +39,7 @@ class LVFreeTypeFontManager : public LVFontManager {
     FT_Library _library;
     LVFontGlobalGlyphCache _globalCache;
     lString32 _requiredChars;
+    LVHashTable<lString8, LVHashTable<lString8, font_lang_compat>* > _supportedLangs;
 #if (DEBUG_FONT_MAN == 1)
     FILE * _log;
 #endif
@@ -122,7 +123,7 @@ class LVFreeTypeFontManager : public LVFontManager {
 
     bool checkCharSet(FT_Face face);
 
-    virtual font_lang_compat checkFontLangCompat(const lString8 &typeface, const lString8 &langCode);
+    virtual font_lang_compat checkFontLangCompat(const lString8 &typeface, const lString8 &langTag);
 
     //bool isMonoSpaced( FT_Face face );
     /// registers document font
diff --git a/crengine/src/lvmemman.cpp b/crengine/src/lvmemman.cpp
index 06a67a0f4f..111ce7af08 100644
--- a/crengine/src/lvmemman.cpp
+++ b/crengine/src/lvmemman.cpp
@@ -40,7 +40,7 @@ void crSetFileToRemoveOnFatalError(const char * filename) {
 #ifdef _LINUX
 static struct sigaction old_sa[NSIG];
 
-#if FOR_ANDROID == 1
+#ifdef ANDROID
 //#define ANDROID_BACKTRACE
 #endif
 
diff --git a/crengine/src/lvstring.cpp b/crengine/src/lvstring.cpp
index 9b2b5313cd..776f79022a 100644
--- a/crengine/src/lvstring.cpp
+++ b/crengine/src/lvstring.cpp
@@ -1541,6 +1541,88 @@ bool lString32::atoi( lInt64 &n ) const
     return *s=='\0' || *s==' ' || *s=='\t';
 }
 
+double lString32::atod() const {
+    double d = 0.0;
+    bool res = atod(d, '.');
+    return res ? d : 0.0;
+}
+
+bool lString32::atod( double &d, char dp ) const {
+    // Simplified implementation without overflow checking
+    int sign = 1;
+    unsigned long intg = 0;
+    unsigned long frac = 0;
+    unsigned long frac_div = 1;
+    unsigned int exp = 0;
+    int exp_sign = 1;
+    bool res = false;
+    const value_type * s = c_str();
+    while (*s == ' ' || *s == '\t')
+        s++;
+    if (*s == '-') {
+        sign = -1;
+        s++;
+    }
+    else if (*s == '+') {
+        s++;
+    }
+    if (*s>='0' && *s<='9') {
+        res = true;
+        while (*s>='0' && *s<='9') {
+            intg = intg * 10 + ( (*s)-'0' );
+            s++;
+        }
+    }
+    if (res && *s == dp) {
+        // decimal point found
+        s++;
+        res = false;
+        if (*s>='0' && *s<='9') {
+            res = true;
+            while (*s>='0' && *s<='9') {
+                frac = frac * 10 + ( (*s)-'0' );
+                s++;
+                frac_div *= 10;
+            }
+        }
+    }
+    if (res && (*s == 'e' || *s == 'E')) {
+        // exponent part
+        s++;
+        if (*s == '-') {
+            exp_sign = -1;
+            s++;
+        }
+        else if (*s == '+') {
+            s++;
+        }
+        res = false;
+        if (*s>='0' && *s<='9') {
+            res = true;
+            while (*s>='0' && *s<='9') {
+                exp = exp * 10 + ( (*s)-'0' );
+                s++;
+            }
+        }
+    }
+    if (res && (*s != '\0' && *s != ' ' && *s != '\t')) {
+        // unprocessed characters left
+        res = false;
+    }
+    d = (double)intg;
+    if (frac_div > 1)
+        d += ((double)frac)/((double)frac_div);
+    if (exp > 1) {
+        double pwr = exp_sign > 0 ? 10.0 : 0.1;
+        for (unsigned int i = 0; i < exp; i++) {
+            d *= pwr;
+        }
+    }
+    if (sign < 0)
+        d = -d;
+    return res;
+}
+
 #define STRING_HASH_MULT 31
 lUInt32 lString32::getHash() const
 {
diff --git a/crengine/src/props.cpp b/crengine/src/props.cpp
index 3e07112782..978a868119 100644
--- a/crengine/src/props.cpp
+++ b/crengine/src/props.cpp
@@ -254,27 +254,37 @@ void CRPropAccessor::limitValueList( const char * propName, const char * values[
     setString( propName, defValue );
 }
 
-void CRPropAccessor::limitValueList( const char * propName, int values[], int value_count )
+void CRPropAccessor::limitValueList(const char * propName, int values[], int valuesCount, int defValueIndex )
 {
-    limitValueList( propName, values, value_count, 0 );
-}
-
-void CRPropAccessor::limitValueList( const char * propName, int values[], int value_count, int defValueIndex )
-{
-    if ( defValueIndex < 0 )
-        defValueIndex = 0;
-    else if ( defValueIndex >= value_count )
-        defValueIndex = value_count - 1;
-    lString32 defValue = lString32::itoa( values[defValueIndex] );
     lString32 value;
     if ( getString( propName, value ) ) {
-        for ( int i=0; i < value_count; i++ ) {
+        for ( int i=0; i < valuesCount; i++ ) {
             lString32 v = lString32::itoa( values[i] );
             if ( v==value )
                 return;
         }
     }
-    setString( propName, defValue );
+    if ( defValueIndex < 0 )
+        defValueIndex = 0;
+    else if ( defValueIndex >= valuesCount )
+        defValueIndex = valuesCount - 1;
+    setInt( propName, values[defValueIndex] );
+}
+
+void CRPropAccessor::limitValueMinMax( const char * propName, int minValue, int maxValue, int defValue )
+{
+    lString32 value;
+    if ( getString( propName, value ) ) {
+        int intValue;
+        if ( value.atoi(intValue) ) {
+            if (intValue < minValue)
+                setInt( propName, minValue );
+            else if (intValue >= maxValue)
+                setInt( propName, maxValue );
+            return;
+        }
+    }
+    setInt( propName, defValue );
 }
 
 //============================================================================
@@ -477,6 +487,13 @@ void CRPropAccessor::setBool( const char * propName, bool value )
     setString( propName, lString32( value ? "1" : "0" ) );
 }
 
+void CRPropAccessor::setBoolDef( const char * propName, bool defValue )
+{
+    bool boolVal;
+    if ( !getBool( propName, boolVal ) )
+        setBool( propName, defValue );
+}
+
 bool CRPropAccessor::getInt64( const char * propName, lInt64 &result ) const
 {
     lString32 value;
diff --git a/icons_src/classic/convert_all.pl b/icons_src/classic/convert_all.pl
index 99bd66ae69..000925f4b0 100755
--- a/icons_src/classic/convert_all.pl
+++ b/icons_src/classic/convert_all.pl
@@ -91,7 +91,13 @@
 	'cr3_button_log-48x48-src.svg' => 'cr3_button_log.png',
 	'cr3_button_light-48x48-src.svg' => 'cr3_button_light.png',
 	'cr3_button_inc-48x48-src.svg' => 'cr3_button_inc.png',
-	'cr3_button_dec-48x48-src.svg' => 'cr3_button_dec.png'
+	'cr3_button_inc_light-48x48-src.svg' => 'cr3_button_inc_light.png',
+	'cr3_button_inc_dark-48x48-src.svg' => 'cr3_button_inc_dark.png',
+	'cr3_button_inc_white-48x48-src.svg' => 'cr3_button_inc_white.png',
+	'cr3_button_dec-48x48-src.svg' => 'cr3_button_dec.png',
+	'cr3_button_dec_light-48x48-src.svg' => 'cr3_button_dec_light.png',
+	'cr3_button_dec_dark-48x48-src.svg' => 'cr3_button_dec_dark.png',
+	'cr3_button_dec_white-48x48-src.svg' => 'cr3_button_dec_white.png'
 );
 
 my %ic_tabs_list=(
diff --git a/icons_src/classic/cr3_button_dec_dark-48x48-src.svg b/icons_src/classic/cr3_button_dec_dark-48x48-src.svg
new file mode 100644
index 0000000000..25e3904727
--- /dev/null
+++ b/icons_src/classic/cr3_button_dec_dark-48x48-src.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="cr3_button_dec_dark-48x48-src.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48">
+  <defs
+     id="defs2">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1621"
+       x="-0.00768"
+       width="1.01536"
+       y="-0.00768"
+       height="1.01536">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.0736"
+         id="feGaussianBlur1623" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter2266"
+       x="-0.4024014"
+       width="1.8048028"
+       y="-0.4024014"
+       height="1.8048028">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.8563467"
+         id="feGaussianBlur2268" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     guidetolerance="2"
+     objecttolerance="2"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="605"
+     inkscape:window-height="1002"
+     inkscape:window-width="1307"
+     units="px"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="22.867931"
+     inkscape:cx="17.131295"
+     inkscape:zoom="5.6568544"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-284.29999)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path919-2"
+       d="m 12.5,305.29999 h 23 v 6 h -23 z"
+       style="opacity:0.777503;fill:#d0d0d0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2266)" />
+    <path
+       style="mix-blend-mode:normal;fill:#3d3d3d;fill-opacity:0.690196;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 12,304.79999 h 24 v 7 H 12 Z"
+       id="path951"
+       sodipodi:nodetypes="ccccc" />
+    <ellipse
+       r="22.514143"
+       cy="308.29999"
+       cx="24"
+       id="path870"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+    <circle
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870-36"
+       cx="-5.1794691"
+       cy="261.4292"
+       r="0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path919"
+       d="m 12.5,305.29999 h 23 v 6 h -23 z"
+       style="fill:#d0d0d0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1621)" />
+  </g>
+</svg>
diff --git a/icons_src/classic/cr3_button_dec_light-48x48-src.svg b/icons_src/classic/cr3_button_dec_light-48x48-src.svg
new file mode 100644
index 0000000000..edf1be4f16
--- /dev/null
+++ b/icons_src/classic/cr3_button_dec_light-48x48-src.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="cr3_button_dec_light-48x48-src.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48">
+  <defs
+     id="defs2">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1621"
+       x="-0.00768"
+       width="1.01536"
+       y="-0.00768"
+       height="1.01536">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.0736"
+         id="feGaussianBlur1623" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter2266"
+       x="-0.4024014"
+       width="1.8048028"
+       y="-0.4024014"
+       height="1.8048028">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.8563467"
+         id="feGaussianBlur2268" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     guidetolerance="2"
+     objecttolerance="2"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="59"
+     inkscape:window-height="1002"
+     inkscape:window-width="1292"
+     units="px"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="22.867931"
+     inkscape:cx="17.131295"
+     inkscape:zoom="5.6568544"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-284.29999)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path919-2"
+       d="m 12.5,305.29999 h 23 v 6 h -23 z"
+       style="opacity:0.777503;fill:#6b472f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2266)" />
+    <path
+       style="mix-blend-mode:normal;fill:#3d3d3d;fill-opacity:0.690196;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 12,304.79999 h 24 v 7 H 12 Z"
+       id="path951"
+       sodipodi:nodetypes="ccccc" />
+    <ellipse
+       r="22.514143"
+       cy="308.29999"
+       cx="24"
+       id="path870"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+    <circle
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870-36"
+       cx="-5.1794691"
+       cy="261.4292"
+       r="0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path919"
+       d="m 12.5,305.29999 h 23 v 6 h -23 z"
+       style="fill:#6b472f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1621)" />
+  </g>
+</svg>
diff --git a/icons_src/classic/cr3_button_dec_white-48x48-src.svg b/icons_src/classic/cr3_button_dec_white-48x48-src.svg
new file mode 100644
index 0000000000..21a256fb46
--- /dev/null
+++ b/icons_src/classic/cr3_button_dec_white-48x48-src.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="cr3_button_dec_white-48x48-src.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48">
+  <defs
+     id="defs2">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1621"
+       x="-0.00768"
+       width="1.01536"
+       y="-0.00768"
+       height="1.01536">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.0736"
+         id="feGaussianBlur1623" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter2266"
+       x="-0.4024014"
+       width="1.8048028"
+       y="-0.4024014"
+       height="1.8048028">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.8563467"
+         id="feGaussianBlur2268" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     guidetolerance="2"
+     objecttolerance="2"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="574"
+     inkscape:window-height="1002"
+     inkscape:window-width="1338"
+     units="px"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="22.867931"
+     inkscape:cx="17.131295"
+     inkscape:zoom="5.6568544"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-284.29999)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path919-2"
+       d="m 12.5,305.29999 h 23 v 6 h -23 z"
+       style="opacity:0.777503;fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2266)" />
+    <path
+       style="mix-blend-mode:normal;fill:#3d3d3d;fill-opacity:0.690196;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 12,304.79999 h 24 v 7 H 12 Z"
+       id="path951"
+       sodipodi:nodetypes="ccccc" />
+    <ellipse
+       r="22.514143"
+       cy="308.29999"
+       cx="24"
+       id="path870"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+    <circle
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870-36"
+       cx="-5.1794691"
+       cy="261.4292"
+       r="0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path919"
+       d="m 12.5,305.29999 h 23 v 6 h -23 z"
+       style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1621)" />
+  </g>
+</svg>
diff --git a/icons_src/classic/cr3_button_inc_dark-48x48-src.svg b/icons_src/classic/cr3_button_inc_dark-48x48-src.svg
new file mode 100644
index 0000000000..bedfded407
--- /dev/null
+++ b/icons_src/classic/cr3_button_inc_dark-48x48-src.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="cr3_button_inc_dark-48x48-src.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48">
+  <defs
+     id="defs2">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1621"
+       x="-0.00768"
+       width="1.01536"
+       y="-0.00768"
+       height="1.01536">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.0736"
+         id="feGaussianBlur1623" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter2266"
+       x="-0.4024014"
+       width="1.8048028"
+       y="-0.4024014"
+       height="1.8048028">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.8563467"
+         id="feGaussianBlur2268" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     guidetolerance="2"
+     objecttolerance="2"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="569"
+     inkscape:window-height="1002"
+     inkscape:window-width="1343"
+     units="px"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="32.198486"
+     inkscape:cx="21.943766"
+     inkscape:zoom="8.0000004"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-284.29999)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path919-2"
+       d="M 12.5,305.29999 H 21 v -8.5 h 6 v 8.5 h 8.5 v 6 H 27 v 8.5 h -6 v -8.5 h -8.5 z"
+       style="fill:#d0d0d0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.77750267;filter:url(#filter2266);stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       style="fill:#3d3d3d;fill-opacity:0.690196;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 12,304.79999 h 8.5 v -8.5 h 7 v 8.5 H 36 v 7 h -8.5 v 8.5 h -7 v -8.5 H 12 Z"
+       id="path951"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <ellipse
+       r="22.514143"
+       cy="308.29999"
+       cx="24"
+       id="path870"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+    <circle
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870-36"
+       cx="-5.1794691"
+       cy="261.4292"
+       r="0" />
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path919"
+       d="m 12.49964,305.29999 h 8.5 v -8.5 h 6 v 8.5 h 8.5 v 6 h -8.5 v 8.5 h -6 v -8.5 h -8.5 z"
+       style="fill:#d0d0d0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1621)" />
+  </g>
+</svg>
diff --git a/icons_src/classic/cr3_button_inc_light-48x48-src.svg b/icons_src/classic/cr3_button_inc_light-48x48-src.svg
new file mode 100644
index 0000000000..aaa6335f26
--- /dev/null
+++ b/icons_src/classic/cr3_button_inc_light-48x48-src.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="cr3_button_inc_light-48x48-src.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48">
+  <defs
+     id="defs2">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1621"
+       x="-0.00768"
+       width="1.01536"
+       y="-0.00768"
+       height="1.01536">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.0736"
+         id="feGaussianBlur1623" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter2266"
+       x="-0.4024014"
+       width="1.8048028"
+       y="-0.4024014"
+       height="1.8048028">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.8563467"
+         id="feGaussianBlur2268" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     guidetolerance="2"
+     objecttolerance="2"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="606"
+     inkscape:window-height="1002"
+     inkscape:window-width="1306"
+     units="px"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="32.198486"
+     inkscape:cx="21.943766"
+     inkscape:zoom="8.0000004"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-284.29999)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path919-2"
+       d="M 12.5,305.29999 H 21 v -8.5 h 6 v 8.5 h 8.5 v 6 H 27 v 8.5 h -6 v -8.5 h -8.5 z"
+       style="fill:#6b472f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.77750267;filter:url(#filter2266);stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       style="fill:#3d3d3d;fill-opacity:0.690196;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 12,304.79999 h 8.5 v -8.5 h 7 v 8.5 H 36 v 7 h -8.5 v 8.5 h -7 v -8.5 H 12 Z"
+       id="path951"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <ellipse
+       r="22.514143"
+       cy="308.29999"
+       cx="24"
+       id="path870"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+    <circle
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870-36"
+       cx="-5.1794691"
+       cy="261.4292"
+       r="0" />
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path919"
+       d="m 12.49964,305.29999 h 8.5 v -8.5 h 6 v 8.5 h 8.5 v 6 h -8.5 v 8.5 h -6 v -8.5 h -8.5 z"
+       style="fill:#6b472f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1621)" />
+  </g>
+</svg>
diff --git a/icons_src/classic/cr3_button_inc_white-48x48-src.svg b/icons_src/classic/cr3_button_inc_white-48x48-src.svg
new file mode 100644
index 0000000000..e47e46a8e7
--- /dev/null
+++ b/icons_src/classic/cr3_button_inc_white-48x48-src.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="cr3_button_inc_white-48x48-src.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48">
+  <defs
+     id="defs2">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1621"
+       x="-0.00768"
+       width="1.01536"
+       y="-0.00768"
+       height="1.01536">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.0736"
+         id="feGaussianBlur1623" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter2266"
+       x="-0.4024014"
+       width="1.8048028"
+       y="-0.4024014"
+       height="1.8048028">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.8563467"
+         id="feGaussianBlur2268" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     guidetolerance="2"
+     objecttolerance="2"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="504"
+     inkscape:window-height="1002"
+     inkscape:window-width="1408"
+     units="px"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="32.198486"
+     inkscape:cx="21.943766"
+     inkscape:zoom="8.0000004"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-284.29999)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path919-2"
+       d="M 12.5,305.29999 H 21 v -8.5 h 6 v 8.5 h 8.5 v 6 H 27 v 8.5 h -6 v -8.5 h -8.5 z"
+       style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.77750267;filter:url(#filter2266);stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       style="fill:#3d3d3d;fill-opacity:0.690196;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 12,304.79999 h 8.5 v -8.5 h 7 v 8.5 H 36 v 7 h -8.5 v 8.5 h -7 v -8.5 H 12 Z"
+       id="path951"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <ellipse
+       r="22.514143"
+       cy="308.29999"
+       cx="24"
+       id="path870"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+    <circle
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870-36"
+       cx="-5.1794691"
+       cy="261.4292"
+       r="0" />
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path919"
+       d="m 12.49964,305.29999 h 8.5 v -8.5 h 6 v 8.5 h 8.5 v 6 h -8.5 v 8.5 h -6 v -8.5 h -8.5 z"
+       style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1621)" />
+  </g>
+</svg>
diff --git a/thirdparty_repo/freetype.meta.sh b/thirdparty_repo/freetype.meta.sh
index f30849d5e8..70aedf3568 100644
--- a/thirdparty_repo/freetype.meta.sh
+++ b/thirdparty_repo/freetype.meta.sh
@@ -2,16 +2,14 @@
 # Metadata for deploy script
 
 PN="freetype"
-PV="2.10.4"
+PV="2.11.0"
 # package revision: when patchset is changed (but not version), increase it
 # when version changed, reset to "1".
 REV="2"
 SRCFILE="${PN}-${PV}.tar.xz"
-SHA512="827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f"
-
+SHA512="bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d"
 URL="https://download.savannah.gnu.org/releases/${PN}/${SRCFILE}"
 
 SOURCESDIR="${PN}-${PV}"
 
-PATCHES="01-disable-install.patch
-    0001-srd-base-ftlcdfil.c-FT_Library_SetLcdGeometry-Fix-re.patch"
+PATCHES=
diff --git a/thirdparty_repo/harfbuzz.meta.sh b/thirdparty_repo/harfbuzz.meta.sh
index 7979aa7922..83af0602f7 100644
--- a/thirdparty_repo/harfbuzz.meta.sh
+++ b/thirdparty_repo/harfbuzz.meta.sh
@@ -2,15 +2,15 @@
 # Metadata for deploy script
 
 PN="harfbuzz"
-PV="2.8.0"
+PV="2.8.2"
 # package revision: when patchset is changed (but not version), increase it
 # when version changed, reset to "1".
 REV="1"
 SRCFILE="${PN}-${PV}.tar.xz"
-SHA512="0ece78fa5c18be1fd693f40493ff3689a297ef4d5ad82f31054e8f42c1ba4e8b93afe1ed1ccb9eb9a0f165f8d1343c12c0606f1768a4f85bb041ae65018e6d83"
+SHA512="47f672967ba9e9a1ea21164b9780cbaaad2f4f619811e84d1b6bdb598e5ad60c96e08fadd270460a4ce8e2fb4603fcdd881ba55f2826abc2a4ab439efdc856dc"
 
 URL="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${SRCFILE}"
 
 SOURCESDIR="${PN}-${PV}"
 
-PATCHES="01-disable-install.patch"
+PATCHES=
diff --git a/thirdparty_repo/patches/freetype/0001-srd-base-ftlcdfil.c-FT_Library_SetLcdGeometry-Fix-re.patch b/thirdparty_repo/patches/freetype/0001-srd-base-ftlcdfil.c-FT_Library_SetLcdGeometry-Fix-re.patch
deleted file mode 100644
index d2bd268274..0000000000
--- a/thirdparty_repo/patches/freetype/0001-srd-base-ftlcdfil.c-FT_Library_SetLcdGeometry-Fix-re.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b594cd90bd053061ea8437bd9f219ee1ced956da Mon Sep 17 00:00:00 2001
-From: Alexei Podtelezhnikov <apodtele@gmail.com>
-Date: Tue, 19 Jan 2021 07:35:38 -0500
-Subject: [PATCH] * srd/base/ftlcdfil.c (FT_Library_SetLcdGeometry): Fix return
- value.
-
----
- ChangeLog           | 4 ++++
- src/base/ftlcdfil.c | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-// diff --git a/ChangeLog b/ChangeLog
-// index 6faa683a0..6a72a8918 100644
-// --- a/ChangeLog
-// +++ b/ChangeLog
-// @@ -1,3 +1,7 @@
-// +2021-01-19  Alexei Podtelezhnikov  <apodtele@gmail.com>
-// +
-// +	* srd/base/ftlcdfil.c (FT_Library_SetLcdGeometry): Fix return value.
-// +
-//  2021-01-15  Nikolaus Waxweiler  <madigens@gmail.com>
-//  
-//  	[afshaper] Fix hb_ot_tags_from_script deprecation warning.
-diff --git a/src/base/ftlcdfil.c b/src/base/ftlcdfil.c
-index 1a2e4d4ff..f3725a3d7 100644
---- a/src/base/ftlcdfil.c
-+++ b/src/base/ftlcdfil.c
-@@ -428,7 +428,7 @@
- 
-     ft_memcpy( library->lcd_geometry, sub, 3 * sizeof( FT_Vector ) );
- 
--    return FT_THROW( Unimplemented_Feature );
-+    return FT_Err_Ok;
-   }
- 
- #endif /* !FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
--- 
-2.26.3
-
diff --git a/thirdparty_repo/patches/freetype/01-disable-install.patch b/thirdparty_repo/patches/freetype/01-disable-install.patch
deleted file mode 100644
index d3b0980ac5..0000000000
--- a/thirdparty_repo/patches/freetype/01-disable-install.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -urBb freetype-2.10.4-orig/CMakeLists.txt freetype-2.10.4/CMakeLists.txt
---- freetype-2.10.4-orig/CMakeLists.txt	2020-10-20 09:03:43.000000000 +0400
-+++ freetype-2.10.4/CMakeLists.txt	2021-01-26 23:46:10.973017007 +0400
-@@ -470,89 +470,6 @@
- endif ()
- 
- 
--# Installation
--include(GNUInstallDirs)
--
--if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
--  install(
--    # Note the trailing slash in the argument to `DIRECTORY'!
--    DIRECTORY ${PROJECT_SOURCE_DIR}/include/
--      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2
--      COMPONENT headers
--      PATTERN "internal" EXCLUDE
--      PATTERN "ftconfig.h" EXCLUDE
--      PATTERN "ftoption.h" EXCLUDE)
--  install(
--    FILES ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h
--          ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h
--      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2/freetype/config
--      COMPONENT headers)
--endif ()
--
--if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
--  # Generate the pkg-config file
--  if (UNIX)
--    file(READ "${PROJECT_SOURCE_DIR}/builds/unix/freetype2.in" FREETYPE2_PC_IN)
--
--    string(REPLACE ";" ", " PKG_CONFIG_REQUIRED_PRIVATE "${PKG_CONFIG_REQUIRED_PRIVATE}")
--
--    string(REPLACE "%prefix%" ${CMAKE_INSTALL_PREFIX}
--           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
--    string(REPLACE "%exec_prefix%" "\${prefix}"
--           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
--    string(REPLACE "%libdir%" "\${prefix}/${CMAKE_INSTALL_LIBDIR}"
--           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
--    string(REPLACE "%includedir%" "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}"
--           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
--    string(REPLACE "%ft_version%" "${LIBTOOL_CURRENT}.${LIBTOOL_REVISION}.${LIBTOOL_AGE}"
--           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
--    string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}"
--           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
--    string(REPLACE "%LIBS_PRIVATE%" ""  # All libs support pkg-config
--           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
--
--    set(FREETYPE2_PC_IN_NAME "${PROJECT_BINARY_DIR}/freetype2.pc")
--    if (EXISTS "${FREETYPE2_PC_IN_NAME}")
--      file(READ "${FREETYPE2_PC_IN_NAME}" ORIGINAL_FREETYPE2_PC_IN)
--    else ()
--      set(ORIGINAL_FREETYPE2_PC_IN "")
--    endif ()
--    if (NOT (ORIGINAL_FREETYPE2_PC_IN STREQUAL FREETYPE2_PC_IN))
--      file(WRITE "${FREETYPE2_PC_IN_NAME}" ${FREETYPE2_PC_IN})
--    endif ()
--
--    install(
--      FILES ${PROJECT_BINARY_DIR}/freetype2.pc
--      DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
--      COMPONENT pkgconfig)
--  endif ()
--
--  include(CMakePackageConfigHelpers)
--  write_basic_package_version_file(
--    ${PROJECT_BINARY_DIR}/freetype-config-version.cmake
--    VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
--    COMPATIBILITY SameMajorVersion)
--
--  install(
--    TARGETS freetype
--      EXPORT freetype-targets
--      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
--      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--      FRAMEWORK DESTINATION Library/Frameworks
--      COMPONENT libraries)
--  install(
--    EXPORT freetype-targets
--      DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype
--      FILE freetype-config.cmake
--      COMPONENT headers)
--  install(
--    FILES ${PROJECT_BINARY_DIR}/freetype-config-version.cmake
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype
--    COMPONENT headers)
--endif ()
--
--
- # Packaging
- set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
- set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The FreeType font rendering library.")
diff --git a/thirdparty_repo/patches/harfbuzz/01-disable-install.patch b/thirdparty_repo/patches/harfbuzz/01-disable-install.patch
deleted file mode 100644
index 9474bebe35..0000000000
--- a/thirdparty_repo/patches/harfbuzz/01-disable-install.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -urBb harfbuzz-2.8.0-orig/CMakeLists.txt harfbuzz-2.8.0/CMakeLists.txt
---- harfbuzz-2.8.0-orig/CMakeLists.txt	2021-03-16 21:32:44.000000000 +0400
-+++ harfbuzz-2.8.0/CMakeLists.txt	2021-03-23 08:26:48.249008717 +0400
-@@ -664,79 +664,3 @@
- 
-   mark_as_advanced(CAIRO_INCLUDE_DIRS CAIRO_LIBRARIESNAMES)
- endif ()
--
--
--## Install
--include (GNUInstallDirs)
--
--if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
--  install(FILES ${project_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/harfbuzz)
--  if (HB_HAVE_GOBJECT)
--    install(FILES ${hb_gobject_headers} ${hb_gobject_gen_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/harfbuzz)
--  endif ()
--endif ()
--
--if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
--  install(TARGETS harfbuzz
--    EXPORT harfbuzzConfig
--    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
--    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    FRAMEWORK DESTINATION Library/Frameworks
--  )
--  install(EXPORT harfbuzzConfig
--      NAMESPACE harfbuzz::
--      DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/harfbuzz
--  )
--  if (HB_HAVE_ICU)
--    install(TARGETS harfbuzz-icu
--      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
--      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--      FRAMEWORK DESTINATION Library/Frameworks
--    )
--  endif ()
--  if (HB_BUILD_UTILS)
--    if (WIN32 AND BUILD_SHARED_LIBS)
--      install(TARGETS harfbuzz-subset
--        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--      )
--    endif ()
--    install(TARGETS hb-view
--      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    )
--    install(TARGETS hb-subset
--      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    )
--
--    install(TARGETS hb-shape
--      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    )
--
--    install(TARGETS hb-ot-shape-closure
--      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    )
--  endif ()
--  if (HB_HAVE_GOBJECT)
--    install(TARGETS harfbuzz-gobject
--      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
--      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    )
--    if (HB_HAVE_INTROSPECTION)
--      if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
--        set (hb_libpath "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
--      else ()
--        set (hb_libpath "$<TARGET_FILE_DIR:harfbuzz-gobject>")
--      endif ()
--
--      install(FILES "${hb_libpath}/HarfBuzz-0.0.gir"
--        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/gir-1.0
--      )
--
--      install(FILES "${hb_libpath}/HarfBuzz-0.0.typelib"
--        DESTINATION ${CMAKE_INSTALL_LIBDIR}/girepository-1.0
--      )
--    endif ()
--  endif ()
--endif ()
diff --git a/thirdparty_repo/repo_srcdirs.cmake b/thirdparty_repo/repo_srcdirs.cmake
index af24bce478..26e40a35dd 100644
--- a/thirdparty_repo/repo_srcdirs.cmake
+++ b/thirdparty_repo/repo_srcdirs.cmake
@@ -3,9 +3,9 @@
 # See <top_srcdir>/CMakeLists.txt
 #     <top_srcdir>/android/app/CMakeLists.txt
 
-set(REPO_FREETYPE_SRCDIR "freetype-2.10.4")
+set(REPO_FREETYPE_SRCDIR "freetype-2.11.0")
 set(REPO_FRIBIDI_SRCDIR "fribidi-1.0.10")
-set(REPO_HARFBUZZ_SRCDIR "harfbuzz-2.8.0")
+set(REPO_HARFBUZZ_SRCDIR "harfbuzz-2.8.2")
 set(REPO_LIBJPEG_SRCDIR "jpeg-9d")
 set(REPO_LIBPNG_SRCDIR "libpng-1.6.37")
 set(REPO_LIBUNIBREAK_SRCDIR "libunibreak-4.3")
diff --git a/thirdparty_repo/repo_srcdirs.mk b/thirdparty_repo/repo_srcdirs.mk
index 7fcb636c9b..9da248224d 100644
--- a/thirdparty_repo/repo_srcdirs.mk
+++ b/thirdparty_repo/repo_srcdirs.mk
@@ -2,9 +2,9 @@
 # For ndk-build project file.
 # See <top_srcdir>/android/jni/Android.mk
 
-REPO_FREETYPE_SRCDIR := freetype-2.10.4
+REPO_FREETYPE_SRCDIR := freetype-2.11.0
 REPO_FRIBIDI_SRCDIR := fribidi-1.0.10
-REPO_HARFBUZZ_SRCDIR := harfbuzz-2.8.0
+REPO_HARFBUZZ_SRCDIR := harfbuzz-2.8.2
 REPO_LIBJPEG_SRCDIR := jpeg-9d
 REPO_LIBPNG_SRCDIR := libpng-1.6.37
 REPO_LIBUNIBREAK_SRCDIR := libunibreak-4.3