--- a/tools/checkstyle.xml	Fri May 01 01:36:11 2015 +0200
+++ b/tools/checkstyle.xml	Fri May 01 01:36:53 2015 +0200
@@ -156,16 +156,18 @@
 	</module>
 	<module name="AvoidStaticImport">
 	    <property name="excludes" value="*"/>
-	</module>
-	<module name="ImportOrder">
-	    <property name="groups" value="/^javax?\./,/^android\./"/>
-	    <property name="ordered" value="true"/>
-	    <property name="separated" value="true"/>
-	    <property name="option" value="bottom"/>
-	    <property name="caseSensitive" value="true"/>
-	    <property name="severity" value="error"/>
+	    <property name="severity" value="info"/>
 	</module>
 
+	<module name="CustomImportOrder">
+	    <property name="thirdPartyPackageRegExp" value=".*"/>
+	    <property name="specialImportsRegExp" value="com.beem.project.beem"/>
+	    <property name="separateLineBetweenGroups" value="true"/>
+	    <property name="standardPackageRegExp" value="^java|^javax|^android"/>
+	    <property name="customImportOrderRules" value="STATIC###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS"/>
+	    <!-- set to warning until fixed in most file -->
+	    <property name="severity" value="warning"/>
+	</module>
 
 	<!-- Checks for Size Violations.                    -->
 	<!-- See http://checkstyle.sf.net/config_sizes.html -->