diff --git a/Utilities/KWStyle/CMakeLists.txt b/Utilities/KWStyle/CMakeLists.txt
index b7aa2e8ae..ca8540abd 100644
--- a/Utilities/KWStyle/CMakeLists.txt
+++ b/Utilities/KWStyle/CMakeLists.txt
@@ -26,6 +26,8 @@ IF(CMAKE_USE_KWSTYLE)
 
   CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/Utilities/KWStyle/CMake.kws.xml.in
                ${CMAKE_BINARY_DIR}/CMake.kws.xml)
+  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/Utilities/KWStyle/CMakeMoreChecks.kws.xml.in
+               ${CMAKE_BINARY_DIR}/CMakeMoreChecks.kws.xml)
 
   CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/Utilities/KWStyle/CMakeFiles.txt.in
                  ${CMAKE_BINARY_DIR}/CMakeKWSFiles.txt)
@@ -36,6 +38,13 @@ IF(CMAKE_USE_KWSTYLE)
     ARGS    -xml ${CMAKE_BINARY_DIR}/CMake.kws.xml -o ${CMAKE_SOURCE_DIR}/Utilities/KWStyle/CMakeOverwrite.txt -v ${KWSTYLE_ARGUMENTS} -D ${CMAKE_BINARY_DIR}/CMakeKWSFiles.txt 
     COMMENT "Coding Style Checker"
     )
+
+  ADD_CUSTOM_TARGET(MoreStyleChecks
+    COMMAND ${KWSTYLE_EXECUTABLE}
+    -xml ${CMAKE_BINARY_DIR}/CMakeMoreChecks.kws.xml -html ${CMAKE_BINARY_DIR}/html -o ${CMAKE_SOURCE_DIR}/Utilities/KWStyle/CMakeOverwrite.txt -v ${KWSTYLE_ARGUMENTS} -D ${CMAKE_BINARY_DIR}/CMakeKWSFiles.txt 
+    COMMENT "Coding Style Checker, more checks enabled"
+    )
+
   ADD_CUSTOM_TARGET(StyleCheck DEPENDS ${CMAKE_BINARY_DIR}/KWStyleReport.txt)
 ENDIF(CMAKE_USE_KWSTYLE)
 
diff --git a/Utilities/KWStyle/CMakeMoreChecks.kws.xml.in b/Utilities/KWStyle/CMakeMoreChecks.kws.xml.in
new file mode 100644
index 000000000..f47f8e854
--- /dev/null
+++ b/Utilities/KWStyle/CMakeMoreChecks.kws.xml.in
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<Description>
+  <ErrorThreshold>10</ErrorThreshold> 
+  <LineLength>79</LineLength>
+  <Header>"@CMAKE_SOURCE_DIR@/Utilities/KWStyle/Headers",false,true</Header>
+  <Functions>
+    <regex>^(cm)?[A-Z]</regex>
+    <length>200</length>
+  </Functions>
+  <InternalVariables>
+    <regex>^[A-Z]</regex>
+    <alignment>0</alignment>
+  </InternalVariables>
+  <SemicolonSpace>0</SemicolonSpace>
+  <DeclarationOrder>
+    <public>0</public>
+    <protected>1</protected>
+    <private>2</private>
+  </DeclarationOrder>
+  <Tabs>1</Tabs>
+  <EmptyLines>4</EmptyLines>
+  <StatementPerLine>
+    <maxNumber>1</maxNumber>
+    <checkInline>0</checkInline>
+  </StatementPerLine>
+  <VariablePerLine>
+    <maxNumber>1</maxNumber>
+  </VariablePerLine>
+  <BadCharacters>true</BadCharacters>
+</Description>