diff --git a/.clang-format b/.clang-format
index 75297fc..ede5642 100644
--- a/.clang-format
+++ b/.clang-format
@@ -4,23 +4,31 @@ IndentWidth: 4
 UseTab: Never
 ---
 Language: Cpp
-BasedOnStyle: WebKit
-# XXX ColumnLimit: 123
-AccessModifierOffset: -4
-AllowShortIfStatementsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Inline
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-DerivePointerAlignment: false
-IndentWidth: 4
-InsertBraces: true
-InsertNewlineAtEOF: true
-NamespaceIndentation: None
-PointerAlignment: Right
-SpacesBeforeTrailingComments: 1
-UseTab: Never
-#
-AlignTrailingComments:
-  # XXX Kind: Never
-  Kind: Always
-  OverEmptyLines: 1
+BasedOnStyle: Llvm
+
+# ColumnLimit: 80
+# AccessModifierOffset: -2
+# AllowShortIfStatementsOnASingleLine: false
+# AllowShortFunctionsOnASingleLine: Inline
+# ConstructorInitializerIndentWidth: 4
+# ContinuationIndentWidth: 4
+# DerivePointerAlignment: false
+# #
+# # TODO: TBD 4 instead of 2? CK
+# # XXX IndentWidth: 4
+# InsertBraces: true
+# InsertNewlineAtEOF: true
+# NamespaceIndentation: None
+# PointerAlignment: Right
+# SpacesBeforeTrailingComments: 1
+# UseTab: Never
+
+# TODO: TBD Keep original style? CK
+# AlignTrailingComments:
+#   Kind: Always
+#   OverEmptyLines: 0
+
+# TODO: TBD Keep original style? CK
+# BreakBeforeBraces: Custom
+# BraceWrapping:
+#   AfterNamespace: true
diff --git a/chapter05/CMakeLists.txt b/chapter05/CMakeLists.txt
index 1a79f2c..f2ab7c7 100644
--- a/chapter05/CMakeLists.txt
+++ b/chapter05/CMakeLists.txt
@@ -15,14 +15,15 @@ project(
 add_subdirectory(find_package_example)
 add_subdirectory(find_module)
 add_subdirectory(fetch_content_example)
-# FIXME: add_subdirectory(external_project)
+add_subdirectory(external_project)
 
 # Look for the conan command on the host system, if conan is not found exclude
 # all conan related examples from the project
 find_program(CONAN_EXECUTABLE conan)
 
 if(CONAN_EXECUTABLE)
-    # add_subdirectory(conan_example) add_subdirectory(conan_conanfile_example)
+    # add_subdirectory(conan_example)
+    # add_subdirectory(conan_conanfile_example)
 else()
     message(STATUS "Conan not found. Will not build conan examples")
 endif()
diff --git a/chapter05/external_project/CMakeLists.txt b/chapter05/external_project/CMakeLists.txt
index a60d006..535803d 100644
--- a/chapter05/external_project/CMakeLists.txt
+++ b/chapter05/external_project/CMakeLists.txt
@@ -35,7 +35,7 @@ externalproject_add_step(
     COMMAND
         ${CMAKE_COMMAND} -E tar "cvzf"
         ${CMAKE_CURRENT_BINARY_DIR}/licenses.tar.gz <SOURCE_DIR>/LICENSE
-        DEPENDENCIES build
+    DEPENDEES build
     ALWAYS YES
 )