diff --git a/abaplint.json b/abaplint.json
index 3ac1f66fd..2ecd78f04 100644
--- a/abaplint.json
+++ b/abaplint.json
@@ -49,7 +49,7 @@
     "constructor_visibility_public": {
       "enabled": true,
       "exclude": []
-    },    
+    },
     "contains_tab": {
       "enabled": true,
       "exclude": []
@@ -63,23 +63,32 @@
       "exclude": []
     },
     "double_space": {
-      "enabled": true,
-      "exclude": []
+      "enabled": false,
+      "exclude": [],
+      "keywords": true,
+      "startParen": true,
+      "endParen": true
     },
     "empty_line_in_statement": {
       "enabled": true,
       "exclude": [],
       "allowChained": true
     },
-    "empty_loop": {
-      "enabled": true,
-      "exclude": [],
-      "length": 120
-    },
     "empty_statement": {
       "enabled": true,
       "exclude": []
     },
+    "empty_structure": {
+      "enabled": true,
+      "exclude": [],
+      "loop": true,
+      "if": false,
+      "while": true,
+      "case": true,
+      "select": true,
+      "do": true,
+      "at": true
+    },
     "exit_or_check": {
       "enabled": true,
       "exclude": []
@@ -105,6 +114,11 @@
       "enabled": true,
       "exclude": []
     },
+    "in_statement_indentation": {
+      "enabled": false,
+      "exclude": [],
+      "ignoreExceptions": true
+    },
     "indentation": {
       "enabled": true,
       "exclude": [],
@@ -258,6 +272,12 @@
       "enabled": true,
       "exclude": []
     },
+    "space_before_dot": {
+      "enabled": true,
+      "exclude": [],
+      "ignoreGlobalDefinition": true,
+      "ignoreExceptions": true
+    },
     "start_at_tab": {
       "enabled": true,
       "exclude": []
@@ -274,6 +294,10 @@
       "enabled": true,
       "exclude": []
     },
+    "use_new": {
+      "enabled": true,
+      "exclude": []
+    },
     "when_others_last": {
       "enabled": true,
       "exclude": []
diff --git a/src/http/zcl_abapgit_2fa_auth_base.clas.abap b/src/http/zcl_abapgit_2fa_auth_base.clas.abap
index 206d78817..75447ff60 100644
--- a/src/http/zcl_abapgit_2fa_auth_base.clas.abap
+++ b/src/http/zcl_abapgit_2fa_auth_base.clas.abap
@@ -92,7 +92,7 @@ CLASS ZCL_ABAPGIT_2FA_AUTH_BASE IMPLEMENTATION.
         url                = iv_url
         ssl_id             = zcl_abapgit_exit=>get_instance( )->get_ssl_id( )
         proxy_host         = lo_proxy->get_proxy_url( iv_url )
-        proxy_service      = lo_proxy->get_proxy_port( iv_url  )
+        proxy_service      = lo_proxy->get_proxy_port( iv_url )
       IMPORTING
         client             = ri_client
       EXCEPTIONS
diff --git a/src/objects/zcl_abapgit_object_sfpf.clas.abap b/src/objects/zcl_abapgit_object_sfpf.clas.abap
index de3445bbf..8be195c1c 100644
--- a/src/objects/zcl_abapgit_object_sfpf.clas.abap
+++ b/src/objects/zcl_abapgit_object_sfpf.clas.abap
@@ -82,7 +82,7 @@ CLASS ZCL_ABAPGIT_OBJECT_SFPF IMPLEMENTATION.
 *   Renumber id='o...' attributes
     li_iterator = ii_document->create_iterator_filtered(
       ii_document->create_filter_and(
-        filter1 = ii_document->create_filter_node_type( if_ixml_node=>co_node_element  )
+        filter1 = ii_document->create_filter_node_type( if_ixml_node=>co_node_element )
         filter2 = ii_document->create_filter_attribute( 'id' ) ) ).
     li_elem ?= li_iterator->get_next( ).
     WHILE li_elem IS NOT INITIAL.
diff --git a/src/ui/core/zcl_abapgit_gui_asset_manager.clas.testclasses.abap b/src/ui/core/zcl_abapgit_gui_asset_manager.clas.testclasses.abap
index 674850fd5..406c16d8f 100644
--- a/src/ui/core/zcl_abapgit_gui_asset_manager.clas.testclasses.abap
+++ b/src/ui/core/zcl_abapgit_gui_asset_manager.clas.testclasses.abap
@@ -56,7 +56,7 @@ CLASS ltcl_abapgit_gui_asset_manager IMPLEMENTATION.
         iv_assert_subtype = 'css' )
       exp = 'ABC' ).
 
