diff --git a/Squidex.ruleset b/Squidex.ruleset
index ef2fa90ac..fa277a017 100644
--- a/Squidex.ruleset
+++ b/Squidex.ruleset
@@ -59,5 +59,6 @@
+
\ No newline at end of file
diff --git a/src/Squidex.Domain.Apps.Core/ContentExtensions.cs b/src/Squidex.Domain.Apps.Core/ContentExtensions.cs
index 4998b7df2..ec73577ee 100644
--- a/src/Squidex.Domain.Apps.Core/ContentExtensions.cs
+++ b/src/Squidex.Domain.Apps.Core/ContentExtensions.cs
@@ -12,8 +12,6 @@ using Squidex.Domain.Apps.Core.Contents;
using Squidex.Domain.Apps.Core.Schemas;
using Squidex.Infrastructure;
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Core
{
public static class ContentExtensions
diff --git a/src/Squidex.Domain.Apps.Core/Contents/ContentData.cs b/src/Squidex.Domain.Apps.Core/Contents/ContentData.cs
index 1c5a6ea99..fff197e67 100644
--- a/src/Squidex.Domain.Apps.Core/Contents/ContentData.cs
+++ b/src/Squidex.Domain.Apps.Core/Contents/ContentData.cs
@@ -13,8 +13,6 @@ using Squidex.Domain.Apps.Core.Schemas;
using Squidex.Infrastructure;
using Squidex.Infrastructure.Json;
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Core.Contents
{
public abstract class ContentData : Dictionary, IEquatable>
diff --git a/src/Squidex.Domain.Apps.Core/Contents/IdContentData.cs b/src/Squidex.Domain.Apps.Core/Contents/IdContentData.cs
index a07a113ba..495621ef4 100644
--- a/src/Squidex.Domain.Apps.Core/Contents/IdContentData.cs
+++ b/src/Squidex.Domain.Apps.Core/Contents/IdContentData.cs
@@ -15,8 +15,6 @@ using Squidex.Domain.Apps.Core.Schemas;
using Squidex.Infrastructure;
using Squidex.Infrastructure.Json;
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Core.Contents
{
public sealed class IdContentData : ContentData, IEquatable
diff --git a/src/Squidex.Domain.Apps.Core/Contents/NamedContentData.cs b/src/Squidex.Domain.Apps.Core/Contents/NamedContentData.cs
index f9920fc72..d8151384f 100644
--- a/src/Squidex.Domain.Apps.Core/Contents/NamedContentData.cs
+++ b/src/Squidex.Domain.Apps.Core/Contents/NamedContentData.cs
@@ -15,9 +15,6 @@ using Squidex.Domain.Apps.Core.Schemas;
using Squidex.Infrastructure;
using Squidex.Infrastructure.Json;
-// ReSharper disable SuspiciousTypeConversion.Global
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Core.Contents
{
public sealed class NamedContentData : ContentData, IEquatable
diff --git a/src/Squidex.Domain.Apps.Core/LanguagesConfig.cs b/src/Squidex.Domain.Apps.Core/LanguagesConfig.cs
index c91c5ee61..dc538c371 100644
--- a/src/Squidex.Domain.Apps.Core/LanguagesConfig.cs
+++ b/src/Squidex.Domain.Apps.Core/LanguagesConfig.cs
@@ -13,8 +13,6 @@ using System.Collections.Immutable;
using System.Linq;
using Squidex.Infrastructure;
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Core
{
public sealed class LanguagesConfig : IFieldPartitioning
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/DateTimeField.cs b/src/Squidex.Domain.Apps.Core/Schemas/DateTimeField.cs
index eba2c5c6b..44967083e 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/DateTimeField.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/DateTimeField.cs
@@ -16,10 +16,6 @@ using NodaTime.Text;
using Squidex.Domain.Apps.Core.Schemas.Validators;
using Squidex.Infrastructure;
-// ReSharper disable InvertIf
-// ReSharper disable ConvertIfStatementToConditionalTernaryExpression
-// ReSharper disable ConvertIfStatementToSwitchStatement
-
namespace Squidex.Domain.Apps.Core.Schemas
{
public sealed class DateTimeField : Field
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/DateTimeFieldProperties.cs b/src/Squidex.Domain.Apps.Core/Schemas/DateTimeFieldProperties.cs
index aac249de5..97fc37d2d 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/DateTimeFieldProperties.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/DateTimeFieldProperties.cs
@@ -12,10 +12,6 @@ using Newtonsoft.Json.Linq;
using NodaTime;
using Squidex.Infrastructure;
-// ReSharper disable ConvertIfStatementToSwitchStatement
-// ReSharper disable RedundantIfElseBlock
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Core.Schemas
{
[TypeName("DateTime")]
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/Field.cs b/src/Squidex.Domain.Apps.Core/Schemas/Field.cs
index b4fbee356..27842bf89 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/Field.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/Field.cs
@@ -14,10 +14,6 @@ using NJsonSchema;
using Squidex.Domain.Apps.Core.Schemas.Validators;
using Squidex.Infrastructure;
-// ReSharper disable InvertIf
-// ReSharper disable ConvertIfStatementToReturnStatement
-// ReSharper disable ConvertIfStatementToConditionalTernaryExpression
-
namespace Squidex.Domain.Apps.Core.Schemas
{
public abstract class Field : CloneableBase
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/Json/SchemaJsonSerializer.cs b/src/Squidex.Domain.Apps.Core/Schemas/Json/SchemaJsonSerializer.cs
index 1961a70da..ab8931731 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/Json/SchemaJsonSerializer.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/Json/SchemaJsonSerializer.cs
@@ -12,8 +12,6 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Squidex.Infrastructure;
-// ReSharper disable UseObjectOrCollectionInitializer
-
namespace Squidex.Domain.Apps.Core.Schemas.Json
{
public sealed class SchemaJsonSerializer
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/Schema.cs b/src/Squidex.Domain.Apps.Core/Schemas/Schema.cs
index 296457f17..39d81a069 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/Schema.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/Schema.cs
@@ -14,9 +14,6 @@ using Microsoft.OData.Edm;
using NJsonSchema;
using Squidex.Infrastructure;
-// ReSharper disable ConvertIfStatementToConditionalTernaryExpression
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Core.Schemas
{
public sealed class Schema : CloneableBase
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/StringFieldProperties.cs b/src/Squidex.Domain.Apps.Core/Schemas/StringFieldProperties.cs
index e0b5d8715..5750a8480 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/StringFieldProperties.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/StringFieldProperties.cs
@@ -11,8 +11,6 @@ using System.Collections.Immutable;
using Newtonsoft.Json.Linq;
using Squidex.Infrastructure;
-// ReSharper disable ObjectCreationAsStatement
-
namespace Squidex.Domain.Apps.Core.Schemas
{
[TypeName("StringField")]
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/Validators/PatternValidator.cs b/src/Squidex.Domain.Apps.Core/Schemas/Validators/PatternValidator.cs
index 2c322bae2..45db08d13 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/Validators/PatternValidator.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/Validators/PatternValidator.cs
@@ -11,9 +11,6 @@ using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Squidex.Infrastructure.Tasks;
-// ReSharper disable ConvertIfStatementToConditionalTernaryExpression
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Core.Schemas.Validators
{
public class PatternValidator : IValidator
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/Validators/StringLengthValidator.cs b/src/Squidex.Domain.Apps.Core/Schemas/Validators/StringLengthValidator.cs
index 4751ad085..5c0707a66 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/Validators/StringLengthValidator.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/Validators/StringLengthValidator.cs
@@ -10,8 +10,6 @@ using System;
using System.Threading.Tasks;
using Squidex.Infrastructure.Tasks;
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Core.Schemas.Validators
{
public class StringLengthValidator : IValidator
diff --git a/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentDataObject.cs b/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentDataObject.cs
index d7698ec74..fe721deda 100644
--- a/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentDataObject.cs
+++ b/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentDataObject.cs
@@ -14,8 +14,6 @@ using Jint.Runtime.Descriptors;
using Squidex.Domain.Apps.Core.Contents;
using Squidex.Infrastructure;
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Core.Scripting.ContentWrapper
{
public sealed class ContentDataObject : ObjectInstance
diff --git a/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentDataProperty.cs b/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentDataProperty.cs
index fe28ec462..6542d772b 100644
--- a/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentDataProperty.cs
+++ b/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentDataProperty.cs
@@ -11,8 +11,6 @@ using Jint.Runtime;
using Jint.Runtime.Descriptors;
using Squidex.Domain.Apps.Core.Contents;
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Core.Scripting.ContentWrapper
{
public sealed class ContentDataProperty : PropertyDescriptor
diff --git a/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentFieldObject.cs b/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentFieldObject.cs
index 977e5d362..56ea485f1 100644
--- a/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentFieldObject.cs
+++ b/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentFieldObject.cs
@@ -12,8 +12,6 @@ using Jint.Runtime.Descriptors;
using Squidex.Domain.Apps.Core.Contents;
using Squidex.Infrastructure;
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Core.Scripting.ContentWrapper
{
public sealed class ContentFieldObject : ObjectInstance
diff --git a/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentFieldProperty.cs b/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentFieldProperty.cs
index 5a2187c67..01e50da58 100644
--- a/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentFieldProperty.cs
+++ b/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/ContentFieldProperty.cs
@@ -10,8 +10,6 @@ using Jint.Native;
using Jint.Runtime.Descriptors;
using Newtonsoft.Json.Linq;
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Core.Scripting.ContentWrapper
{
public sealed class ContentFieldProperty : PropertyDescriptor
diff --git a/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/JsonMapper.cs b/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/JsonMapper.cs
index 8c021ab01..ea4e40f50 100644
--- a/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/JsonMapper.cs
+++ b/src/Squidex.Domain.Apps.Core/Scripting/ContentWrapper/JsonMapper.cs
@@ -12,9 +12,6 @@ using Jint.Native;
using Jint.Native.Object;
using Newtonsoft.Json.Linq;
-// ReSharper disable SwitchStatementMissingSomeCases
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Core.Scripting.ContentWrapper
{
public static class JsonMapper
diff --git a/src/Squidex.Domain.Apps.Core/Scripting/JintScriptEngine.cs b/src/Squidex.Domain.Apps.Core/Scripting/JintScriptEngine.cs
index 302548d99..e9377a600 100644
--- a/src/Squidex.Domain.Apps.Core/Scripting/JintScriptEngine.cs
+++ b/src/Squidex.Domain.Apps.Core/Scripting/JintScriptEngine.cs
@@ -15,8 +15,6 @@ using Squidex.Domain.Apps.Core.Contents;
using Squidex.Domain.Apps.Core.Scripting.ContentWrapper;
using Squidex.Infrastructure;
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Core.Scripting
{
public sealed class JintScriptEngine : IScriptEngine
diff --git a/src/Squidex.Domain.Apps.Events/Schemas/Utils/SchemaEventDispatcher.cs b/src/Squidex.Domain.Apps.Events/Schemas/Utils/SchemaEventDispatcher.cs
index 8b93d0a9d..528e3b17a 100644
--- a/src/Squidex.Domain.Apps.Events/Schemas/Utils/SchemaEventDispatcher.cs
+++ b/src/Squidex.Domain.Apps.Events/Schemas/Utils/SchemaEventDispatcher.cs
@@ -10,9 +10,6 @@ using System;
using Squidex.Domain.Apps.Core;
using Squidex.Domain.Apps.Core.Schemas;
-// ReSharper disable InvertIf
-// ReSharper disable UnusedParameter.Global
-
namespace Squidex.Domain.Apps.Events.Schemas.Utils
{
public static class SchemaEventDispatcher
diff --git a/src/Squidex.Domain.Apps.Read.MongoDb/Apps/MongoAppEntity.cs b/src/Squidex.Domain.Apps.Read.MongoDb/Apps/MongoAppEntity.cs
index c75ccd314..35148eb7c 100644
--- a/src/Squidex.Domain.Apps.Read.MongoDb/Apps/MongoAppEntity.cs
+++ b/src/Squidex.Domain.Apps.Read.MongoDb/Apps/MongoAppEntity.cs
@@ -15,9 +15,6 @@ using Squidex.Domain.Apps.Read.Apps;
using Squidex.Infrastructure;
using Squidex.Infrastructure.MongoDb;
-// ReSharper disable InvertIf
-// ReSharper disable AutoPropertyCanBeMadeGetOnly.Global
-
namespace Squidex.Domain.Apps.Read.MongoDb.Apps
{
public sealed class MongoAppEntity : MongoEntity, IAppEntity
diff --git a/src/Squidex.Domain.Apps.Read.MongoDb/Assets/MongoAssetRepository.cs b/src/Squidex.Domain.Apps.Read.MongoDb/Assets/MongoAssetRepository.cs
index 4d92b0fff..808f4137c 100644
--- a/src/Squidex.Domain.Apps.Read.MongoDb/Assets/MongoAssetRepository.cs
+++ b/src/Squidex.Domain.Apps.Read.MongoDb/Assets/MongoAssetRepository.cs
@@ -17,8 +17,6 @@ using Squidex.Domain.Apps.Read.Assets.Repositories;
using Squidex.Infrastructure.CQRS.Events;
using Squidex.Infrastructure.MongoDb;
-// ReSharper disable ClassNeverInstantiated.Local
-
namespace Squidex.Domain.Apps.Read.MongoDb.Assets
{
public partial class MongoAssetRepository : MongoRepositoryBase, IAssetRepository, IEventConsumer
diff --git a/src/Squidex.Domain.Apps.Read.MongoDb/Contents/MongoContentEntity.cs b/src/Squidex.Domain.Apps.Read.MongoDb/Contents/MongoContentEntity.cs
index f1d037970..97112ef82 100644
--- a/src/Squidex.Domain.Apps.Read.MongoDb/Contents/MongoContentEntity.cs
+++ b/src/Squidex.Domain.Apps.Read.MongoDb/Contents/MongoContentEntity.cs
@@ -22,11 +22,6 @@ using Squidex.Infrastructure;
using Squidex.Infrastructure.MongoDb;
using JsonConvert = Newtonsoft.Json.JsonConvert;
-// ReSharper disable CollectionNeverUpdated.Global
-// ReSharper disable AutoPropertyCanBeMadeGetOnly.Global
-// ReSharper disable ConvertIfStatementToConditionalTernaryExpression
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Read.MongoDb.Contents
{
public sealed class MongoContentEntity : IContentEntity, IMongoEntity
diff --git a/src/Squidex.Domain.Apps.Read.MongoDb/Contents/MongoContentRepository_EventHandling.cs b/src/Squidex.Domain.Apps.Read.MongoDb/Contents/MongoContentRepository_EventHandling.cs
index 91353f523..2c3ef026e 100644
--- a/src/Squidex.Domain.Apps.Read.MongoDb/Contents/MongoContentRepository_EventHandling.cs
+++ b/src/Squidex.Domain.Apps.Read.MongoDb/Contents/MongoContentRepository_EventHandling.cs
@@ -17,9 +17,6 @@ using Squidex.Infrastructure.CQRS.Events;
using Squidex.Infrastructure.Dispatching;
using Squidex.Infrastructure.Reflection;
-// ReSharper disable UnusedParameterGlobal
-// ReSharper disable ConvertToLambdaExpression
-
namespace Squidex.Domain.Apps.Read.MongoDb.Contents
{
public partial class MongoContentRepository
diff --git a/src/Squidex.Domain.Apps.Read.MongoDb/Contents/Visitors/ConstantVisitor.cs b/src/Squidex.Domain.Apps.Read.MongoDb/Contents/Visitors/ConstantVisitor.cs
index a9b31d806..9a21a44c4 100644
--- a/src/Squidex.Domain.Apps.Read.MongoDb/Contents/Visitors/ConstantVisitor.cs
+++ b/src/Squidex.Domain.Apps.Read.MongoDb/Contents/Visitors/ConstantVisitor.cs
@@ -12,9 +12,6 @@ using Microsoft.OData.UriParser;
using NodaTime;
using NodaTime.Text;
-// ReSharper disable ConvertIfStatementToReturnStatement
-// ReSharper disable InvertIf
-
namespace Squidex.Domain.Apps.Read.MongoDb.Contents.Visitors
{
public sealed class ConstantVisitor : QueryNodeVisitor