diff --git a/.editorconfig b/.editorconfig
index 590d1dea08..b7b608644a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,6 +15,10 @@ trim_trailing_whitespace = false
 
 [*.ts]
 quote_type = single
+ij_typescript_enforce_trailing_comma = whenmultiline
+
+[*.js]
+ij_javascript_enforce_trailing_comma = whenmultiline
 
 [*.json5]
 ij_json_keep_blank_lines_in_code = 3
diff --git a/.eslintrc.json b/.eslintrc.json
index 4d1f73b22a..9d0961d293 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -263,13 +263,39 @@
         "rxjs/no-nested-subscribe": "off",     // todo: go over _all_ cases
 
         // Custom DSpace Angular rules
-        "dspace-angular-ts/alias-imports": "error",
+        "dspace-angular-ts/alias-imports": [
+          "error",
+          {
+            "aliases": [
+              {
+                "package": "rxjs",
+                "imported": "of",
+                "local": "observableOf"
+              }
+            ]
+          }
+        ],
         "dspace-angular-ts/themed-component-classes": "error",
         "dspace-angular-ts/themed-component-selectors": "error",
         "dspace-angular-ts/themed-component-usages": "error",
-        "dspace-angular-ts/themed-decorators": "error",
+        "dspace-angular-ts/themed-decorators": [
+          "error",
+          {
+            "decorators": {
+              "listableObjectComponent": 3,
+              "rendersSectionForMenu": 2
+            }
+          }
+        ],
         "dspace-angular-ts/themed-wrapper-no-input-defaults": "error",
-        "dspace-angular-ts/unique-decorators": "error"
+        "dspace-angular-ts/unique-decorators": [
+          "error",
+          {
+            "decorators": [
+              "listableObjectComponent"
+            ]
+          }
+        ]
       }
     },
     {