diff --git a/.ci/clang-tidy.sh b/.ci/clang-tidy.sh
index 913c79a..1c3d7b3 100644
--- a/.ci/clang-tidy.sh
+++ b/.ci/clang-tidy.sh
@@ -9,7 +9,7 @@ filelist="$(find . -not \( -path './*build*' -prune \) -type f ! -name "$(printf
 for file in $filelist; do
   if echo "$file" | grep -q -E ".*(\.cpp|\.h|\.hpp)$" ; then
     #Extra check missing dependencies due to clang-tidy doesn't toggle exit code.
-    clang_tidy_lib_check="$(clang-tidy -warnings-as-errors='*' -header-filter='.*,-cpptoml.hpp' -checks='*,-llvm-header-guard,-fuchsia-statically-constructed-objects,-fuchsia-default-arguments,-fuchsia-default-arguments-calls,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-bounds-constant-array-index,-bugprone-narrowing-conversions,-cppcoreguidelines-narrowing-conversions,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-hicpp-signed-bitwise,-bugprone-exception-escape,-cppcoreguidelines-pro-type-member-init,-cppcoreguidelines-pro-type-cstyle-cast,-hicpp-member-init' "$file" -- -I. -std=c++14 2>&1)"
+    clang_tidy_lib_check="$(clang-tidy -warnings-as-errors='*' -header-filter='.*,-cpptoml.hpp' "$file" -- -I. -std=c++14 2>&1)"
     for tidy_line in $clang_tidy_lib_check; do
       echo "$tidy_line" | grep -q -v -E "^Error while processing*"
       if [ $? -eq 1 ]; then
diff --git a/.clang-tidy b/.clang-tidy
new file mode 100644
index 0000000..b0965ca
--- /dev/null
+++ b/.clang-tidy
@@ -0,0 +1,2 @@
+Checks: '*,-llvm-header-guard,-fuchsia*,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-bounds-constant-array-index,-bugprone-narrowing-conversions,-cppcoreguidelines-narrowing-conversions,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-hicpp-signed-bitwise,-bugprone-exception-escape,-cppcoreguidelines-pro-type-member-init,-cppcoreguidelines-pro-type-cstyle-cast,-hicpp-member-init,-google-readability-namespace-comments,-llvm-namespace-comment,-cppcoreguidelines-pro-type-vararg,-hicpp-vararg,-modernize-use-trailing-return-type'
+WarningsAsErrors: 'true'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4636246..3aaca14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,17 +12,16 @@ project(Simple_Draw)
 set(CMAKE_CXX_STANDARD 14)
 
 # enable clang_tidy
-set(CMAKE_CXX_CLANG_TIDY "clang-tidy;-checks=*")
-set(CMAKE_CXX_CLANG_TIDY clang-tidy;-header-filter=.;-checks=*;)
+set(CMAKE_CXX_CLANG_TIDY clang-tidy;-header-filter=.;)
 
 file(GLOB_RECURSE SOURCES src/*.cpp)
-file(GLOB_RECURSE HEADERS src/*.h)
+file(GLOB_RECURSE HEADERS src/*.hpp)
 file(GLOB_RECURSE TESTS test/*.cpp)
 
 set(LIB_PATH "${CMAKE_SOURCE_DIR}/../library")
 
 include_directories(${LIB_PATH}/include)
-add_executable(SimpleDraw ${SOURCES} ${HEADERS} main/main.cpp src/DrawRender.cpp src/DrawRender.h)
+add_executable(SimpleDraw ${SOURCES} ${HEADERS} main/main.cpp)
 
 target_link_libraries(SimpleDraw ${LIB_PATH}/lib/liblibrary.a)