-    TRY .
+    TRY.
         lo_assetman->zif_abapgit_gui_asset_manager~get_text_asset(
           iv_url = 'css/common.css'
           iv_assert_subtype = 'xyz' ).
@@ -70,7 +70,7 @@ CLASS ltcl_abapgit_gui_asset_manager IMPLEMENTATION.
       iv_type      = 'nottext/bin'
       iv_inline    = 'XYZ' ).
 
-    TRY .
+    TRY.
         lo_assetman->zif_abapgit_gui_asset_manager~get_text_asset( 'css/common.xyz' ).
         cl_abap_unit_assert=>fail( ).
       CATCH zcx_abapgit_exception.
diff --git a/src/ui/core/zcl_abapgit_gui_html_processor.clas.testclasses.abap b/src/ui/core/zcl_abapgit_gui_html_processor.clas.testclasses.abap
index 4044429c6..3c1653fe9 100644
--- a/src/ui/core/zcl_abapgit_gui_html_processor.clas.testclasses.abap
+++ b/src/ui/core/zcl_abapgit_gui_html_processor.clas.testclasses.abap
@@ -160,7 +160,7 @@ CLASS ltcl_html_processor_test IMPLEMENTATION.
 
   METHOD process_fails.
 
-    TRY .
+    TRY.
         " BTW this is valid HTML, maybe refactor the code ...
         mo_cut->zif_abapgit_gui_html_processor~process(
           iv_html = '<html><body></body></html>'
diff --git a/src/ui/zcl_abapgit_services_repo.clas.abap b/src/ui/zcl_abapgit_services_repo.clas.abap
index be1f5621c..7767b0014 100644
--- a/src/ui/zcl_abapgit_services_repo.clas.abap
+++ b/src/ui/zcl_abapgit_services_repo.clas.abap
@@ -322,7 +322,7 @@ CLASS ZCL_ABAPGIT_SERVICES_REPO IMPLEMENTATION.
     ls_checks = lo_repo->delete_checks( ).
     IF ls_checks-transport-required = abap_true.
       ls_checks-transport-transport = zcl_abapgit_ui_factory=>get_popups(
-                                        )->popup_transport_request(  ls_checks-transport-type ).
+                                        )->popup_transport_request( ls_checks-transport-type ).
     ENDIF.
 
     zcl_abapgit_repo_srv=>get_instance( )->purge( io_repo   = lo_repo
diff --git a/src/zcl_abapgit_transport_mass.clas.abap b/src/zcl_abapgit_transport_mass.clas.abap
index c88735047..458bf6864 100644
--- a/src/zcl_abapgit_transport_mass.clas.abap
+++ b/src/zcl_abapgit_transport_mass.clas.abap
@@ -50,7 +50,7 @@ CLASS ZCL_ABAPGIT_TRANSPORT_MASS IMPLEMENTATION.
             iv_logic  = zcl_abapgit_ui_factory=>get_popups( )->popup_folder_logic( ) ).
 
 * Open output folder if user asked it
-          lcl_gui=>open_folder_frontend( lo_transport_zipper->gv_full_folder  ).
+          lcl_gui=>open_folder_frontend( lo_transport_zipper->gv_full_folder ).
 
         ELSE.
 * No data found for the provided selection criterias