diff --git a/.clang-format b/.clang-format
index a71a8fc95..6e912db3c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -10,7 +10,6 @@ AlignOperands: 'true'
 AlignTrailingComments: 'true'
 AllowAllArgumentsOnNextLine: 'true'
 AllowAllConstructorInitializersOnNextLine: 'true'
-AllowShortBlocksOnASingleLine: 'true'
 AllowShortCaseLabelsOnASingleLine: 'true'
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLambdasOnASingleLine: All
@@ -56,7 +55,8 @@ TabWidth: '4'
 UseTab: Never
 
 # control function declaration/definition
-AllowShortFunctionsOnASingleLine: InlineOnly
+AllowShortFunctionsOnASingleLine: None
+AllowShortBlocksOnASingleLine: Never
 AllowAllParametersOfDeclarationOnNextLine: true
 BinPackParameters: OnePerLine
 
diff --git a/src/scaler/version.txt b/src/scaler/version.txt
index ad2191947..d905a6d1d 100644
--- a/src/scaler/version.txt
+++ b/src/scaler/version.txt
@@ -1 +1 @@
-1.25.0
+1.25.1