diff --git a/.cmake-format b/.cmake-format
index 56f4306..e9fdda7 100644
--- a/.cmake-format
+++ b/.cmake-format
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # ----------------------------------
 # Options affecting listfile parsing
 # ----------------------------------
@@ -5,15 +7,21 @@ with section("parse"):
 
   # Specify structure for custom cmake functions
   additional_commands = {
+    'add_doxygen': { 'flags' : [],
+                            'kwargs': { 'LATEX': 1,
+                                        'HTML': 1,
+                                        'COMMENT': 1}},
+    'add_breathe': { 'flags' : [],
+                            'kwargs': { 'COMMENT': 1}},
     'add_common_library': { 'flags' : [],
-                            'kwargs': { 'OUTPUT_NAME': '*',
+                            'kwargs': { 'OUTPUT_NAME': 1,
                                         'SOURCES': '*',
-                                        'TARGET': '1'}},
+                                        'TARGET': 1}},
     'qt5_translation': { 'flags' : [],
-                         'kwargs': { 'TS_DIR': '1',
+                         'kwargs': { 'OUTPUT_DIR': 1,
                                      'LANGUAGES': '*',
                                      'SOURCES': '*',
-                                     'TARGET': '1'}},
+                                     'BASE_NAME': 1}},
     'pvs_studio_add_target': { 'flags' : [ 'COMPILE_COMMANDS',
                                            'OUTPUT',
                                            'HIDE_HELP'],
@@ -22,7 +30,7 @@ with section("parse"):
                                            'DEPENDS': '*',
                                            'FORMAT': '*',
                                            'MODE': '*',
-                                           'TARGET': '*'}},
+                                           'TARGET': 1}},
     'write_compiler_detection_header': { 'flags' : [],
                                          'kwargs': { 'COMPILERS': '*',
                                                      'FEATURES': '*',
@@ -48,11 +56,11 @@ with section("format"):
 
   # If an argument group contains more than this many sub-groups (parg or kwarg
   # groups) then force it to a vertical layout.
-  max_subgroups_hwrap = 2
+  max_subgroups_hwrap = 3
 
   # If a positional argument group contains more than this many arguments, then
   # force it to a vertical layout.
-  max_pargs_hwrap = 6
+  max_pargs_hwrap = 5
 
   # If a cmdline positional group consumes more than this many lines without
   # nesting, then invalidate the layout (and nest)