diff --git a/.clang-format b/.clang-format
index be651e7..d92a3f1 100644
--- a/.clang-format
+++ b/.clang-format
@@ -6,12 +6,14 @@
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: Right
-AlignOperands:   true
-AlignTrailingComments: true
+AlignOperands:  Align
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 1
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: Empty
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: None
+AllowShortFunctionsOnASingleLine: Empty
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterReturnType: None
@@ -36,6 +38,7 @@
   SplitEmptyFunction:   false
   SplitEmptyRecord:     false
   SplitEmptyNamespace:  false
+BreakAfterAttributes: Never
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
@@ -49,6 +52,7 @@
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
+DeriveLineEnding: false
 DerivePointerAlignment: false
 PointerAlignment: Left
 DisableFormat:   false
@@ -74,24 +78,33 @@
   - Regex:           '.*'
     Priority:        6
 IndentCaseLabels: true
+IndentRequiresClause: true
 IndentWidth:     4
 IndentWrappedFunctionNames: true
-KeepEmptyLinesAtTheStartOfBlocks: true
+InsertNewlineAtEOF: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: OuterScope
+LineEnding: LF
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
-LambdaBodyIndentation: OuterScope
 ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 25
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyIndentedWhitespace: 0
+QualifierAlignment: Left
+ReferenceAlignment: Left
 ReflowComments:  true
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: Keyword
 SortIncludes:    true
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
diff --git a/sysfs.hpp b/sysfs.hpp
index 5ce1af1..57c6769 100644
--- a/sysfs.hpp
+++ b/sysfs.hpp
@@ -24,8 +24,7 @@
 class SysfsLed
 {
   public:
-    explicit SysfsLed(std::filesystem::path&& root) : root(std::move(root))
-    {}
+    explicit SysfsLed(std::filesystem::path&& root) : root(std::move(root)) {}
     SysfsLed() = delete;
     SysfsLed(const SysfsLed& other) = delete;
     SysfsLed(const SysfsLed&& other) = delete;
diff --git a/test/physical.cpp b/test/physical.cpp
index f9191a3..24c2a70 100644
--- a/test/physical.cpp
+++ b/test/physical.cpp
@@ -45,8 +45,7 @@
 {
   public:
     /* Use a no-args ctor here to avoid headaches with {Nice,Strict}Mock */
-    MockLed() : SysfsLed(createSandbox())
-    {}
+    MockLed() : SysfsLed(createSandbox()) {}
     MockLed(MockLed& other) = delete;
     MockLed(MockLed&& other) = delete;
     MockLed& operator=(MockLed& other) = delete;