diff --git a/.clang-format b/.clang-format
index 63f12b6c4..fcfff2c4d 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,10 +3,10 @@ IndentWidth: 4
 UseTab: Always
 TabWidth: 4
 BreakBeforeBraces: Custom
-Standard: Cpp11
+Standard: c++17
 BraceWrapping:
   AfterClass: true
-  AfterControlStatement: false
+  AfterControlStatement: Never
   AfterEnum: true
   AfterFunction: true
   AfterNamespace: true
@@ -20,7 +20,7 @@ IndentCaseLabels: false
 AccessModifierOffset: -4
 ColumnLimit: 90
 AllowShortFunctionsOnASingleLine: InlineOnly
-SortIncludes: false
+SortIncludes: Never
 IncludeCategories:
   - Regex:           '^".*'
     Priority:        2