diff --git a/.clang-format b/.clang-format
index d43e884..28e3328 100644
--- a/.clang-format
+++ b/.clang-format
@@ -87,7 +87,7 @@
 IndentWrappedFunctionNames: true
 InsertNewlineAtEOF: true
 KeepEmptyLinesAtTheStartOfBlocks: false
-LambdaBodyIndentation: OuterScope
+LambdaBodyIndentation: Signature
 LineEnding: LF
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
@@ -98,13 +98,14 @@
 ObjCSpaceBeforeProtocolList: true
 PackConstructorInitializers: BinPack
 PenaltyBreakAssignment: 25
-PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakBeforeFirstCallParameter: 50
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
-PenaltyIndentedWhitespace: 0
+PenaltyIndentedWhitespace: 1
 PointerAlignment: Left
 QualifierAlignment: Left
 ReferenceAlignment: Left
diff --git a/interfaces/internal_interface.cpp b/interfaces/internal_interface.cpp
index f178489..0cee70a 100644
--- a/interfaces/internal_interface.cpp
+++ b/interfaces/internal_interface.cpp
@@ -52,11 +52,11 @@
         words.emplace_back(ledDescr.color.value());
     }
 
-    std::string s = std::accumulate(std::next(words.begin()), words.end(),
-                                    words[0],
-                                    [](std::string a, const std::string& b) {
-        return std::move(a) + "_" + b;
-    });
+    std::string s =
+        std::accumulate(std::next(words.begin()), words.end(), words[0],
+                        [](std::string a, const std::string& b) {
+                            return std::move(a) + "_" + b;
+                        });
 
     // we assume the string to be a correct dbus name besides
     // this detail