diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 38a05c840..77a32997a 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -4,6 +4,8 @@
     "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
 <module name="Checker">
 
+    <property name="charset" value="UTF-8"/>
+
     <module name="FileTabCharacter" />
 
     <module name="RegexpSingleline">
@@ -39,23 +41,28 @@
         <!--<module name="MethodLength" />-->
         <!--<module name="ParameterNumber" />-->
 
-        <module name="Indentation">
-            <!--TODO: 8 spaces on wrapped funcs, 4 for arrays-->
-            <!--<property name="lineWrappingIndentation" value="4" />-->
-            <!--<property name="arrayInitIndent" value="0" />-->
-            <!--<property name="forceStrictCondition" value="true" />-->
-        </module>
         <module name="EmptyLineSeparator">
             <property name="allowNoEmptyLineBetweenFields" value="true" />
             <property name="allowMultipleEmptyLines" value="false" />
         </module>
         <module name="SeparatorWrap">
-            <property name="tokens" value="COMMA" />
+            <property name="tokens" value="DOT" />
+            <property name="option" value="nl"/>
         </module>
+        <module name="SeparatorWrap">
+            <property name="tokens" value="COMMA"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="NoLineWrap"/>
 
         <!--<module name="OneTopLevelClass" />-->
         <module name="OneStatementPerLine" />
 
+        <module name="EmptyBlock">
+            <property name="option" value="TEXT"/>
+            <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+        </module>
+
         <module name="EmptyForIteratorPad" />
         <module name="GenericWhitespace" />
         <module name="MethodParamPad" />
@@ -100,6 +107,17 @@
         <module name="EqualsAvoidNull" />
         <!--<module name="EqualsHashCode" />-->
 
+        <module name="IllegalTokenText">
+            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
+            <property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+            <property name="message" value="Avoid using corresponding octal or Unicode escape."/>
+        </module>
+        <module name="AvoidEscapedUnicodeCharacters">
+            <property name="allowEscapesForControlCharacters" value="true"/>
+            <property name="allowByTailComment" value="true"/>
+            <property name="allowNonPrintableEscapes" value="true"/>
+        </module>
+
     </module>
 
 </module>