diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5edb4ee
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+*.iml
+.gradle
+/local.properties
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..7a3265e
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..cccdd3d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..f955316
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/SyntaxHighlighter.kt b/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/SyntaxHighlighter.kt
index ed20794..bf0d79c 100644
--- a/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/SyntaxHighlighter.kt
+++ b/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/SyntaxHighlighter.kt
@@ -6,10 +6,13 @@ import android.text.style.CharacterStyle
 import de.markusressel.kodeeditor.library.syntaxhighlighter.colorscheme.SyntaxColorScheme
 
 /**
- * Interface for a SyntaxHighlighter
+ * Interface for a SyntaxHighlighter with basic logic for color schemes and applying styles
  */
 interface SyntaxHighlighter {
 
+    /**
+     * A set of styles that were applied by this highlighter
+     */
     val appliedStyles: MutableSet<CharacterStyle>
 
     /**
@@ -29,15 +32,19 @@ interface SyntaxHighlighter {
 
     /**
      * Highlight the given text
+     *
+     * Note: If you need to highlight multiple editables at the same time
+     *       be sure to also create one highlighter instance for each editable.
+     *       Otherwise applied styles might not be cleared properly
+     *       when refreshing highlighting of an already highlighted editable.
      */
     fun highlight(editable: Editable) {
         // cleanup previously applied styles
-        //        clear(editable)
         clearAppliedStyles(editable)
 
         // reapply
         getRules()
-                .forEach {rule ->
+                .forEach { rule ->
                     rule
                             .findMatches(editable)
                             .forEach {
diff --git a/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/SyntaxHighlighterBase.kt b/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/SyntaxHighlighterBase.kt
index 9bf82cd..284ecec 100644
--- a/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/SyntaxHighlighterBase.kt
+++ b/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/SyntaxHighlighterBase.kt
@@ -3,6 +3,9 @@ package de.markusressel.kodeeditor.library.syntaxhighlighter
 import android.text.style.CharacterStyle
 import de.markusressel.kodeeditor.library.syntaxhighlighter.colorscheme.SyntaxColorScheme
 
+/**
+ * Convenience base class for implementing a syntax highlighter
+ */
 abstract class SyntaxHighlighterBase : SyntaxHighlighter {
 
     override val appliedStyles: MutableSet<CharacterStyle> = mutableSetOf()
diff --git a/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/SyntaxHighlighterRule.kt b/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/SyntaxHighlighterRule.kt
index 70eb741..3c5c3b9 100644
--- a/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/SyntaxHighlighterRule.kt
+++ b/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/SyntaxHighlighterRule.kt
@@ -2,6 +2,12 @@ package de.markusressel.kodeeditor.library.syntaxhighlighter
 
 import android.text.Editable
 
+/**
+ * Interface for a single highlighter rule.
+ *
+ * A rule is used to identify text passages that match the rule.
+ * The styles that are applied to those passages are defined in a color scheme.
+ */
 interface SyntaxHighlighterRule {
 
     /**
diff --git a/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/colorscheme/SyntaxColorScheme.kt b/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/colorscheme/SyntaxColorScheme.kt
index a88bdd4..2a59156 100644
--- a/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/colorscheme/SyntaxColorScheme.kt
+++ b/syntaxhighlighter/src/main/java/de/markusressel/kodeeditor/library/syntaxhighlighter/colorscheme/SyntaxColorScheme.kt
@@ -4,7 +4,8 @@ import android.text.style.CharacterStyle
 import de.markusressel.kodeeditor.library.syntaxhighlighter.SyntaxHighlighterRule
 
 /**
- * A color scheme for a syntax highlighter
+ * A color scheme for a syntax highlighter.
+ * This essentially maps rules to the styles that will be applied to matched text passages.
  */
 interface SyntaxColorScheme {