From b8b4b4707caae9c4b337ff51ee91a00803f29a60 Mon Sep 17 00:00:00 2001
From: palexdev <alessandro.parisi406@gmail.com>
Date: Thu, 24 Aug 2023 11:51:20 +0200
Subject: [PATCH] :bookmark: Update and release components and core modules

:arrow_up: Upgrade Gradle to v8.2.1

Components Module
:boom: Checkboxes have been reworked
:white_check_mark: Added tests for the reworked Checkboxes

Core Module
:recycle: SelectionProperty: reviewed invalidation logic. The core part has been moved to the invalidated() method, this allows bindings to work, as well as simplifying the process
:recycle: SelectionGroup: reviewed for the above changes
:bug: SelectionGroup: fixed MultipleSelectionHandler logic

Signed-off-by: palexdev <alessandro.parisi406@gmail.com>
---
 .idea/inspectionProfiles/Project_Default.xml  |  66 +-
 .idea/misc.xml                                |   2 +-
 .idea/vcs.xml                                 |   6 +
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 modules/components/CHANGELOG.md               |  12 +-
 ...Behavior.java => MFXCheckboxBehavior.java} |  63 +-
 .../behaviors/MFXSelectableBehaviorBase.java  |   6 +-
 .../controls/base/MFXSelectable.java          |  25 +-
 .../controls/buttons/MFXIconButton.java       |   9 +-
 .../controls/checkbox/MFXCheckBox.java        | 179 -----
 .../controls/checkbox/MFXCheckbox.java        | 288 +++++++
 ...CheckBoxSkin.java => MFXCheckboxSkin.java} |  26 +-
 .../src/test/java/app/ComponentsLauncher.java |   2 +-
 .../components/src/test/java/app/Sandbox.java |  41 +-
 .../src/test/java/app/Showcase.java           |  44 +-
 .../test/java/interactive/TestCheckboxes.java | 301 +++++++
 modules/core/CHANGELOG.md                     |  14 +-
 .../mfxcore/selection/SelectionGroup.java     |  74 +-
 .../mfxcore/selection/SelectionProperty.java  |  40 +-
 .../java/interactive/TestSelectionGroup.java  |  17 +
 modules/resources/CHANGELOG.md                |   2 +-
 .../components/checkbox/_checkbox.scss        |   2 +-
 .../themes/material/md-indigo-dark.css        |   2 +-
 .../themes/material/md-indigo-light.css       | 736 +++++++++---------
 .../themes/material/md-purple-dark.css        |   2 +-
 .../themes/material/md-purple-light.css       |   2 +-
 26 files changed, 1266 insertions(+), 697 deletions(-)
 rename modules/components/src/main/java/io/github/palexdev/mfxcomponents/behaviors/{MFXCheckBoxBehavior.java => MFXCheckboxBehavior.java} (73%)
 delete mode 100644 modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/checkbox/MFXCheckBox.java
 create mode 100644 modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/checkbox/MFXCheckbox.java
 rename modules/components/src/main/java/io/github/palexdev/mfxcomponents/skins/{MFXCheckBoxSkin.java => MFXCheckboxSkin.java} (91%)
 create mode 100644 modules/components/src/test/java/interactive/TestCheckboxes.java

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index de9b76bc..8bbe75e0 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -21,6 +21,7 @@
     <inspection_tool class="AccessToStaticFieldLockedOnInstance" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AccessibilityTestFramework" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ActionIsNotPreviewFriendly" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ActionPresentationInitializedInCtor" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AddConversionCallMigration" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AddOperatorModifier" enabled="true" level="INFORMATION" enabled_by_default="true" />
     <inspection_tool class="AddVarianceModifier" enabled="true" level="INFORMATION" enabled_by_default="true" />
@@ -58,7 +59,9 @@
     <inspection_tool class="AndroidLintBadHostnameVerifier" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintBatteryLife" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintBidiSpoofing" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="AndroidLintBinderGetCallingInMainThread" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="AndroidLintBlockedPrivateApi" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="AndroidLintBomWithoutPlatform" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintBottomAppBar" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="AndroidLintBrokenIterator" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintButtonCase" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -67,6 +70,8 @@
     <inspection_tool class="AndroidLintByteOrderMark" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="AndroidLintCanvasSize" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintCheckResult" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AndroidLintChromeOsAbiSupport" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AndroidLintChromeOsOnConfigurationChanged" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintClickableViewAccessibility" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintCoarseFineLocation" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="AndroidLintCommitPrefEdits" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -102,10 +107,12 @@
     <inspection_tool class="AndroidLintDuplicateStrings" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintDuplicateUsesFeature" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintEasterEgg" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AndroidLintEditedTargetSdkVersion" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="AndroidLintEllipsizeMaxLines" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="AndroidLintEmptySuperCall" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintEnforceUTF8" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="AndroidLintEnqueueWork" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AndroidLintExactAlarm" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="AndroidLintExifInterface" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintExpensiveAssertion" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintExpiredTargetSdkVersion" enabled="true" level="ERROR" enabled_by_default="true" />
@@ -192,10 +199,12 @@
     <inspection_tool class="AndroidLintJavascriptInterface" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="AndroidLintJcenterRepositoryObsolete" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintJobSchedulerService" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AndroidLintKaptUsageInsteadOfKsp" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintKeyboardInaccessibleWidget" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintKnownPermissionError" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="AndroidLintKotlinNullnessAnnotation" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="AndroidLintKotlinPropertyAccess" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AndroidLintKotlincFE10" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintKtxExtensionAvailable" enabled="true" level="INFO" enabled_by_default="true" />
     <inspection_tool class="AndroidLintLabelFor" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintLambdaLast" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -253,6 +262,7 @@
     <inspection_tool class="AndroidLintNewerVersionAvailable" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintNfcTechWhitespace" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="AndroidLintNoHardKeywords" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AndroidLintNoOp" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintNonConstantResourceId" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintNonResizeableActivity" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintNotConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -291,6 +301,7 @@
     <inspection_tool class="AndroidLintProguardSplit" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintPropertyEscape" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="AndroidLintProtectedPermissions" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="AndroidLintProviderReadPermissionOnly" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintProxyPassword" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintPxUsage" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintQueryAllPackagesPermission" enabled="true" level="ERROR" enabled_by_default="true" />
@@ -304,6 +315,7 @@
     <inspection_tool class="AndroidLintRegistered" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintRelativeOverlap" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintRemoteViewLayout" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="AndroidLintReportShortcutUsage" enabled="false" level="INFO" enabled_by_default="false" />
     <inspection_tool class="AndroidLintRequiredSize" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="AndroidLintRequiresFeature" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintResAuto" enabled="true" level="ERROR" enabled_by_default="true" />
@@ -322,6 +334,7 @@
     <inspection_tool class="AndroidLintSQLiteString" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintSSLCertificateSocketFactoryCreateSocket" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintSSLCertificateSocketFactoryGetInsecure" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AndroidLintScheduleExactAlarm" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="AndroidLintScopedStorage" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintScrollViewCount" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintScrollViewSize" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -329,6 +342,7 @@
     <inspection_tool class="AndroidLintSecureRandom" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintSelectableText" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintServiceCast" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="AndroidLintSetAndClearCommunicationDevice" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintSetJavaScriptEnabled" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintSetTextI18n" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintSetWorldReadable" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -384,9 +398,12 @@
     <inspection_tool class="AndroidLintUnpackedNativeCode" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintUnprotectedSMSBroadcastReceiver" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintUnsafeDynamicallyLoadedCode" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AndroidLintUnsafeImplicitIntentLaunch" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="AndroidLintUnsafeIntentLaunch" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintUnsafeNativeCodeLocation" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintUnsafeProtectedBroadcastReceiver" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintUnspecifiedImmutableFlag" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AndroidLintUnspecifiedRegisterReceiverFlag" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintUnsupportedChromeOsCameraSystemFeature" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintUnsupportedChromeOsHardware" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="AndroidLintUnsupportedTvHardware" enabled="true" level="ERROR" enabled_by_default="true" />
@@ -402,6 +419,7 @@
     <inspection_tool class="AndroidLintUseCompoundDrawables" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintUseOfBundledGooglePlayServices" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintUseSparseArrays" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AndroidLintUseTomlInstead" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintUseValueOf" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintUselessLeaf" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AndroidLintUselessParent" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -470,6 +488,8 @@
     <inspection_tool class="AngularUndefinedBinding" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="AngularUndefinedModuleExport" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="AngularUndefinedTag" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="AnimateAsStateLabel" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AnimatedContentLabel" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="Annotation" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AnnotationClass" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="Annotator" enabled="true" level="ERROR" enabled_by_default="true" />
@@ -488,6 +508,7 @@
     <inspection_tool class="AntDuplicateTargetsInspection" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="AntMissingPropertiesFileInspection" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="AntResolveInspection" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="ApplicationServiceAsStaticFinalField" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ArgNamesErrorsInspection" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="ArgNamesWarningsInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AroundAdviceStyleInspection" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -605,6 +626,7 @@
     <inspection_tool class="CallToStringConcatCanBeReplacedByOperator" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CallToSuspiciousStringMethod" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CallerJS" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="CallingMethodShouldBeRequiresBlockingContext" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="CallingSubscribeInNonBlockingScope" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="CanBeFinal" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="REPORT_CLASSES" value="false" />
@@ -615,6 +637,7 @@
     <inspection_tool class="CanBePrimaryConstructorProperty" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="CanBeVal" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="CanSealedSubClassBeObject" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="CancellationCheckInLoops" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CapturingCleaner" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="CascadeIf" enabled="true" level="INFO" enabled_by_default="true" />
     <inspection_tool class="CastCanBeRemovedNarrowingVariableType" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -753,6 +776,7 @@
     <inspection_tool class="CollectionsMustHaveInitialCapacity" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CommaExpressionJS" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="CommentedOutCode" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="CompanionObjectInExtension" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="ComparableImplementedButEqualsNotOverridden" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ComparatorCombinators" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ComparatorMethodParameterNotUsed" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -849,6 +873,7 @@
     <inspection_tool class="CopyWithoutNamedArguments" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="CovariantEquals" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CriteriaApiResolveInspection" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CrossfadeLabel" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CssBrowserCompatibilityForProperties" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CssConvertColorToHexInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CssConvertColorToRgbInspection" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -858,6 +883,7 @@
     <inspection_tool class="CssInvalidHtmlTagReference" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CssInvalidImport" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="CssInvalidMediaFeature" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="CssInvalidNestedSelector" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CssInvalidPropertyValue" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="CssInvalidPseudoSelector" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="CssMissingComma" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -915,6 +941,7 @@
     </inspection_tool>
     <inspection_tool class="DeclareParentsInspection" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="DeclaringClassMigration" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DeconstructionCanBeUsed" enabled="false" level="INFORMATION" enabled_by_default="false" />
     <inspection_tool class="DefaultAnnotationParam" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="DefaultFileTemplate" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="CHECK_FILE_HEADER" value="true" />
@@ -940,6 +967,7 @@
     <inspection_tool class="DesignForExtension" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="Destructure" enabled="false" level="INFO" enabled_by_default="false" />
     <inspection_tool class="DestructuringWrongName" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="DevKitPropertiesMessageValidation" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="DevKitPropertiesQuotesValidation" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="DialogTitleCapitalization" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="DiamondCanBeReplacedWithExplicitTypeArguments" enabled="true" level="INFORMATION" enabled_by_default="true" />
@@ -1038,6 +1066,7 @@
     <inspection_tool class="EditorConfigUnusedDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="EditorConfigValueCorrectness" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="EditorConfigValueUniqueness" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="EditorConfigVerifyByCore" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="EditorConfigWildcardRedundancy" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="EmptyCatchBlockJS" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="EmptyClass" enabled="false" level="WARNING" enabled_by_default="false">
@@ -1108,9 +1137,12 @@
     <inspection_tool class="ExtendsThread" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ExtendsThrowable" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ExtendsUtilityClass" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ExtensionClassShouldBeFinalAndNonPublic" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ExtensionRegisteredAsServiceOrComponent" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="ExternalizableWithSerializationMethods" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ExternalizableWithoutPublicNoArgConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ExtractKtorModule" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ExtractMethodRecommender" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="FakeJvmFieldConstant" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="FallThroughInSwitchStatementJS" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="FallthruInSwitchStatement" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -1173,6 +1205,7 @@
     <inspection_tool class="ForLoopWithMissingComponent" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="ignoreCollectionLoops" value="false" />
     </inspection_tool>
+    <inspection_tool class="ForbiddenInSuspectContextMethod" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ForeachStatement" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ForeignDelegate" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="FormSpellChecking" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -1380,6 +1413,7 @@
     <inspection_tool class="GroovyWhileLoopSpinsOnField" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="ignoreNonEmtpyLoops" value="false" />
     </inspection_tool>
+    <inspection_tool class="GrpcSchemes" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="Guava" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="HamlNestedTagContent" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="HardCodedStringLiteral" enabled="false" level="WARNING" enabled_by_default="false">
@@ -1515,17 +1549,21 @@
     <inspection_tool class="IncorrectDateTimeFormat" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="IncorrectFormatting" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="IncorrectHttpHeaderInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="IncorrectMessageFormat" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="IncorrectOnMessageMethodsInspection" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="IncorrectParentDisposable" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="IncorrectPluginDslStructure" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="IncorrectProcessCanceledExceptionHandling" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="IncrementDecrementResultUsedJS" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="IncrementDecrementUsedAsExpression" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="IndexOfReplaceableByContains" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="IndexZeroUsage" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="InfiniteLoopJS" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="InfiniteLoopStatement" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="InfinitePropertiesLabel" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="InfiniteRecursion" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="InfiniteRecursionJS" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="InfiniteTransitionLabel" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="InjectedReferences" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="InjectionNotApplicable" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="InjectionValueTypeInspection" enabled="true" level="ERROR" enabled_by_default="true" />
@@ -1701,6 +1739,7 @@
     <inspection_tool class="JavaFxUnresolvedFxIdReference" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="JavaFxUnresolvedStyleClassReference" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="JavaFxUnusedImports" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="JavaIoSerializableObjectMustHaveReadResolve" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="JavaLangImport" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="JavaLangInvokeHandleSignature" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="JavaMapForEach" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
@@ -1719,7 +1758,7 @@
     </inspection_tool>
     <inspection_tool class="JavaeeApplicationDomInspection" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="JdkProxiedBeanTypeInspection" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="JmhInspections" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="JmhInspections" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="JoinDeclarationAndAssignment" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="JoinDeclarationAndAssignmentJava" enabled="true" level="INFORMATION" enabled_by_default="true" />
     <inspection_tool class="JpaAttributeMemberSignatureInspection" enabled="true" level="ERROR" enabled_by_default="true" />
@@ -1737,6 +1776,7 @@
     <inspection_tool class="JpaObjectClassSignatureInspection" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="JpaQlInspection" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="JpaQueryApiInspection" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="JsCoverageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="Json5StandardCompliance" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="JsonDuplicatePropertyKeys" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="JsonPathEvaluateUnknownKey" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -1752,6 +1792,7 @@
     <inspection_tool class="JspTagBodyContent" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="JspUnescapedEl" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="Junit4Converter" enabled="true" level="INFORMATION" enabled_by_default="true" />
+    <inspection_tool class="JvmCoverageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="KDocMissingDocumentation" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="KDocUnresolvedReference" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="KarmaConfigFile" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -1777,6 +1818,7 @@
     <inspection_tool class="KotlinTestJUnit" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="KotlinThrowableNotThrown" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="KotlinUnusedImport" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="KtorOpenAPIUpdate" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="KtorOpenApi" enabled="false" level="INFORMATION" enabled_by_default="false" />
     <inspection_tool class="KtorYamlConfig" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="LabeledStatement" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -1804,6 +1846,9 @@
     <inspection_tool class="LessUnresolvedMixin" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="LessUnresolvedVariable" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="LiftReturnOrAssignment" enabled="true" level="INFO" enabled_by_default="true" />
+    <inspection_tool class="LightServiceMigrationCode" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LightServiceMigrationXML" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LightServiceMustBeFinal" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="LimitedScopeInnerClass" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ListIndexOfReplaceableByContains" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ListRemoveInLoop" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -1839,8 +1884,10 @@
       <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
     </inspection_tool>
     <inspection_tool class="LoggingConditionDisagreesWithLogStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LoggingPlaceholderCountMatchesArgumentCount" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="LoggingStringTemplateAsArgument" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="Lombok" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="LombokGetterMayBeUsed" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="LongLine" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="LongLiteralsEndingWithLowercaseL" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="LongText" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -1851,6 +1898,7 @@
     <inspection_tool class="LoopStatementsThatDontLoop" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="LoopToCallChain" enabled="true" level="INFORMATION" enabled_by_default="true" />
     <inspection_tool class="LoopWithImplicitTerminationCondition" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LossyConversionCompoundAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="LossyEncoding" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="MVCPathVariableInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="MagicCharacter" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -1942,6 +1990,7 @@
       </option>
     </inspection_tool>
     <inspection_tool class="MismatchedJavadocCode" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MismatchedLightServiceLevelAndCtor" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="MismatchedStringBuilderQueryUpdate" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="MismatchedStringCase" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="MisorderedAssertEqualsArguments" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -2012,6 +2061,7 @@
     <inspection_tool class="MysqlSpaceAfterFunctionNameInspection" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="NakedNotify" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="NativeMethods" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NavigationFile" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="NegatedConditional" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="m_ignoreNegatedNullComparison" value="true" />
     </inspection_tool>
@@ -2161,6 +2211,7 @@
     <inspection_tool class="OptionalExpectation" enabled="true" level="INFORMATION" enabled_by_default="true" />
     <inspection_tool class="OptionalGetWithoutIsPresent" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="OptionalIsPresent" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="OptionalOfNullableMisuse" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="OptionalToIf" enabled="true" level="INFORMATION" enabled_by_default="true" />
     <inspection_tool class="OptionalUsedAsFieldOrParameterType" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="OraMissingBodyInspection" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -2347,6 +2398,7 @@
     </inspection_tool>
     <inspection_tool class="PublicStaticArrayField" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="PublicStaticCollectionField" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="QodanaSanity" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="QodanaServiceMessage" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="QsPrivateBeanMembersInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="QsProperties" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -2394,6 +2446,7 @@
     <inspection_tool class="RedundantEmptyInitializerBlock" enabled="true" level="INFO" enabled_by_default="true" />
     <inspection_tool class="RedundantEnumConstructorInvocation" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="RedundantEscapeInRegexReplacement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantExplicitChronoField" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="RedundantExplicitClose" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="RedundantExplicitType" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="RedundantExplicitVariableType" enabled="true" level="INFORMATION" enabled_by_default="true" />
@@ -2542,6 +2595,7 @@
     <inspection_tool class="RestrictReturnStatementTargetMigration" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="ResultOfObjectAllocationIgnored" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ResultSetIndexZero" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RetrievingService" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="ReturnFromFinallyBlock" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ReturnFromFinallyBlockJS" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ReturnNull" enabled="false" level="WARNING" enabled_by_default="false">
@@ -2677,6 +2731,7 @@
     <inspection_tool class="SpringCacheNamesInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SpringCacheableAndCachePutInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SpringCacheableComponentsInspection" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="SpringCacheableMethodCallsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="SpringCloudStreamInconsistencyInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SpringCloudStreamMessageChannelInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SpringComponentScan" enabled="true" level="ERROR" enabled_by_default="true" />
@@ -2776,6 +2831,7 @@
     <inspection_tool class="SqlShouldBeInGroupByInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SqlSideEffectsInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SqlSignatureInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="SqlSourceToSinkFlow" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="SqlStorageInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SqlStringLengthExceededInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SqlTransactionStatementInTriggerInspection" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -2873,6 +2929,7 @@
         <option name="METHOD_MATCHER_CONFIG" value="java.io.PrintStream,println,java.io.PrintWriter,println,java.lang.System,identityHashCode,java.sql.PreparedStatement,set.*,java.sql.ResultSet,update.*,java.sql.SQLOutput,write.*,java.lang.Integer,compare.*,java.lang.Long,compare.*,java.lang.Short,compare,java.lang.Byte,compare,java.lang.Character,compare,java.lang.Boolean,compare,java.lang.Math,.*,java.lang.StrictMath,.*" />
       </ignored>
     </inspection_tool>
+    <inspection_tool class="SuspiciousReturnByteInputStream" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="SuspiciousSystemArraycopy" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SuspiciousTernaryOperatorInVarargsCall" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SuspiciousToArrayCall" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -2945,12 +3002,14 @@
     <inspection_tool class="ThreadDeathRethrown" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ThreadDumpStack" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ThreadLocalNotStaticFinal" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ThreadLocalSetWithNull" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="ThreadPriority" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ThreadRun" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ThreadStartInConstruction" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ThreadStopSuspendResume" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ThreadWithDefaultRunMethod" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ThreadYield" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ThreadingConcurrency" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="ThreeNegationsPerFunctionJS" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ThreeNegationsPerMethod" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="m_ignoreInEquals" value="true" />
@@ -2975,6 +3034,7 @@
     <inspection_tool class="TimeToString" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ToArrayCallWithZeroLengthArrayArgument" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="TodoComment" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TokenSetInParserDefinition" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="TomlUnresolvedReference" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="TooBroadCatch" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="TooBroadScope" enabled="true" level="INFORMATION" enabled_by_default="true">
@@ -3150,6 +3210,7 @@
     <inspection_tool class="UnspecifiedActionsPlace" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="UnstableApiUsage" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnstableTypeUsedInSignature" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnsupportedChronoFieldUnitCall" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="UnterminatedStatementJS" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="ignoreSemicolonAtEndOfBlock" value="true" />
     </inspection_tool>
@@ -3178,6 +3239,7 @@
     <inspection_tool class="UpdateDependencyToLatestVersion" enabled="true" level="INFORMATION" enabled_by_default="true" />
     <inspection_tool class="UpdateTransitionLabel" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UpperCaseFieldNameNotConstant" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UrlHashCode" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="UsagesOfObsoleteApi" enabled="false" level="TEXT ATTRIBUTES" enabled_by_default="false" />
     <inspection_tool class="UseBulkOperation" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UseCompareMethod" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -3269,6 +3331,7 @@
       <option name="ignoreNonEmtpyLoops" value="true" />
     </inspection_tool>
     <inspection_tool class="WithStatementJS" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="WorkspaceEntityMutableField" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="WorkspaceImplAbsent" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="WorkspaceImplObsolete" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="WrapUnaryOperator" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
@@ -3292,6 +3355,7 @@
     <inspection_tool class="XsltUnusedDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="XsltVariableShadowing" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="YAMLDuplicatedKeys" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="YAMLIncompatibleTypes" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="YAMLRecursiveAlias" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="YAMLSchemaDeprecation" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="YAMLSchemaValidation" enabled="true" level="WARNING" enabled_by_default="true" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 42d65736..ba285131 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_20" default="true" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_20" default="true" project-jdk-name="azul-20" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1ddf..7ddfc9ed 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="CommitMessageInspectionProfile">
+    <profile version="1.0">
+      <inspection_tool class="CommitFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="CommitNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
+    </profile>
+  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
   </component>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fae08049..84a0b92f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/modules/components/CHANGELOG.md b/modules/components/CHANGELOG.md
index 097cc7df..442d08b0 100644
--- a/modules/components/CHANGELOG.md
+++ b/modules/components/CHANGELOG.md
@@ -16,6 +16,16 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 [//]: ##[Unreleased]
 
+## [11.22.0] - 24-08-2023
+
+### Added
+
+- Added tests for the reworked CheckBoxes
+
+### Changed
+
+- CheckBoxes have been reworked
+
 ## [11.21.0] - 01-06-2023
 
 ### Added
@@ -26,7 +36,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Changed
 
-- MFXCheckBox: SceneBuilder integration set text to "CheckBox"
+- MFXCheckbox: SceneBuilder integration set text to "Checkbox"
 - MFXFabBase; SceneBuilder integration set text to "Floating Action Button"
 - UserAgentBuilder: Implemented code to resolve @import statements and 'local' URL resources. These features will work
   only if the Theme deploys the needed assets on the disk first
diff --git a/modules/components/src/main/java/io/github/palexdev/mfxcomponents/behaviors/MFXCheckBoxBehavior.java b/modules/components/src/main/java/io/github/palexdev/mfxcomponents/behaviors/MFXCheckboxBehavior.java
similarity index 73%
rename from modules/components/src/main/java/io/github/palexdev/mfxcomponents/behaviors/MFXCheckBoxBehavior.java
rename to modules/components/src/main/java/io/github/palexdev/mfxcomponents/behaviors/MFXCheckboxBehavior.java
index 2fbfed42..d331ae5f 100644
--- a/modules/components/src/main/java/io/github/palexdev/mfxcomponents/behaviors/MFXCheckBoxBehavior.java
+++ b/modules/components/src/main/java/io/github/palexdev/mfxcomponents/behaviors/MFXCheckboxBehavior.java
@@ -18,9 +18,11 @@
 
 package io.github.palexdev.mfxcomponents.behaviors;
 
-import io.github.palexdev.mfxcomponents.controls.checkbox.MFXCheckBox;
-import io.github.palexdev.mfxcomponents.skins.MFXCheckBoxSkin;
+import io.github.palexdev.mfxcomponents.controls.checkbox.MFXCheckbox;
+import io.github.palexdev.mfxcomponents.skins.MFXCheckboxSkin;
+import io.github.palexdev.mfxcore.selection.SelectionProperty;
 import io.github.palexdev.mfxresources.fonts.MFXIconWrapper;
+import javafx.event.ActionEvent;
 import javafx.geometry.Bounds;
 import javafx.scene.Node;
 import javafx.scene.control.Skin;
@@ -31,17 +33,17 @@
 import java.util.Optional;
 
 /**
- * This is the default behavior used by all {@link MFXCheckBox} components.
+ * This is the default behavior used by all {@link MFXCheckbox} components.
  * <p>
  * Extends {@link MFXSelectableBehaviorBase} since most of the API is the same, but the {@link #handleSelection()} method
  * is overridden to also take into account the special {@code indeterminate} state of checkboxes.
  * <p>
  * The {@link #keyPressed(KeyEvent)} method has been overridden too, to correctly handle the ripple effect.
- * As also explained by {@link MFXCheckBoxSkin}, the effect is generated on the node containing the box and the check
+ * As also explained by {@link MFXCheckboxSkin}, the effect is generated on the node containing the box and the check
  * mark. When we click outside the container, or press ENTER, the effect should be generated at the center of the container
  * (as if it was a 'fallback'). For this reason, there's also a mechanism to retrieve the container, see {@link #getIcon()}.
  */
-public class MFXCheckBoxBehavior extends MFXSelectableBehaviorBase<MFXCheckBox> {
+public class MFXCheckboxBehavior extends MFXSelectableBehaviorBase<MFXCheckbox> {
     //================================================================================
     // Properties
     //================================================================================
@@ -50,7 +52,7 @@ public class MFXCheckBoxBehavior extends MFXSelectableBehaviorBase<MFXCheckBox>
     //================================================================================
     // Constructors
     //================================================================================
-    public MFXCheckBoxBehavior(MFXCheckBox button) {
+    public MFXCheckboxBehavior(MFXCheckbox button) {
         super(button);
     }
 
@@ -77,43 +79,38 @@ public void keyPressed(KeyEvent ke) {
     /**
      * {@inheritDoc}
      * <p></p>
-     * For checkboxes, the mechanism is even more complex since they also have the {@code 'indeterminate'} state.
+     * For checkboxes, the mechanism is even more complex since they also have the {@code indeterminate} state.
      * <p>
      * Here's all the possible cases:
      * <p> 1) The checkbox doesn't allow the {@code indeterminate} state, this is the simplest case. The selection state
-     * is flipped
-     * <p> 2) The checkbox is not selected and neither {@code indeterminate}, sets the {@code indeterminate} state to true
-     * <p> 3) The checkbox is selected and not {@code indeterminate}, sets the selection state to false
-     * <p> 4) The checkbox is not selected but {@code indeterminate}, sets the selection state to true and the
-     * {@code indeterminate} state to false
+     * is flipped (see {@link MFXCheckbox#allowIndeterminateProperty()})
+     * <p> 2) The checkbox is {@code indeterminate}, sets the state to {@code selected}
+     * <p> 3) The checkbox is not selected, sets the state to {@code indeterminate}
+     * <p>
+     * In short, the cycle is: UNSELECTED -> INDETERMINATE (if allowed) -> SELECTED
      * <p></p>
-     * Last but not least, if either the selection or {@code indeterminate} states have changed,
-     * triggers {@link MFXCheckBox#fire()}.
+     * <b>Note:</b> this method will not invoke {@link MFXCheckbox#fire()}, as it is handled by the checkbox' {@link SelectionProperty},
+     * this is done to make {@link ActionEvent}s work also when the property is bound. I've not yet decided if this will
+     * be the final behavior, if you have issues/opinions on this please let me know.
      */
     @Override
     protected void handleSelection() {
-        MFXCheckBox checkBox = getNode();
-        boolean oldIndeterminate = checkBox.isIndeterminate();
-        boolean oldState = checkBox.isSelected();
+        MFXCheckbox checkBox = getNode();
+        if (checkBox.stateProperty().isBound()) return;
 
+        MFXCheckbox.TriState oldState = checkBox.getState();
         if (checkBox.isAllowIndeterminate()) {
-            if (!oldState && !oldIndeterminate) {
-                checkBox.setIndeterminate(true);
-            } else if (oldState && !oldIndeterminate) {
-                checkBox.setSelected(false);
-            } else {
-                checkBox.setSelected(true);
-                checkBox.setIndeterminate(false);
+            if (oldState == MFXCheckbox.TriState.INDETERMINATE) {
+                checkBox.setState(MFXCheckbox.TriState.SELECTED);
+                return;
+            }
+            if (oldState == MFXCheckbox.TriState.UNSELECTED) {
+                checkBox.setState(MFXCheckbox.TriState.INDETERMINATE);
+                return;
             }
-        } else {
-            checkBox.setSelected(!oldState);
         }
-
-        // This is needed since the new state may not necessarily be the one above
-        // For example if in a group and cannot be selected/deselected...
-        if (checkBox.isSelected() != oldState ||
-            checkBox.isIndeterminate() != oldIndeterminate)
-            checkBox.fire();
+        checkBox.setState(oldState == MFXCheckbox.TriState.UNSELECTED ? MFXCheckbox.TriState.SELECTED : MFXCheckbox.TriState.UNSELECTED);
+        // fire() is handled by the state property, to make bindings work too
     }
 
     @Override
@@ -147,7 +144,7 @@ public void dispose() {
      */
     protected Optional<Node> getIcon() {
         if (icon == null) {
-            MFXCheckBox checkBox = getNode();
+            MFXCheckbox checkBox = getNode();
             Skin<?> skin = checkBox.getSkin();
             if (skin == null) return Optional.empty();
             Optional<Node> opt = checkBox.getChildrenUnmodifiable().stream()
diff --git a/modules/components/src/main/java/io/github/palexdev/mfxcomponents/behaviors/MFXSelectableBehaviorBase.java b/modules/components/src/main/java/io/github/palexdev/mfxcomponents/behaviors/MFXSelectableBehaviorBase.java
index a827a8d7..e24c6ecb 100644
--- a/modules/components/src/main/java/io/github/palexdev/mfxcomponents/behaviors/MFXSelectableBehaviorBase.java
+++ b/modules/components/src/main/java/io/github/palexdev/mfxcomponents/behaviors/MFXSelectableBehaviorBase.java
@@ -33,9 +33,9 @@ public MFXSelectableBehaviorBase(S button) {
      * Responsible for switching the selection state of the component.
      * <p>
      * It's worth specifying that the change is not as simple as just flipping the boolean value. Those who implement
-     * the {@link Selectable} API may be in a {@link SelectionGroup} or, in case of {@link MFXSelectable} components, they
-     * may have the {@link MFXSelectable#changeSelection(boolean)} method overridden. Which means that at the end the new
-     * state depends on those two factors. After requesting the new state with {@link MFXSelectable#setSelected(boolean)},
+     * the {@link Selectable} API may be in a {@link SelectionGroup}.
+     * <p>
+     * After requesting the new state with {@link Selectable#setSelected(boolean)},
      * we must check if the state was effectively changed, and only if so also trigger {@link MFXSelectable#fire()}.
      */
     protected void handleSelection() {
diff --git a/modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/base/MFXSelectable.java b/modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/base/MFXSelectable.java
index de302bc3..60ac3846 100644
--- a/modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/base/MFXSelectable.java
+++ b/modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/base/MFXSelectable.java
@@ -16,9 +16,6 @@
  * <p></p>
  * Implements the selection API/Behavior through the {@link Selectable} interface.
  * Expects behaviors of type {@link MFXSelectableBehaviorBase}.
- * <p></p>
- * Implementations of this may need to control the way selection works, for this reason there are two methods that are basically
- * hooks for pre/post selection change, see {@link #changeSelection(boolean)} and {@link #onSelectionChanged(boolean)}.
  *
  * @see SelectionProperty
  * @see SelectionGroupProperty
@@ -30,14 +27,9 @@ public abstract class MFXSelectable<B extends MFXSelectableBehaviorBase<?>> exte
     //================================================================================
     private final SelectionGroupProperty selectionGroup = new SelectionGroupProperty(this);
     private final SelectionProperty selected = new SelectionProperty(this) {
-        @Override
-        public void set(boolean newValue) {
-            boolean state = changeSelection(newValue);
-            super.set(state);
-        }
-
         @Override
         protected void invalidated() {
+            super.invalidated();
             onSelectionChanged(get());
         }
     };
@@ -60,21 +52,6 @@ public MFXSelectable(String text, Node graphic) {
     // Methods
     //================================================================================
 
-    /**
-     * This is automatically called by the {@link #selectedProperty()} when selection is about to change.
-     * <p>
-     * The given parameter is the new requested selection state.
-     * <p></p>
-     * One can alter the return value according to its needs.
-     * By default, does not alter the requested state.
-     * <p></p>
-     * BEWARE! Disabling these components when in a {@link SelectionGroup} may produce unexpected results,
-     * especially when using the {@link SelectionGroup#atLeastOneSelectedProperty()} mode.
-     */
-    protected boolean changeSelection(boolean selected) {
-        return selected;
-    }
-
     /**
      * This is automatically called by {@link #selectedProperty()} after the selection has changed and has become invalid.
      * <p></p>
diff --git a/modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/buttons/MFXIconButton.java b/modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/buttons/MFXIconButton.java
index 885a1c84..3e100e56 100644
--- a/modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/buttons/MFXIconButton.java
+++ b/modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/buttons/MFXIconButton.java
@@ -95,17 +95,14 @@ public MFXIconButton outlined() {
     private void initialize() {
         graphicProperty().bind(iconProperty());
         setSelectable(false);
+        selectionGroupProperty().addListener(i -> {
+            if (getSelectionGroup() != null) asToggle();
+        });
     }
 
     //================================================================================
     // Overridden Methods
     //================================================================================
-    @Override
-    protected boolean changeSelection(boolean selected) {
-        if (!isSelectable()) return false;
-        return super.changeSelection(selected);
-    }
-
     @Override
     protected MFXSkinBase<?, ?> buildSkin() {
         return new MFXIconButtonSkin(this);
diff --git a/modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/checkbox/MFXCheckBox.java b/modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/checkbox/MFXCheckBox.java
deleted file mode 100644
index a9d9f548..00000000
--- a/modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/checkbox/MFXCheckBox.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2023 Parisi Alessandro - alessandro.parisi406@gmail.com
- * This file is part of MaterialFX (https://github.com/palexdev/MaterialFX)
- *
- * MaterialFX is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 3 of the License,
- * or (at your option) any later version.
- *
- * MaterialFX is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with MaterialFX. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.github.palexdev.mfxcomponents.controls.checkbox;
-
-import io.github.palexdev.mfxcomponents.behaviors.MFXCheckBoxBehavior;
-import io.github.palexdev.mfxcomponents.controls.base.MFXSelectable;
-import io.github.palexdev.mfxcomponents.controls.base.MFXSkinBase;
-import io.github.palexdev.mfxcomponents.skins.MFXCheckBoxSkin;
-import io.github.palexdev.mfxcomponents.theming.enums.PseudoClasses;
-import io.github.palexdev.mfxcore.base.properties.styleable.StyleableBooleanProperty;
-import io.github.palexdev.mfxcore.utils.fx.SceneBuilderIntegration;
-import io.github.palexdev.mfxeffects.utils.StyleUtils;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.css.CssMetaData;
-import javafx.css.Styleable;
-import javafx.css.StyleablePropertyFactory;
-
-import java.util.List;
-import java.util.function.Supplier;
-
-/**
- * Custom implementation of a checkbox which extends {@link MFXSelectable}, has its own skin
- * {@link MFXCheckBoxSkin}.
- * <p>
- * {@code Checkboxes} are special type of 'selectables' because of their special {@code indeterminate} state.
- * Such state is not allowed by default, set {@link #allowIndeterminateProperty()} to change this. The state is specified by
- * the {@link #indeterminateProperty()}.
- * <p></p>
- * The default behavior type for all {@link MFXCheckBox} components is {@link MFXCheckBoxBehavior}.
- * <p>
- * The default style class of this component is: '.mfx-checkbox'.
- */
-// TODO introduce validator
-public class MFXCheckBox extends MFXSelectable<MFXCheckBoxBehavior> {
-    //================================================================================
-    // Properties
-    //================================================================================
-    private final BooleanProperty indeterminate = new SimpleBooleanProperty(false) {
-        @Override
-        protected void invalidated() {
-            PseudoClasses.INDETERMINATE.setOn(MFXCheckBox.this, get());
-        }
-    };
-
-    //================================================================================
-    // Constructors
-    //================================================================================
-    public MFXCheckBox() {
-    }
-
-    public MFXCheckBox(String text) {
-        super(text);
-    }
-
-    //================================================================================
-    // Overridden Methods
-    //================================================================================
-    @Override
-    protected MFXSkinBase<?, ?> buildSkin() {
-        return new MFXCheckBoxSkin(this);
-    }
-
-    @Override
-    public List<String> defaultStyleClasses() {
-        return List.of("mfx-checkbox");
-    }
-
-    @Override
-    public Supplier<MFXCheckBoxBehavior> defaultBehaviorProvider() {
-        return () -> new MFXCheckBoxBehavior(this);
-    }
-
-    @Override
-    protected void sceneBuilderIntegration() {
-        super.sceneBuilderIntegration();
-        SceneBuilderIntegration.ifInSceneBuilder(() -> setText("CheckBox"));
-    }
-
-    //================================================================================
-    // Styleable Properties
-    //================================================================================
-    private final StyleableBooleanProperty allowIndeterminate = new StyleableBooleanProperty(
-        StyleableProperties.ALLOW_INDETERMINATE,
-        this,
-        "allowIndeterminate",
-        false
-    ) {
-        @Override
-        protected void invalidated() {
-            boolean state = get();
-            if (!state && isIndeterminate()) setIndeterminate(false);
-        }
-    };
-
-    public boolean isAllowIndeterminate() {
-        return allowIndeterminate.get();
-    }
-
-    /**
-     * Specifies whether the checkbox can also transition to the {@code indeterminate} state.
-     * <p>
-     * When turned off, the {@code indeterminate} state is also set to false.
-     * <p></p>
-     * Can be set in CSS via the property: '-mfx-allow-indeterminate'.
-     */
-    public StyleableBooleanProperty allowIndeterminateProperty() {
-        return allowIndeterminate;
-    }
-
-    public void setAllowIndeterminate(boolean allowIndeterminate) {
-        this.allowIndeterminate.set(allowIndeterminate);
-    }
-
-    //================================================================================
-    // CssMetaData
-    //================================================================================
-    private static class StyleableProperties {
-        private static final StyleablePropertyFactory<MFXCheckBox> FACTORY = new StyleablePropertyFactory<>(MFXSelectable.getClassCssMetaData());
-        private static final List<CssMetaData<? extends Styleable, ?>> cssMetaDataList;
-
-        private static final CssMetaData<MFXCheckBox, Boolean> ALLOW_INDETERMINATE =
-            FACTORY.createBooleanCssMetaData(
-                "-mfx-allow-indeterminate",
-                MFXCheckBox::allowIndeterminateProperty,
-                false
-            );
-
-        static {
-            cssMetaDataList = StyleUtils.cssMetaDataList(
-                MFXSelectable.getClassCssMetaData(),
-                ALLOW_INDETERMINATE
-            );
-        }
-    }
-
-    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
-        return StyleableProperties.cssMetaDataList;
-    }
-
-    @Override
-    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
-        return getClassCssMetaData();
-    }
-
-    //================================================================================
-    // Getters/Setters
-    //================================================================================
-    public boolean isIndeterminate() {
-        return indeterminate.get();
-    }
-
-    /**
-     * Specifies the {@code indeterminate} state of the checkbox.
-     */
-    public BooleanProperty indeterminateProperty() {
-        return indeterminate;
-    }
-
-    public void setIndeterminate(boolean indeterminate) {
-        this.indeterminate.set(indeterminate);
-    }
-}
diff --git a/modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/checkbox/MFXCheckbox.java b/modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/checkbox/MFXCheckbox.java
new file mode 100644
index 00000000..b4780845
--- /dev/null
+++ b/modules/components/src/main/java/io/github/palexdev/mfxcomponents/controls/checkbox/MFXCheckbox.java
@@ -0,0 +1,288 @@
+/*
+ * Copyright (C) 2023 Parisi Alessandro - alessandro.parisi406@gmail.com
+ * This file is part of MaterialFX (https://github.com/palexdev/MaterialFX)
+ *
+ * MaterialFX is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * MaterialFX is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with MaterialFX. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.github.palexdev.mfxcomponents.controls.checkbox;
+
+import io.github.palexdev.mfxcomponents.behaviors.MFXCheckboxBehavior;
+import io.github.palexdev.mfxcomponents.controls.base.MFXSelectable;
+import io.github.palexdev.mfxcomponents.controls.base.MFXSkinBase;
+import io.github.palexdev.mfxcomponents.skins.MFXCheckboxSkin;
+import io.github.palexdev.mfxcomponents.theming.enums.PseudoClasses;
+import io.github.palexdev.mfxcore.base.properties.styleable.StyleableBooleanProperty;
+import io.github.palexdev.mfxcore.selection.Selectable;
+import io.github.palexdev.mfxcore.selection.SelectionGroup;
+import io.github.palexdev.mfxcore.utils.fx.SceneBuilderIntegration;
+import io.github.palexdev.mfxeffects.utils.StyleUtils;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.css.CssMetaData;
+import javafx.css.Styleable;
+import javafx.css.StyleablePropertyFactory;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+/**
+ * Custom implementation of a checkbox which extends {@link MFXSelectable}, has its own skin
+ * {@link MFXCheckboxSkin}.
+ * <p>
+ * {@code Checkboxes} are special type of 'selectables' because of their special {@code indeterminate} state.
+ * Such state is not allowed by default, set {@link #allowIndeterminateProperty()} to change this.
+ * <p></p>
+ * The default behavior type for all {@link MFXCheckbox} components is {@link MFXCheckboxBehavior}.
+ * <p>
+ * The default style class of this component is: '.mfx-checkbox'.
+ * <p></p>
+ * <b>About this component</b>
+ * <p></p>
+ * Not so long ago, I was developing a little tool for myself to help me perform boring actions in a bunch of clicks, with
+ * a beautiful UI, so of course I used all of my libraries. While developing the app, I was struggling with checkboxes
+ * because for necessity I needed in some cases their state to be bound to something else. Turns out, JavaFX checkboxes
+ * are not very easy to use in such occasions because they split the {@code state} in two different properties (selected, indeterminate).
+ * <p>
+ * I understand why it was done like this, it's a common pattern for tri-states, but if it can be avoided then it should
+ * always be. Booleans are not meant to represent more than two states, boolean algebra consists of true and false values.
+ * <p>
+ * So, what's the other option? In one word: {@code Enumerators}.
+ * <p>
+ * {@code MFXCheckbox} uses the {@link TriState} enumerator to represent its states. Because of this, the checkbox's code
+ * is much simpler, using listeners and bindings is also more straightforward.
+ * <p></p>
+ * <b>Important Notes</b>
+ * <p>
+ * {@code MFXCheckbox} is a particular type of selectable component. Since it extends {@link MFXSelectable} (thus implementing
+ * {@link Selectable} too), all the API used for common selectable components is inherited, <b>but</b>:
+ * <p> 1) Using the checkbox in a {@link SelectionGroup} will disable the {@link #allowIndeterminateProperty()} and you
+ * won't be able to turn it back on until the checkbox is removed from the group. Selection groups are made to work with
+ * selectables which are either selected/unselected, indeterminate states make no sense for in a group.
+ * <p> 2) The {@link #selectedProperty()} is bound to the {@link #stateProperty()}. First of all, for this reason
+ * you won't be able to set it directly, {@link #setSelected(boolean)} is also overridden to change the {@link #stateProperty()}
+ * instead. Second, <b>don't try to unbind it</b>, it's just not meant to work like that.
+ */
+// TODO introduce validator
+public class MFXCheckbox extends MFXSelectable<MFXCheckboxBehavior> {
+    //================================================================================
+    // Enums
+    //================================================================================
+    public enum TriState {
+        UNSELECTED,
+        SELECTED,
+        INDETERMINATE,
+        ;
+
+        /**
+         * @return a {@code TriState} constant from the given {@link Boolean} object. When giving a {@code null} value,
+         * this will return the state {@link #INDETERMINATE}
+         */
+        public static TriState from(Boolean b) {
+            if (b == null) return INDETERMINATE;
+            return b ? SELECTED : UNSELECTED;
+        }
+    }
+
+    //================================================================================
+    // Properties
+    //================================================================================
+    private final ObjectProperty<TriState> state = new SimpleObjectProperty<>(TriState.UNSELECTED) {
+        @Override
+        public void set(TriState newValue) {
+            if (newValue == null) newValue = TriState.UNSELECTED;
+            TriState state = handleNewState(newValue);
+            super.set(state);
+        }
+
+        @Override
+        protected void invalidated() {
+            TriState state = get();
+            PseudoClasses.INDETERMINATE.setOn(MFXCheckbox.this, state == TriState.INDETERMINATE);
+            // ":selected" pseudo class is handled by the onSelectionChanged(boolean) method
+            fire();
+        }
+    };
+
+    //================================================================================
+    // Constructors
+    //================================================================================
+    public MFXCheckbox() {
+        initialize();
+    }
+
+    public MFXCheckbox(String text) {
+        super(text);
+        initialize();
+    }
+
+    //================================================================================
+    // Methods
+    //================================================================================
+    private void initialize() {
+        selectionGroupProperty().addListener(i -> {
+            if (getSelectionGroup() != null) setAllowIndeterminate(false);
+        });
+        selectedProperty().bind(stateProperty().isEqualTo(TriState.SELECTED));
+    }
+
+    /**
+     * Invoked when a state change is requested. This is responsible for returning a valid state when the checkbox is in
+     * a {@link SelectionGroup}. If it is not, returns the given parameter untouched.
+     *
+     * @param requested the new requested state for the checkbox
+     */
+    protected TriState handleNewState(TriState requested) {
+        SelectionGroup sg = getSelectionGroup();
+        if (sg == null) return requested;
+        boolean check = sg.check(this, requested == TriState.SELECTED);
+        return check ? TriState.SELECTED : TriState.UNSELECTED;
+    }
+
+    //================================================================================
+    // Overridden Methods
+    //================================================================================
+    @Override
+    protected MFXSkinBase<?, ?> buildSkin() {
+        return new MFXCheckboxSkin(this);
+    }
+
+    @Override
+    public List<String> defaultStyleClasses() {
+        return List.of("mfx-checkbox");
+    }
+
+    @Override
+    public Supplier<MFXCheckboxBehavior> defaultBehaviorProvider() {
+        return () -> new MFXCheckboxBehavior(this);
+    }
+
+    @Override
+    protected void sceneBuilderIntegration() {
+        super.sceneBuilderIntegration();
+        SceneBuilderIntegration.ifInSceneBuilder(() -> setText("Checkbox"));
+    }
+
+    //================================================================================
+    // Styleable Properties
+    //================================================================================
+    private final StyleableBooleanProperty allowIndeterminate = new StyleableBooleanProperty(
+        StyleableProperties.ALLOW_INDETERMINATE,
+        this,
+        "allowIndeterminate",
+        false
+    ) {
+        @Override
+        public void set(boolean newValue) {
+            SelectionGroup sg = getSelectionGroup();
+            super.set(sg == null && newValue);
+        }
+
+        @Override
+        protected void invalidated() {
+            boolean state = get();
+            if (!state && isIndeterminate()) setState(TriState.UNSELECTED);
+        }
+    };
+
+    public boolean isAllowIndeterminate() {
+        return allowIndeterminate.get();
+    }
+
+    /**
+     * Specifies whether the checkbox can also transition to the {@code indeterminate} state.
+     * <p>
+     * When turned off, the {@code indeterminate} state is also set to false.
+     * <p></p>
+     * Can be set in CSS via the property: '-mfx-allow-indeterminate'.
+     */
+    public StyleableBooleanProperty allowIndeterminateProperty() {
+        return allowIndeterminate;
+    }
+
+    public void setAllowIndeterminate(boolean allowIndeterminate) {
+        this.allowIndeterminate.set(allowIndeterminate);
+    }
+
+    //================================================================================
+    // CssMetaData
+    //================================================================================
+    private static class StyleableProperties {
+        private static final StyleablePropertyFactory<MFXCheckbox> FACTORY = new StyleablePropertyFactory<>(MFXSelectable.getClassCssMetaData());
+        private static final List<CssMetaData<? extends Styleable, ?>> cssMetaDataList;
+
+        private static final CssMetaData<MFXCheckbox, Boolean> ALLOW_INDETERMINATE =
+            FACTORY.createBooleanCssMetaData(
+                "-mfx-allow-indeterminate",
+                    MFXCheckbox::allowIndeterminateProperty,
+                false
+            );
+
+        static {
+            cssMetaDataList = StyleUtils.cssMetaDataList(
+                MFXSelectable.getClassCssMetaData(),
+                ALLOW_INDETERMINATE
+            );
+        }
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.cssMetaDataList;
+    }
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        return getClassCssMetaData();
+    }
+
+    //================================================================================
+    // Getters/Setters
+    //================================================================================
+
+    /**
+     * @return whether the {@link #stateProperty()} is {@link TriState#INDETERMINATE}
+     */
+    public boolean isIndeterminate() {
+        return getState() == TriState.INDETERMINATE;
+    }
+
+    public TriState getState() {
+        return state.get();
+    }
+
+    /**
+     * Specifies the selection state of the checkbox as an enum constant.
+     *
+     * @see TriState
+     */
+    public ObjectProperty<TriState> stateProperty() {
+        return state;
+    }
+
+    public void setState(TriState state) {
+        this.state.set(state);
+    }
+
+    /**
+     * Overridden since checkboxes are a particular type of {@link Selectable}.
+     * <p>
+     * First the given boolean value is converted to a {@link TriState} by using {@link TriState#from(Boolean)}, then
+     * the resulting value is fed to {@link #handleNewState(TriState)} to ensure the new state is valid if the checkbox
+     * is in a {@link SelectionGroup}. Finally, the result of the previous operations is given to {@link #setState(TriState)}.
+     */
+    @Override
+    public void setSelected(boolean selected) {
+        setState(handleNewState(TriState.from(selected)));
+    }
+}
diff --git a/modules/components/src/main/java/io/github/palexdev/mfxcomponents/skins/MFXCheckBoxSkin.java b/modules/components/src/main/java/io/github/palexdev/mfxcomponents/skins/MFXCheckboxSkin.java
similarity index 91%
rename from modules/components/src/main/java/io/github/palexdev/mfxcomponents/skins/MFXCheckBoxSkin.java
rename to modules/components/src/main/java/io/github/palexdev/mfxcomponents/skins/MFXCheckboxSkin.java
index 15654e18..cd46d1b1 100644
--- a/modules/components/src/main/java/io/github/palexdev/mfxcomponents/skins/MFXCheckBoxSkin.java
+++ b/modules/components/src/main/java/io/github/palexdev/mfxcomponents/skins/MFXCheckboxSkin.java
@@ -18,9 +18,9 @@
 
 package io.github.palexdev.mfxcomponents.skins;
 
-import io.github.palexdev.mfxcomponents.behaviors.MFXCheckBoxBehavior;
+import io.github.palexdev.mfxcomponents.behaviors.MFXCheckboxBehavior;
 import io.github.palexdev.mfxcomponents.controls.MaterialSurface;
-import io.github.palexdev.mfxcomponents.controls.checkbox.MFXCheckBox;
+import io.github.palexdev.mfxcomponents.controls.checkbox.MFXCheckbox;
 import io.github.palexdev.mfxcomponents.skins.base.MFXLabeledSkin;
 import io.github.palexdev.mfxcore.observables.When;
 import io.github.palexdev.mfxcore.utils.fx.LayoutUtils;
@@ -37,11 +37,11 @@
 import javafx.scene.paint.Color;
 
 /**
- * Default skin implementation for {@link MFXCheckBox} components, extends {@link MFXLabeledSkin}.
+ * Default skin implementation for {@link MFXCheckbox} components, extends {@link MFXLabeledSkin}.
  * <p></p>
  * The layout is simple. There are only three nodes: one is the box which also contains the check mark icon,
  * then there's the {@link MaterialSurface} node used to represent the various interaction states, and finally the
- * label (which is removed is setting {@link ContentDisplay#GRAPHIC_ONLY}). The box sits on top of the surface, the label
+ * label (which is removed if setting {@link ContentDisplay#GRAPHIC_ONLY}). The box sits on top of the surface, the label
  * at their right.
  * <p>
  * It is allowed to change the checkbox state by clicking on the label too, as the handlers are added on the entire
@@ -49,7 +49,7 @@
  * when events come from outside the surface area, it's desirable to still show the ripple effect, as a 'fallback' they are
  * generated at the center of the box/surface.
  */
-public class MFXCheckBoxSkin extends MFXLabeledSkin<MFXCheckBox, MFXCheckBoxBehavior> {
+public class MFXCheckboxSkin extends MFXLabeledSkin<MFXCheckbox, MFXCheckboxBehavior> {
     //================================================================================
     // Properties
     //================================================================================
@@ -60,7 +60,7 @@ public class MFXCheckBoxSkin extends MFXLabeledSkin<MFXCheckBox, MFXCheckBoxBeha
     //================================================================================
     // Constructors
     //================================================================================
-    public MFXCheckBoxSkin(MFXCheckBox checkBox) {
+    public MFXCheckboxSkin(MFXCheckbox checkBox) {
         super(checkBox);
         initTextMeasurementCache();
 
@@ -91,11 +91,11 @@ public MFXCheckBoxSkin(MFXCheckBox checkBox) {
 
     /**
      * Adds the following listeners:
-     * <p> - A listener on the {@link MFXCheckBox#contentDisplayProperty()} to add/remove the label node
+     * <p> - A listener on the {@link MFXCheckbox#contentDisplayProperty()} to add/remove the label node
      * when the values is/is not {@link ContentDisplay#GRAPHIC_ONLY}.
      */
     private void addListeners() {
-        MFXCheckBox checkBox = getSkinnable();
+        MFXCheckbox checkBox = getSkinnable();
         cdWhen = When.onChanged(checkBox.contentDisplayProperty())
             .then((o, n) -> {
                 if (n == ContentDisplay.GRAPHIC_ONLY) {
@@ -112,8 +112,8 @@ private void addListeners() {
     // Overridden Methods
     //================================================================================
     @Override
-    protected void initBehavior(MFXCheckBoxBehavior behavior) {
-        MFXCheckBox checkBox = getSkinnable();
+    protected void initBehavior(MFXCheckboxBehavior behavior) {
+        MFXCheckbox checkBox = getSkinnable();
         behavior.init();
         handle(checkBox, MouseEvent.MOUSE_PRESSED, behavior::mousePressed);
         handle(checkBox, MouseEvent.MOUSE_RELEASED, behavior::mouseReleased);
@@ -124,7 +124,7 @@ protected void initBehavior(MFXCheckBoxBehavior behavior) {
 
     @Override
     public double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        MFXCheckBox checkBox = getSkinnable();
+        MFXCheckbox checkBox = getSkinnable();
         double gap = checkBox.getGraphicTextGap();
         double insets = leftInset + rightInset;
         double tW = tmCache.getSnappedWidth();
@@ -141,7 +141,7 @@ public double computePrefWidth(double height, double topInset, double rightInset
 
     @Override
     public double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        MFXCheckBox checkBox = getSkinnable();
+        MFXCheckbox checkBox = getSkinnable();
         double insets = topInset + bottomInset;
         double tH = tmCache.getSnappedHeight();
         if (checkBox.getContentDisplay() == ContentDisplay.GRAPHIC_ONLY) tH = 0;
@@ -161,7 +161,7 @@ public double computeMaxHeight(double width, double topInset, double rightInset,
 
     @Override
     protected void layoutChildren(double x, double y, double w, double h) {
-        MFXCheckBox checkBox = getSkinnable();
+        MFXCheckbox checkBox = getSkinnable();
         double gap = checkBox.getGraphicTextGap();
         layoutInArea(surface, x, y, w, h, 0, HPos.LEFT, VPos.CENTER);
         layoutInArea(icon, x, y, surface.getWidth(), surface.getHeight(), 0, HPos.CENTER, VPos.CENTER);
diff --git a/modules/components/src/test/java/app/ComponentsLauncher.java b/modules/components/src/test/java/app/ComponentsLauncher.java
index c4d2cddb..86839cf6 100644
--- a/modules/components/src/test/java/app/ComponentsLauncher.java
+++ b/modules/components/src/test/java/app/ComponentsLauncher.java
@@ -32,7 +32,7 @@ public static void main(String[] args) {
         //System.setProperty("prism.verbose", "true");
         //System.setProperty("javafx.animation.fullspeed", "true");
         System.setProperty("glass.disableGrab", "true");
-        Application.launch(Sandbox.class, args);
+        Application.launch(Showcase.class, args);
     }
 
     public static String load(String name) {
diff --git a/modules/components/src/test/java/app/Sandbox.java b/modules/components/src/test/java/app/Sandbox.java
index 40293d66..699f3645 100644
--- a/modules/components/src/test/java/app/Sandbox.java
+++ b/modules/components/src/test/java/app/Sandbox.java
@@ -20,7 +20,7 @@
 
 import io.github.palexdev.mfxcomponents.controls.buttons.MFXButton;
 import io.github.palexdev.mfxcomponents.controls.buttons.MFXIconButton;
-import io.github.palexdev.mfxcomponents.controls.checkbox.MFXCheckBox;
+import io.github.palexdev.mfxcomponents.controls.checkbox.MFXCheckbox;
 import io.github.palexdev.mfxcomponents.theming.Deployer;
 import io.github.palexdev.mfxcomponents.theming.JavaFXThemes;
 import io.github.palexdev.mfxcomponents.theming.MaterialThemes;
@@ -30,15 +30,14 @@
 import io.github.palexdev.mfxcore.utils.fx.CSSFragment;
 import io.github.palexdev.mfxeffects.animations.motion.M3Motion;
 import javafx.application.Application;
-import javafx.css.Styleable;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
-import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 import javafx.util.Duration;
@@ -67,7 +66,7 @@ public void start(Stage primaryStage) throws Exception {
             .closeSelector()
             .applyOn(iw);*/
 
-        MFXCheckBox cb = new MFXCheckBox("Remember choice");
+        MFXCheckbox cb = new MFXCheckbox("Remember choice");
         cb.setAllowIndeterminate(true);
         cb.addEventHandler(MouseEvent.MOUSE_CLICKED, e -> {
             if (e.getButton() == MouseButton.SECONDARY) cb.setAllowIndeterminate(!cb.isAllowIndeterminate());
@@ -99,14 +98,21 @@ public void start(Stage primaryStage) throws Exception {
         HBox box = new HBox(20, btns.toArray(Node[]::new));
         box.setAlignment(Pos.CENTER);
 
-        CustomDialog cd = CustomDialog.example(pane);
+        CustomDialog cd = CustomDialog.example();
         MFXButton show = new MFXButton("Show").filled();
         show.setOnAction(e -> cd.show());
         MFXButton close = new MFXButton("Close").filled();
-        close.setOnAction(e -> cd.hide());
+        close.setOnAction(e -> {
+            //cd.hide();
+            close.getScene().getWindow().hide();
+        });
         HBox aBox = new HBox(20, show, close);
         aBox.setAlignment(Pos.CENTER);
 
+        MFXTooltip tooltip = new MFXTooltip(close);
+        tooltip.setContent(new MFXPlainContent("Close"));
+        tooltip.install();
+
         pane.getChildren().add(aBox);
         Scene scene = new Scene(pane, 600, 600);
 
@@ -145,26 +151,27 @@ void createTooltip(Node node, String text) {
     }
 
     public static class CustomDialog extends Stage {
-        public CustomDialog(Node content, Parent styleableParent) {
-            StackPane wrapper = new StackPane(content) {
-                @Override
-                public Styleable getStyleableParent() {
-                    return styleableParent;
-                }
-            };
+        public CustomDialog(Node content) {
+            StackPane wrapper = new StackPane(content);
             wrapper.setPrefSize(300, 300);
             wrapper.setStyle("-fx-background-color: -md-sys-color-background");
 
-            Scene scene = new Scene(wrapper);
+            MFXButton close = new MFXButton("Close").outlined();
+            close.setOnAction(e -> hide());
+            MFXTooltip tooltip = new MFXTooltip(close);
+            tooltip.setContent(new MFXPlainContent("Close"));
+            tooltip.install();
+
+            Scene scene = new Scene(new VBox(20, wrapper, close));
             scene.setFill(Color.TRANSPARENT);
             setScene(scene);
             //setOnShown(e -> ScenicView.show(scene));
         }
 
-        public static CustomDialog example(Parent styleableParent) {
-            MFXCheckBox checkBox = new MFXCheckBox("Choice dialog");
+        public static CustomDialog example() {
+            MFXCheckbox checkBox = new MFXCheckbox("Choice dialog");
             checkBox.setStyle("-fx-font-family: 'Comfortaa SemiBold'");
-            return new CustomDialog(checkBox, styleableParent);
+            return new CustomDialog(checkBox);
         }
     }
 }
diff --git a/modules/components/src/test/java/app/Showcase.java b/modules/components/src/test/java/app/Showcase.java
index e905dfaf..c05f732c 100644
--- a/modules/components/src/test/java/app/Showcase.java
+++ b/modules/components/src/test/java/app/Showcase.java
@@ -23,7 +23,7 @@
 import io.github.palexdev.mfxcomponents.controls.buttons.MFXButton;
 import io.github.palexdev.mfxcomponents.controls.buttons.MFXIconButton;
 import io.github.palexdev.mfxcomponents.controls.buttons.MFXSegmentedButton;
-import io.github.palexdev.mfxcomponents.controls.checkbox.MFXCheckBox;
+import io.github.palexdev.mfxcomponents.controls.checkbox.MFXCheckbox;
 import io.github.palexdev.mfxcomponents.controls.fab.MFXFab;
 import io.github.palexdev.mfxcomponents.theming.MaterialThemes;
 import io.github.palexdev.mfxcomponents.theming.enums.FABVariants;
@@ -31,6 +31,8 @@
 import io.github.palexdev.mfxcomponents.theming.enums.PseudoClasses;
 import io.github.palexdev.mfxcore.base.beans.Size;
 import io.github.palexdev.mfxcore.builders.InsetsBuilder;
+import io.github.palexdev.mfxcore.enums.SelectionMode;
+import io.github.palexdev.mfxcore.selection.SelectionGroup;
 import io.github.palexdev.mfxcore.utils.fx.CSSFragment;
 import io.github.palexdev.mfxresources.fonts.MFXFontIcon;
 import javafx.application.Application;
@@ -234,7 +236,7 @@ private Node segmentedButtonsView() {
     }
 
     private Node checkBoxesView() {
-        return createCheckBoxesView("CheckBoxes");
+        return createCheckboxesView("Checkboxes");
     }
 
     // Creators
@@ -419,30 +421,30 @@ private Node createSegmentedButtonsView(String title) {
         return defTP;
     }
 
-    private Node createCheckBoxesView(String title) {
+    private Node createCheckboxesView(String title) {
         TitledFlowPane defTP = new TitledFlowPane(title);
         defTP.setMaxWidth(350);
-        List<Supplier<MFXCheckBox>> generators = new ArrayList<>(List.of(
-            MFXCheckBox::new,
+        List<Supplier<MFXCheckbox>> generators = new ArrayList<>(List.of(
+                MFXCheckbox::new,
             () -> {
-                MFXCheckBox c = new MFXCheckBox();
+                MFXCheckbox c = new MFXCheckbox();
                 c.setDisable(true);
                 return c;
             },
             () -> {
-                MFXCheckBox c = new MFXCheckBox();
+                MFXCheckbox c = new MFXCheckbox();
                 c.setMouseTransparent(true);
                 PseudoClasses.HOVER.setOn(c, true);
                 return c;
             },
             () -> {
-                MFXCheckBox c = new MFXCheckBox();
+                MFXCheckbox c = new MFXCheckbox();
                 c.setMouseTransparent(true);
                 PseudoClasses.FOCUSED.setOn(c, true);
                 return c;
             },
             () -> {
-                MFXCheckBox c = new MFXCheckBox();
+                MFXCheckbox c = new MFXCheckbox();
                 c.setMouseTransparent(true);
                 PseudoClasses.PRESSED.setOn(c, true);
                 return c;
@@ -450,33 +452,41 @@ private Node createCheckBoxesView(String title) {
         ));
 
         // Unchecked
-        for (Supplier<MFXCheckBox> g : generators) {
+        for (Supplier<MFXCheckbox> g : generators) {
             defTP.add(g.get());
         }
 
         // Indeterminate
-        for (Supplier<MFXCheckBox> g : generators) {
-            MFXCheckBox c = g.get();
+        for (Supplier<MFXCheckbox> g : generators) {
+            MFXCheckbox c = g.get();
             c.setAllowIndeterminate(true);
-            c.setIndeterminate(true);
+            c.setState(MFXCheckbox.TriState.INDETERMINATE);
             defTP.add(c);
         }
 
         // Selected
-        for (Supplier<MFXCheckBox> g : generators) {
-            MFXCheckBox c = g.get();
+        for (Supplier<MFXCheckbox> g : generators) {
+            MFXCheckbox c = g.get();
             c.setSelected(true);
             defTP.add(c);
         }
 
         // Error
-        for (Supplier<MFXCheckBox> g : generators) {
-            MFXCheckBox c = g.get();
+        for (Supplier<MFXCheckbox> g : generators) {
+            MFXCheckbox c = g.get();
             c.setAllowIndeterminate(true);
             PseudoClasses.ERROR.setOn(c, true);
             defTP.add(c);
         }
 
+        // Group
+        SelectionGroup sg = new SelectionGroup(SelectionMode.SINGLE, true);
+        for (int i = 0; i < 4; i++) {
+            MFXCheckbox c = new MFXCheckbox("C" + (i + 1));
+            sg.add(c);
+            defTP.add(c);
+        }
+
         return defTP;
     }
 }
diff --git a/modules/components/src/test/java/interactive/TestCheckboxes.java b/modules/components/src/test/java/interactive/TestCheckboxes.java
new file mode 100644
index 00000000..74cb0195
--- /dev/null
+++ b/modules/components/src/test/java/interactive/TestCheckboxes.java
@@ -0,0 +1,301 @@
+/*
+ * Copyright (C) 2023 Parisi Alessandro - alessandro.parisi406@gmail.com
+ * This file is part of MaterialFX (https://github.com/palexdev/MaterialFX)
+ *
+ * MaterialFX is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * MaterialFX is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with MaterialFX. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package interactive;
+
+import io.github.palexdev.mfxcomponents.controls.checkbox.MFXCheckbox;
+import io.github.palexdev.mfxcomponents.theming.MaterialThemes;
+import io.github.palexdev.mfxcomponents.theming.enums.PseudoClasses;
+import io.github.palexdev.mfxcore.builders.InsetsBuilder;
+import io.github.palexdev.mfxcore.enums.SelectionMode;
+import io.github.palexdev.mfxcore.selection.SelectionGroup;
+import javafx.css.PseudoClass;
+import javafx.geometry.Pos;
+import javafx.scene.Scene;
+import javafx.scene.layout.HBox;
+import javafx.stage.Stage;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.testfx.api.FxRobot;
+import org.testfx.api.FxToolkit;
+import org.testfx.framework.junit5.ApplicationExtension;
+import org.testfx.framework.junit5.Start;
+
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+import java.util.stream.IntStream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@ExtendWith(ApplicationExtension.class)
+public class TestCheckboxes {
+
+    @Start
+    private void start(Stage stage) {
+        stage.show();
+    }
+
+    @Test
+    void testTriState(FxRobot robot) {
+        HBox box = setupStage();
+        MFXCheckbox cb = getCheckboxes(1)[0];
+        robot.interact(() -> box.getChildren().setAll(cb));
+
+        cb.setSelected(true);
+        assertCheckbox(cb, MFXCheckbox.TriState.SELECTED);
+
+        cb.setSelected(false);
+        assertCheckbox(cb, MFXCheckbox.TriState.UNSELECTED);
+
+        cb.setState(MFXCheckbox.TriState.SELECTED);
+        assertCheckbox(cb, MFXCheckbox.TriState.SELECTED);
+
+        cb.setState(MFXCheckbox.TriState.UNSELECTED);
+        assertCheckbox(cb, MFXCheckbox.TriState.UNSELECTED);
+
+        robot.clickOn(cb);
+        assertCheckbox(cb, MFXCheckbox.TriState.INDETERMINATE);
+
+        robot.clickOn(cb);
+        assertCheckbox(cb, MFXCheckbox.TriState.SELECTED);
+
+        robot.clickOn(cb);
+        assertCheckbox(cb, MFXCheckbox.TriState.UNSELECTED);
+    }
+
+    @Test
+    void testBinding(FxRobot robot) {
+        HBox box = setupStage();
+        MFXCheckbox[] cbs = getCheckboxes(2);
+        robot.interact(() -> box.getChildren().setAll(cbs));
+
+        cbs[0].stateProperty().bind(cbs[1].stateProperty());
+
+        robot.clickOn(cbs[1]);
+        assertCheckbox(cbs[0], MFXCheckbox.TriState.INDETERMINATE);
+        assertCheckbox(cbs[1], MFXCheckbox.TriState.INDETERMINATE);
+
+        robot.clickOn(cbs[1]);
+        assertCheckbox(cbs[0], MFXCheckbox.TriState.SELECTED);
+        assertCheckbox(cbs[1], MFXCheckbox.TriState.SELECTED);
+
+        robot.clickOn(cbs[1]);
+        assertCheckbox(cbs[0], MFXCheckbox.TriState.UNSELECTED);
+        assertCheckbox(cbs[1], MFXCheckbox.TriState.UNSELECTED);
+    }
+
+    @Test
+    void testGroupMultiple(FxRobot robot) {
+        HBox box = setupStage();
+        MFXCheckbox[] cbs = getCheckboxes(5);
+        robot.interact(() -> box.getChildren().setAll(cbs));
+        SelectionGroup sg = new SelectionGroup(SelectionMode.MULTIPLE);
+        sg.addAll(cbs);
+
+        // Consistency check, all unselected, not allowing INDETERMINATE
+        for (MFXCheckbox cb : cbs) assertCheckbox(cb, MFXCheckbox.TriState.UNSELECTED);
+
+        cbs[1].setSelected(true);
+        cbs[2].setSelected(true);
+        cbs[4].setSelected(true);
+
+        assertCheckbox(cbs[1], MFXCheckbox.TriState.SELECTED);
+        assertCheckbox(cbs[2], MFXCheckbox.TriState.SELECTED);
+        assertCheckbox(cbs[4], MFXCheckbox.TriState.SELECTED);
+        assertEquals(3, sg.getSelection().size());
+        assertTrue(sg.getSelection().containsAll(List.of(cbs[1], cbs[2], cbs[4])));
+    }
+
+    @Test
+    void testGroupMultipleALOS(FxRobot robot) {
+        HBox box = setupStage();
+        MFXCheckbox[] cbs = getCheckboxes(5);
+        robot.interact(() -> box.getChildren().setAll(cbs));
+        SelectionGroup sg = new SelectionGroup(SelectionMode.MULTIPLE, true);
+        sg.addAll(cbs);
+
+        // Consistency check, first selected because of ALOS
+        for (int i = 1; i < 5; i++) assertCheckbox(cbs[i], MFXCheckbox.TriState.UNSELECTED);
+        assertCheckbox(cbs[0], MFXCheckbox.TriState.SELECTED);
+
+        cbs[1].setSelected(true);
+        cbs[4].setSelected(true);
+
+        assertCheckbox(cbs[0], MFXCheckbox.TriState.SELECTED);
+        assertCheckbox(cbs[1], MFXCheckbox.TriState.SELECTED);
+        assertCheckbox(cbs[4], MFXCheckbox.TriState.SELECTED);
+        assertEquals(3, sg.getSelection().size());
+        assertTrue(sg.getSelection().containsAll(List.of(cbs[0], cbs[1], cbs[4])));
+
+        // Deselect all and check
+        for (MFXCheckbox cb : cbs) cb.setSelected(false);
+        for (int i = 0; i < 4; i++) assertCheckbox(cbs[i], MFXCheckbox.TriState.UNSELECTED);
+        assertCheckbox(cbs[4], MFXCheckbox.TriState.SELECTED);
+        assertEquals(1, sg.getSelection().size());
+        assertTrue(sg.getSelection().contains(cbs[4]));
+
+        // Select all and check
+        for (MFXCheckbox cb : cbs) cb.setSelected(true);
+        for (MFXCheckbox cb : cbs) assertCheckbox(cb, MFXCheckbox.TriState.SELECTED);
+        assertEquals(5, sg.getSelection().size());
+        assertTrue(sg.getSelection().containsAll(List.of(cbs)));
+    }
+
+    @Test
+    void testGroupSingle(FxRobot robot) {
+        HBox box = setupStage();
+        MFXCheckbox[] cbs = getCheckboxes(5);
+        robot.interact(() -> box.getChildren().setAll(cbs));
+        SelectionGroup sg = new SelectionGroup();
+        sg.addAll(cbs);
+
+        // Consistency check, all unselected, not allowing INDETERMINATE
+        for (MFXCheckbox cb : cbs) assertCheckbox(cb, MFXCheckbox.TriState.UNSELECTED);
+
+        cbs[1].setSelected(true);
+        assertEquals(1, sg.getSelection().size());
+        assertTrue(sg.getSelection().contains(cbs[1]));
+
+        cbs[0].setSelected(true);
+        cbs[4].setSelected(true);
+        assertEquals(1, sg.getSelection().size());
+        assertTrue(sg.getSelection().contains(cbs[4]));
+
+        // Consistency check
+        for (int i = 0; i < 4; i++) assertCheckbox(cbs[i], MFXCheckbox.TriState.UNSELECTED);
+        assertCheckbox(cbs[4], MFXCheckbox.TriState.SELECTED);
+
+        // Deselect and select all
+        cbs[4].setSelected(false);
+        for (MFXCheckbox cb : cbs) cb.setSelected(true);
+
+        for (int i = 0; i < 4; i++) assertCheckbox(cbs[i], MFXCheckbox.TriState.UNSELECTED);
+        assertCheckbox(cbs[4], MFXCheckbox.TriState.SELECTED);
+    }
+
+    @Test
+    void testGroupSingle2(FxRobot robot) {
+        HBox box = setupStage();
+        MFXCheckbox[] cbs = getCheckboxes(5);
+        robot.interact(() -> box.getChildren().setAll(cbs));
+        SelectionGroup sg = new SelectionGroup();
+
+        // Select before adding
+        cbs[2].setSelected(true);
+        cbs[4].setSelected(true);
+        sg.addAll(cbs);
+
+        for (int i = 0; i < 4; i++) assertCheckbox(cbs[i], MFXCheckbox.TriState.UNSELECTED);
+        assertCheckbox(cbs[4], MFXCheckbox.TriState.SELECTED);
+        assertEquals(1, sg.getSelection().size());
+        assertTrue(sg.getSelection().contains(cbs[4]));
+    }
+
+    @Test
+    void testGroupSingleALOS(FxRobot robot) {
+        HBox box = setupStage();
+        MFXCheckbox[] cbs = getCheckboxes(5);
+        robot.interact(() -> box.getChildren().setAll(cbs));
+        SelectionGroup sg = new SelectionGroup(SelectionMode.SINGLE, true);
+        sg.addAll(cbs);
+
+        // Consistency check, only first selected
+        for (int i = 1; i < 5; i++) assertCheckbox(cbs[i], MFXCheckbox.TriState.UNSELECTED);
+        assertCheckbox(cbs[0], MFXCheckbox.TriState.SELECTED);
+        assertEquals(1, sg.getSelection().size());
+        assertTrue(sg.getSelection().contains(cbs[0]));
+
+        cbs[0].setSelected(false);
+        assertCheckbox(cbs[0], MFXCheckbox.TriState.SELECTED);
+        assertEquals(1, sg.getSelection().size());
+        assertTrue(sg.getSelection().contains(cbs[0]));
+
+        cbs[1].setSelected(true);
+        assertCheckbox(cbs[0], MFXCheckbox.TriState.UNSELECTED);
+        assertCheckbox(cbs[1], MFXCheckbox.TriState.SELECTED);
+        assertEquals(1, sg.getSelection().size());
+        assertTrue(sg.getSelection().contains(cbs[1]));
+
+        // Deselect all
+        for (MFXCheckbox cb : cbs) cb.setSelected(false);
+        assertCheckbox(cbs[1], MFXCheckbox.TriState.SELECTED);
+        assertEquals(1, sg.getSelection().size());
+        assertTrue(sg.getSelection().contains(cbs[1]));
+
+        // Select all
+        for (MFXCheckbox cb : cbs) cb.setSelected(true);
+        assertCheckbox(cbs[1], MFXCheckbox.TriState.UNSELECTED);
+        assertCheckbox(cbs[4], MFXCheckbox.TriState.SELECTED);
+        assertEquals(1, sg.getSelection().size());
+        assertTrue(sg.getSelection().contains(cbs[4]));
+    }
+
+    @Test
+    void testGroupMisc(FxRobot robot) {
+        HBox box = setupStage();
+        MFXCheckbox[] cbs = getCheckboxes(5);
+        robot.interact(() -> box.getChildren().setAll(cbs));
+        SelectionGroup sg = new SelectionGroup();
+        sg.addAll(cbs);
+
+        for (MFXCheckbox cb : cbs) cb.setAllowIndeterminate(true);
+        for (MFXCheckbox cb : cbs) {
+            assertFalse(cb.isAllowIndeterminate());
+            assertCheckbox(cb, MFXCheckbox.TriState.UNSELECTED);
+        }
+    }
+
+    void assertCheckbox(MFXCheckbox cb, MFXCheckbox.TriState state) {
+        assertEquals(state, cb.getState());
+        assertEquals(state == MFXCheckbox.TriState.SELECTED, cb.isSelected());
+        if (cb.getSelectionGroup() != null) {
+            assertFalse(cb.isAllowIndeterminate());
+        }
+
+        PseudoClass pc = null;
+        switch (state) {
+            case SELECTED -> pc = PseudoClasses.SELECTED.getPseudoClass();
+            case INDETERMINATE -> pc = PseudoClasses.INDETERMINATE.getPseudoClass();
+        }
+        if (pc != null) assertTrue(cb.getPseudoClassStates().contains(pc));
+    }
+
+    MFXCheckbox[] getCheckboxes(int n) {
+        return IntStream.range(0, n)
+                .mapToObj(i -> {
+                    MFXCheckbox cb = new MFXCheckbox("C" + (i + 1));
+                    cb.setAllowIndeterminate(true);
+                    return cb;
+                })
+                .toArray(MFXCheckbox[]::new);
+    }
+
+    private HBox setupStage() {
+        HBox box = new HBox(20);
+        box.setAlignment(Pos.CENTER_LEFT);
+        box.setPadding(InsetsBuilder.all(5));
+        try {
+            Scene scene = new Scene(box, 400, 200);
+            MaterialThemes.PURPLE_LIGHT.applyOn(scene);
+            FxToolkit.setupStage(s -> s.setScene(scene));
+        } catch (TimeoutException e) {
+            throw new RuntimeException(e);
+        }
+        return box;
+    }
+}
diff --git a/modules/core/CHANGELOG.md b/modules/core/CHANGELOG.md
index b7d7acf3..9f45ae98 100644
--- a/modules/core/CHANGELOG.md
+++ b/modules/core/CHANGELOG.md
@@ -16,6 +16,18 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 [//]: ##[Unreleased]
 
+## [11.6.4] - 24-08-2023
+
+## Changed
+
+- SelectionProperty: reviewed invalidation logic. The core part has been moved to the invalidated() method, this allows
+  bindings to work, as well as simplifying the process
+- SelectionGroup: reviewed for the above changes
+
+## Fixed
+
+- SelectionGroup: fixed MultipleSelectionHandler logic
+
 ## [11.6.3] - 01-06-2023
 
 ### Changed
@@ -80,7 +92,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Added
 
-- Introducing the Selection API that will be used by components such as check boxes, radio buttons, switches and such.
+- Introducing the Selection API that will be used by components such as checkboxes, radio buttons, switches and such.
   However, the API has been developed to be as general purpose as possible, meaning that it can be used with anything
   implementing the needed interface
 - Added tests for the new Selection API
diff --git a/modules/core/src/main/java/io/github/palexdev/mfxcore/selection/SelectionGroup.java b/modules/core/src/main/java/io/github/palexdev/mfxcore/selection/SelectionGroup.java
index a3ff1f82..143b9b70 100644
--- a/modules/core/src/main/java/io/github/palexdev/mfxcore/selection/SelectionGroup.java
+++ b/modules/core/src/main/java/io/github/palexdev/mfxcore/selection/SelectionGroup.java
@@ -17,13 +17,13 @@
  * A {@code SelectionGroup} will work with anything that implements the necessary API described by the {@link Selectable}
  * interface. Not only that, it is also a lot more flexible and convenient.
  * <p>
- * You can set the selection to be single or multiple by just setting the {@link #selectionModeProperty()}, as well as
+ * You can set the selection to be single or multiple, by just setting the {@link #selectionModeProperty()}, as well as
  * tell the group to always keep at least one {@link Selectable} active, by setting the {@link #atLeastOneSelectedProperty()}
  * to true. All of these can be changed anytime, although you better know the side effects of some particular cases, will
  * be listed below.
  * <p>
  * So you now have a grouping API for everything, not only controls, as long as they implement {@link Selectable}, and you
- * also have capabilities such as 'atMost/atLeast one selected', in single and multiple configurations, in just one class!
+ * also have capabilities such as 'at most/at least one selected', in single and multiple configurations, in just one class!
  * <p></p>
  * All of this sounds good right? Well, there are some caveats of course.
  * <p>
@@ -39,10 +39,10 @@
  * in the Set. The usage of such collections vastly helps to avoid duplicates while also having fast lookups (contains).
  * <p></p>
  * <b>Special cases when changing config</b>
- * <p> 1) When switching from MULTIPLE to SINGLE selection mode, the selection will be the same only and only is there was
- * only {@code Selectable} in the selection Set, in all other cases the selection is cleared!
+ * <p> 1) When switching from MULTIPLE to SINGLE selection mode, the selection will be the same only and only if there was
+ * only one {@code Selectable} in the selection Set, in all other cases the selection is <b>cleared!</b>
  * <p> 2) When activating the 'atLeastOneSelected' mode, if there are {@code Selectables} in the group the first will
- * be immediately selected! If none is available, the first added to the group will be!
+ * be immediately selected! If none is available, the first added to the group will be.
  * <p> 3) If 'atLeastOneSelected' mode is active and multiple {@code Selectables} are added at the same time to the group,
  * and two or more of them are selected, the last will prevail, the others will be deselected (if in SINGLE selection mode)
  * <p></p>
@@ -108,17 +108,24 @@ public SelectionGroup(SelectionMode selectionMode, boolean atLeastOneSelected) {
      * Adds the given {@link Selectable} to this group (if not already present).
      * <p></p>
      * If the given {@code Selectable}'s group is not the same as this, {@link Selectable#setSelectionGroup(SelectionGroup)}
-     * is also called.
-     * <p>
-     * Last but not least, {@link #refresh(Selectable)} is called to ensure that the group' state is right.
+     * is also called. See {@link SelectionGroupProperty}.
+     * <p></p>
+     * When adding a {@code Selectable} to a group, there are a bunch of things to consider. The group has no guarantees
+     * that the given objects are in a state such that its rules won't be broken. For this reason, it's mandatory to perform
+     * a check on the {@code Selectable}'s state by invoking {@link #handleSelection(Selectable, boolean)}. If the returned
+     * correct state is different then it's important to also fix it by invoking {@link Selectable#setSelected(boolean)}.
      */
     public SelectionGroup add(Selectable selectable) {
         if (selectable == null || selectables.contains(selectable)) return this;
         selectables.add(selectable);
 
         SelectionGroup group = selectable.getSelectionGroup();
-        if (group != this) selectable.setSelectionGroup(this);
-        refresh(selectable);
+        if (group != this) {
+            selectable.setSelectionGroup(this);
+
+            boolean state = handler.handle(selectable, selectable.isSelected());
+            selectable.setSelected(state);
+        }
         return this;
     }
 
@@ -211,9 +218,12 @@ public boolean check(Selectable selectable, boolean state) {
      * would break the rules of the {@link SelectionGroup}. In other words, when the state is requested to switch to
      * selected/deselected, the property first asks the group if it is allowed, in case it is not, the {@code newValue}
      * parameter is "corrected".
+     * <p></p>
+     * The difference between this and {@link #check(Selectable, boolean)} is that other than returning the correct state for
+     * the given {@link Selectable}, this will also modify the state of the group. In fact, according to the returned state,
+     * the given {@link Selectable} will be also added/removed to/from the selection Set ({@link #getSelection()}).
      */
     protected boolean handleSelection(Selectable selectable, boolean state) {
-        assert selectable != null;
         if (!selectables.contains(selectable)) return state;
         return handler.handle(selectable, state);
     }
@@ -256,12 +266,21 @@ protected void onSelectionChanged(SetChangeListener.Change<? extends Selectable>
     }
 
     /**
-     * Forces the {@link SelectionProperty} of the given {@link Selectable} to re-execute its {@code set(...)} method,
-     * which will then trigger the {@link #handleSelection(Selectable, boolean)} method and thus ensuring that the
-     * group' state is correct.
+     * @return the state of a special flag that indicates whether changes currently occurring in the group are caused
+     * by a "switch" operation. This occurs when the group is in SINGLE selection mode, and a {@link Selectable} is going
+     * to take the place of another one (the current selected).
+     * <p></p>
+     * More details: this flag is set to true when the selection Set is going to be cleared so that the new {@code Selectable}
+     * can take its place. The flag is reset immediately after. However, before the reset, listeners attached to the selection
+     * Set will trigger causing the {@link #handleSelection(Selectable, boolean)} to trigger again. This can be problematic
+     * when the "At least one selected" feature is on because since the "switch" process has not been completed yet, the
+     * group will try to select the first {@code Selectable} in the {@link #getSelectables()} Set, so that the rule is
+     * respected. This behavior is undesired, the flag will stop the group from doing this, afterward the "switch" process
+     * is completed.
+     *
      */
-    protected void refresh(Selectable selectable) {
-        selectable.setSelected(selectable.isSelected());
+    public boolean isSwitching() {
+        return isSwitching;
     }
 
     //================================================================================
@@ -280,7 +299,7 @@ public boolean check(Selectable selectable, boolean state) {
             if (!selectables.contains(selectable)) return state;
             if (!state) {
                 if (isAtLeastOneSelected()) {
-                    return !isSwitching && (selection.size() == 1 && selection.contains(selectable) || selection.isEmpty());
+                    return !isSwitching() && (selection.size() == 1 && selection.contains(selectable) || selection.isEmpty());
                 }
                 return false;
             }
@@ -291,7 +310,7 @@ public boolean check(Selectable selectable, boolean state) {
         public boolean handle(Selectable selectable, boolean state) {
             if (!state) {
                 if (isAtLeastOneSelected()) {
-                    if (isSwitching) {
+                    if (isSwitching()) {
                         selection.remove(selectable);
                         return false;
                     }
@@ -319,13 +338,28 @@ public boolean handle(Selectable selectable, boolean state) {
     class MultipleSelectionHandler implements SelectionHandler {
         @Override
         public boolean check(Selectable selectable, boolean state) {
-            return !selectables.contains(selectable) ? state : state || isAtLeastOneSelected() && selection.size() == 1;
+            if (!selectables.contains(selectable)) return state;
+            if (!state) {
+                if (isAtLeastOneSelected()) {
+                    return (selection.size() == 1 && selection.contains(selectable)) || selection.isEmpty();
+                }
+                return false;
+            }
+            return true;
         }
 
         @Override
         public boolean handle(Selectable selectable, boolean state) {
             if (!state) {
-                if (isAtLeastOneSelected() && selection.size() == 1) return true;
+                if (isAtLeastOneSelected()) {
+                    if (selection.size() == 1 && selection.contains(selectable)) {
+                        return true;
+                    }
+                    if (selection.isEmpty()) {
+                        selection.add(selectable);
+                        return true;
+                    }
+                }
                 selection.remove(selectable);
                 return false;
             }
diff --git a/modules/core/src/main/java/io/github/palexdev/mfxcore/selection/SelectionProperty.java b/modules/core/src/main/java/io/github/palexdev/mfxcore/selection/SelectionProperty.java
index e9d0edcd..47361685 100644
--- a/modules/core/src/main/java/io/github/palexdev/mfxcore/selection/SelectionProperty.java
+++ b/modules/core/src/main/java/io/github/palexdev/mfxcore/selection/SelectionProperty.java
@@ -33,7 +33,7 @@ public SelectionProperty(Selectable selectable) {
         this.selectable = selectable;
     }
 
-    public SelectionProperty(boolean initialValue, Selectable selectable) {
+    public SelectionProperty(Selectable selectable, boolean initialValue) {
         super(initialValue);
         this.selectable = selectable;
     }
@@ -48,20 +48,48 @@ public SelectionProperty(boolean initialValue, Selectable selectable) {
      * Overridden to correctly handle the selection state (true|false) when the {@link Selectable} is/is not in a
      * {@link SelectionGroup}.
      * <p>
-     * When it is in a group, the {@code newValue} is given by {@link SelectionGroup#handleSelection(Selectable, boolean)}.
+     * When it is in a group, the {@code newValue} is given by {@link SelectionGroup#check(Selectable, boolean)}.
      * This is because there are cases in which the selection cannot be set to true/false at the user will,
      * the group's rules will prevail.
      * <p></p>
-     * For example you the group will not allow a {@link Selectable} to be deselected if {@link SelectionGroup#isAtLeastOneSelected()}
+     * For example the group will not allow a {@link Selectable} to be deselected if {@link SelectionGroup#isAtLeastOneSelected()}
      * is true and it is the only one present in the selection list. Cases like this, but not limited to, must be handled
      * by the group.
+     * <p></p>
+     * Now there can be two cases:
+     * <p> 1) The returned state is "selected" and the group' selection Set doesn't contain the {@code Selectable}
+     * <p> 2) The returned state is "deselected" and the group' selection Set contains the {@code Selectable}
+     * <p>
+     * In either cases the {@link #invalidated()} is invoked!
      */
     @Override
     public void set(boolean newValue) {
-        boolean oldValue = get();
         SelectionGroup group = selectable.getSelectionGroup();
-        if (group != null) newValue = group.handleSelection(selectable, newValue);
-        if (newValue == oldValue) return;
+        if (group != null) {
+            newValue = group.check(selectable, newValue);
+            if ((newValue && !group.getSelection().contains(selectable)) ||
+                    !newValue && group.getSelection().contains(selectable)) {
+                invalidated();
+            }
+        }
         super.set(newValue);
     }
+
+    /**
+     * {@inheritDoc}
+     * <p></p>
+     * Overridden to update the {@link SelectionGroup} assigned to the {@link Selectable} handled by this property.
+     * <p>
+     * If the {@code Selectable} is in a group, and the selection state has changed (or additional checks decide that
+     * invalidation is needed, see {@link #set(boolean)}), then {@link SelectionGroup#handleSelection(Selectable, boolean)}.
+     * <p>
+     * Last but not least, note that the invalidation doesn't occur if the group is changing its state due to a "switch"
+     * operation, see {@link SelectionGroup#isSwitching()}.
+     */
+    @Override
+    protected void invalidated() {
+        SelectionGroup group = selectable.getSelectionGroup();
+        if (group != null && !group.isSwitching())
+            group.handleSelection(selectable, get());
+    }
 }
diff --git a/modules/core/src/test/java/interactive/TestSelectionGroup.java b/modules/core/src/test/java/interactive/TestSelectionGroup.java
index 604fd7bd..2b6d35ef 100644
--- a/modules/core/src/test/java/interactive/TestSelectionGroup.java
+++ b/modules/core/src/test/java/interactive/TestSelectionGroup.java
@@ -256,6 +256,22 @@ void testMultiple2(FxRobot robot) {
         )));
     }
 
+    @Test
+    void testMultiple3(FxRobot robot) {
+        HBox box = setupStage();
+        List<DummySelectable> selectables = buildSelectables(5);
+        robot.interact(() -> box.getChildren().addAll(selectables));
+
+        SelectionGroup group = new SelectionGroup(SelectionMode.MULTIPLE, true);
+        group.addAll(selectables);
+
+
+        assertEquals(1, group.getSelection().size());
+        assertTrue(group.getSelection().contains(selectables.get(0)));
+
+        for (int i = 1; i < 5; i++) assertFalse(selectables.get(i).isSelected());
+    }
+
     @Test
     void testAtLeastOne(FxRobot robot) {
         HBox box = setupStage();
@@ -576,6 +592,7 @@ public static class DummySelectable extends Rectangle implements Selectable {
         private final SelectionProperty selected = new SelectionProperty(this) {
             @Override
             protected void invalidated() {
+                super.invalidated();
                 pseudoClassStateChanged(SELECTED, get());
             }
         };
diff --git a/modules/resources/CHANGELOG.md b/modules/resources/CHANGELOG.md
index 9cf3f90d..f345742e 100644
--- a/modules/resources/CHANGELOG.md
+++ b/modules/resources/CHANGELOG.md
@@ -30,7 +30,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Added
 
-- Added stylesheets for MFXCheckBox
+- Added stylesheets for MFXCheckbox
 - Added new theme, indigo color
 
 ### Fixed
diff --git a/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/components/checkbox/_checkbox.scss b/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/components/checkbox/_checkbox.scss
index 6fd54044..eebc10dc 100644
--- a/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/components/checkbox/_checkbox.scss
+++ b/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/components/checkbox/_checkbox.scss
@@ -17,7 +17,7 @@ $text-color: Theme.GetSchemeColor('on-surface') !default;
 $ripple-color: Ripple.Ripple('primary') !default;
 
 /****************************************************************************************************
- * Check Boxes
+ * Checkboxes
  ****************************************************************************************************/
 .mfx-checkbox {
   @include Typography.LabelLarge();
diff --git a/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-indigo-dark.css b/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-indigo-dark.css
index f1d1d657..ebf19919 100644
--- a/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-indigo-dark.css
+++ b/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-indigo-dark.css
@@ -362,7 +362,7 @@
 }
 
 /****************************************************************************************************
- * Check Boxes
+ * Checkboxes
  ****************************************************************************************************/
 .mfx-checkbox {
   -fx-font-family: "Roboto Medium";
diff --git a/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-indigo-light.css b/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-indigo-light.css
index 6a913bca..4b2ee105 100644
--- a/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-indigo-light.css
+++ b/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-indigo-light.css
@@ -1,143 +1,143 @@
 @import '../../fonts/Fonts.css';
 .root {
-    /* Palette */
-    -md-source: #4355b9;
-    -md-ref-palette-primary0: #000000;
-    -md-ref-palette-primary10: #00105c;
-    -md-ref-palette-primary20: #08218a;
-    -md-ref-palette-primary30: #293ca0;
-    -md-ref-palette-primary40: #4355b9;
-    -md-ref-palette-primary50: #5d6fd4;
-    -md-ref-palette-primary60: #7789f0;
-    -md-ref-palette-primary70: #97a5ff;
-    -md-ref-palette-primary80: #bac3ff;
-    -md-ref-palette-primary90: #dee0ff;
-    -md-ref-palette-primary95: #f0efff;
-    -md-ref-palette-primary99: #fefbff;
-    -md-ref-palette-primary100: #ffffff;
-    -md-ref-palette-secondary0: #000000;
-    -md-ref-palette-secondary10: #390033;
-    -md-ref-palette-secondary20: #57124e;
-    -md-ref-palette-secondary30: #722b66;
-    -md-ref-palette-secondary40: #8d437f;
-    -md-ref-palette-secondary50: #aa5c99;
-    -md-ref-palette-secondary60: #c775b4;
-    -md-ref-palette-secondary70: #e58fd0;
-    -md-ref-palette-secondary80: #fface9;
-    -md-ref-palette-secondary90: #ffd7f1;
-    -md-ref-palette-secondary95: #ffecf6;
-    -md-ref-palette-secondary99: #fffbff;
-    -md-ref-palette-secondary100: #ffffff;
-    -md-ref-palette-tertiary0: #000000;
-    -md-ref-palette-tertiary10: #000d5f;
-    -md-ref-palette-tertiary20: #192678;
-    -md-ref-palette-tertiary30: #323f90;
-    -md-ref-palette-tertiary40: #4b57a9;
-    -md-ref-palette-tertiary50: #6471c4;
-    -md-ref-palette-tertiary60: #7e8ae0;
-    -md-ref-palette-tertiary70: #99a5fd;
-    -md-ref-palette-tertiary80: #bbc3ff;
-    -md-ref-palette-tertiary90: #dfe0ff;
-    -md-ref-palette-tertiary95: #f0efff;
-    -md-ref-palette-tertiary99: #fffbff;
-    -md-ref-palette-tertiary100: #ffffff;
-    -md-ref-palette-error0: #000000;
-    -md-ref-palette-error10: #410002;
-    -md-ref-palette-error20: #690004;
-    -md-ref-palette-error30: #930009;
-    -md-ref-palette-error40: #ba1a1a;
-    -md-ref-palette-error50: #de372f;
-    -md-ref-palette-error60: #ff5449;
-    -md-ref-palette-error70: #ff897d;
-    -md-ref-palette-error80: #ffb4ab;
-    -md-ref-palette-error90: #ffdad5;
-    -md-ref-palette-error95: #ffedea;
-    -md-ref-palette-error99: #fffbff;
-    -md-ref-palette-error100: #ffffff;
-    -md-ref-palette-neutral0: #000000;
-    -md-ref-palette-neutral4: #0e0e11;
-    -md-ref-palette-neutral6: #131316;
-    -md-ref-palette-neutral10: #1b1b1f;
-    -md-ref-palette-neutral12: #1f1f23;
-    -md-ref-palette-neutral17: #2a2a2d;
-    -md-ref-palette-neutral20: #303034;
-    -md-ref-palette-neutral22: #353438;
-    -md-ref-palette-neutral24: #39393c;
-    -md-ref-palette-neutral30: #47464a;
-    -md-ref-palette-neutral40: #5f5e62;
-    -md-ref-palette-neutral50: #78767a;
-    -md-ref-palette-neutral60: #929094;
-    -md-ref-palette-neutral70: #acaaaf;
-    -md-ref-palette-neutral80: #c8c5ca;
-    -md-ref-palette-neutral87: #dcd9de;
-    -md-ref-palette-neutral90: #e4e1e6;
-    -md-ref-palette-neutral92: #eae7ec;
-    -md-ref-palette-neutral94: #f0edf1;
-    -md-ref-palette-neutral95: #f3f0f4;
-    -md-ref-palette-neutral96: #f6f2f7;
-    -md-ref-palette-neutral98: #fbf8fd;
-    -md-ref-palette-neutral99: #fefbff;
-    -md-ref-palette-neutral100: #ffffff;
-    -md-ref-palette-neutral-variant0: #000000;
-    -md-ref-palette-neutral-variant10: #1a1b23;
-    -md-ref-palette-neutral-variant20: #2f3038;
-    -md-ref-palette-neutral-variant30: #46464f;
-    -md-ref-palette-neutral-variant40: #5d5e67;
-    -md-ref-palette-neutral-variant50: #767680;
-    -md-ref-palette-neutral-variant60: #90909a;
-    -md-ref-palette-neutral-variant70: #abaab4;
-    -md-ref-palette-neutral-variant80: #c7c5d0;
-    -md-ref-palette-neutral-variant90: #e3e1ec;
-    -md-ref-palette-neutral-variant95: #f1effa;
-    -md-ref-palette-neutral-variant99: #fefbff;
-    -md-ref-palette-neutral-variant100: #ffffff;
-    /* Scheme */
-    -md-sys-color-primary: #4355b9;
-    -md-sys-color-primary-container: #dee0ff;
-    -md-sys-color-on-primary: #ffffff;
-    -md-sys-color-on-primary-container: #00105c;
-    -md-sys-color-inverse-primary: #bac3ff;
-    -md-sys-color-secondary: #8d437f;
-    -md-sys-color-secondary-container: #ffd7f1;
-    -md-sys-color-on-secondary: #ffffff;
-    -md-sys-color-on-secondary-container: #390033;
-    -md-sys-color-tertiary: #4b57a9;
-    -md-sys-color-tertiary-container: #dfe0ff;
-    -md-sys-color-on-tertiay: #ffffff;
-    -md-sys-color-on-tertiary-container: #000d5f;
-    -md-sys-color-error: #ba1a1a;
-    -md-sys-color-error-container: #ffdad5;
-    -md-sys-color-on-error: #ffffff;
-    -md-sys-color-on-error-container: #410002;
-    -md-sys-color-surface: #fbf8fd;
-    -md-sys-color-surface-dim: #dcd9de;
-    -md-sys-color-surface-bright: #fbf8fd;
-    -md-sys-color-surface-container-lowest: #ffffff;
-    -md-sys-color-surface-container-low: #f6f2f7;
-    -md-sys-color-surface-container: #f0edf1;
-    -md-sys-color-surface-container-high: #eae7ec;
-    -md-sys-color-surface-container-highest: #e4e1e6;
-    -md-sys-color-surface-variant: #e3e1ec;
-    -md-sys-color-on-surface: #1b1b1f;
-    -md-sys-color-on-surface-variant: #46464f;
-    -md-sys-color-inverse-surface: #303034;
-    -md-sys-color-inverse-on-surface: #f3f0f4;
-    -md-sys-color-surface-tint: #4355b9;
-    -md-sys-color-background: #fbf8fd;
-    -md-sys-color-on-background: #1b1b1f;
-    -md-sys-color-outline: #767680;
-    -md-sys-color-outline-variant: #c7c5d0;
-    -md-sys-color-shadow: #000000;
-    -md-sys-color-scrim: #000000;
+  /* Palette */
+  -md-source: #4355b9;
+  -md-ref-palette-primary0: #000000;
+  -md-ref-palette-primary10: #00105c;
+  -md-ref-palette-primary20: #08218a;
+  -md-ref-palette-primary30: #293ca0;
+  -md-ref-palette-primary40: #4355b9;
+  -md-ref-palette-primary50: #5d6fd4;
+  -md-ref-palette-primary60: #7789f0;
+  -md-ref-palette-primary70: #97a5ff;
+  -md-ref-palette-primary80: #bac3ff;
+  -md-ref-palette-primary90: #dee0ff;
+  -md-ref-palette-primary95: #f0efff;
+  -md-ref-palette-primary99: #fefbff;
+  -md-ref-palette-primary100: #ffffff;
+  -md-ref-palette-secondary0: #000000;
+  -md-ref-palette-secondary10: #390033;
+  -md-ref-palette-secondary20: #57124e;
+  -md-ref-palette-secondary30: #722b66;
+  -md-ref-palette-secondary40: #8d437f;
+  -md-ref-palette-secondary50: #aa5c99;
+  -md-ref-palette-secondary60: #c775b4;
+  -md-ref-palette-secondary70: #e58fd0;
+  -md-ref-palette-secondary80: #fface9;
+  -md-ref-palette-secondary90: #ffd7f1;
+  -md-ref-palette-secondary95: #ffecf6;
+  -md-ref-palette-secondary99: #fffbff;
+  -md-ref-palette-secondary100: #ffffff;
+  -md-ref-palette-tertiary0: #000000;
+  -md-ref-palette-tertiary10: #000d5f;
+  -md-ref-palette-tertiary20: #192678;
+  -md-ref-palette-tertiary30: #323f90;
+  -md-ref-palette-tertiary40: #4b57a9;
+  -md-ref-palette-tertiary50: #6471c4;
+  -md-ref-palette-tertiary60: #7e8ae0;
+  -md-ref-palette-tertiary70: #99a5fd;
+  -md-ref-palette-tertiary80: #bbc3ff;
+  -md-ref-palette-tertiary90: #dfe0ff;
+  -md-ref-palette-tertiary95: #f0efff;
+  -md-ref-palette-tertiary99: #fffbff;
+  -md-ref-palette-tertiary100: #ffffff;
+  -md-ref-palette-error0: #000000;
+  -md-ref-palette-error10: #410002;
+  -md-ref-palette-error20: #690004;
+  -md-ref-palette-error30: #930009;
+  -md-ref-palette-error40: #ba1a1a;
+  -md-ref-palette-error50: #de372f;
+  -md-ref-palette-error60: #ff5449;
+  -md-ref-palette-error70: #ff897d;
+  -md-ref-palette-error80: #ffb4ab;
+  -md-ref-palette-error90: #ffdad5;
+  -md-ref-palette-error95: #ffedea;
+  -md-ref-palette-error99: #fffbff;
+  -md-ref-palette-error100: #ffffff;
+  -md-ref-palette-neutral0: #000000;
+  -md-ref-palette-neutral4: #0e0e11;
+  -md-ref-palette-neutral6: #131316;
+  -md-ref-palette-neutral10: #1b1b1f;
+  -md-ref-palette-neutral12: #1f1f23;
+  -md-ref-palette-neutral17: #2a2a2d;
+  -md-ref-palette-neutral20: #303034;
+  -md-ref-palette-neutral22: #353438;
+  -md-ref-palette-neutral24: #39393c;
+  -md-ref-palette-neutral30: #47464a;
+  -md-ref-palette-neutral40: #5f5e62;
+  -md-ref-palette-neutral50: #78767a;
+  -md-ref-palette-neutral60: #929094;
+  -md-ref-palette-neutral70: #acaaaf;
+  -md-ref-palette-neutral80: #c8c5ca;
+  -md-ref-palette-neutral87: #dcd9de;
+  -md-ref-palette-neutral90: #e4e1e6;
+  -md-ref-palette-neutral92: #eae7ec;
+  -md-ref-palette-neutral94: #f0edf1;
+  -md-ref-palette-neutral95: #f3f0f4;
+  -md-ref-palette-neutral96: #f6f2f7;
+  -md-ref-palette-neutral98: #fbf8fd;
+  -md-ref-palette-neutral99: #fefbff;
+  -md-ref-palette-neutral100: #ffffff;
+  -md-ref-palette-neutral-variant0: #000000;
+  -md-ref-palette-neutral-variant10: #1a1b23;
+  -md-ref-palette-neutral-variant20: #2f3038;
+  -md-ref-palette-neutral-variant30: #46464f;
+  -md-ref-palette-neutral-variant40: #5d5e67;
+  -md-ref-palette-neutral-variant50: #767680;
+  -md-ref-palette-neutral-variant60: #90909a;
+  -md-ref-palette-neutral-variant70: #abaab4;
+  -md-ref-palette-neutral-variant80: #c7c5d0;
+  -md-ref-palette-neutral-variant90: #e3e1ec;
+  -md-ref-palette-neutral-variant95: #f1effa;
+  -md-ref-palette-neutral-variant99: #fefbff;
+  -md-ref-palette-neutral-variant100: #ffffff;
+  /* Scheme */
+  -md-sys-color-primary: #4355b9;
+  -md-sys-color-primary-container: #dee0ff;
+  -md-sys-color-on-primary: #ffffff;
+  -md-sys-color-on-primary-container: #00105c;
+  -md-sys-color-inverse-primary: #bac3ff;
+  -md-sys-color-secondary: #8d437f;
+  -md-sys-color-secondary-container: #ffd7f1;
+  -md-sys-color-on-secondary: #ffffff;
+  -md-sys-color-on-secondary-container: #390033;
+  -md-sys-color-tertiary: #4b57a9;
+  -md-sys-color-tertiary-container: #dfe0ff;
+  -md-sys-color-on-tertiay: #ffffff;
+  -md-sys-color-on-tertiary-container: #000d5f;
+  -md-sys-color-error: #ba1a1a;
+  -md-sys-color-error-container: #ffdad5;
+  -md-sys-color-on-error: #ffffff;
+  -md-sys-color-on-error-container: #410002;
+  -md-sys-color-surface: #fbf8fd;
+  -md-sys-color-surface-dim: #dcd9de;
+  -md-sys-color-surface-bright: #fbf8fd;
+  -md-sys-color-surface-container-lowest: #ffffff;
+  -md-sys-color-surface-container-low: #f6f2f7;
+  -md-sys-color-surface-container: #f0edf1;
+  -md-sys-color-surface-container-high: #eae7ec;
+  -md-sys-color-surface-container-highest: #e4e1e6;
+  -md-sys-color-surface-variant: #e3e1ec;
+  -md-sys-color-on-surface: #1b1b1f;
+  -md-sys-color-on-surface-variant: #46464f;
+  -md-sys-color-inverse-surface: #303034;
+  -md-sys-color-inverse-on-surface: #f3f0f4;
+  -md-sys-color-surface-tint: #4355b9;
+  -md-sys-color-background: #fbf8fd;
+  -md-sys-color-on-background: #1b1b1f;
+  -md-sys-color-outline: #767680;
+  -md-sys-color-outline-variant: #c7c5d0;
+  -md-sys-color-shadow: #000000;
+  -md-sys-color-scrim: #000000;
 }
 
 /****************************************************************************************************
  * Common to all components with a MaterialSurface
  ****************************************************************************************************/
 .surface {
-    -mfx-hover-opacity: 8%;
-    -mfx-focus-opacity: 12%;
-    -mfx-press-opacity: 12%;
+  -mfx-hover-opacity: 8%;
+  -mfx-focus-opacity: 12%;
+  -mfx-press-opacity: 12%;
 }
 
 /****************************************************************************************************
@@ -148,15 +148,15 @@
 .mfx-button.filled-tonal,
 .mfx-button.text,
 .mfx-button.outlined {
-    -fx-font-family: "Roboto Medium";
-    -fx-font-weight: 500;
-    -fx-font-size: 14px;
-    -fx-graphic-text-gap: 8px;
-    -fx-background-radius: 20px;
-    -fx-alignment: CENTER;
-    -fx-padding: 0px 24px 0px 24px;
-    -mfx-init-width: -1px;
-    -mfx-init-height: 40px;
+  -fx-font-family: "Roboto Medium";
+  -fx-font-weight: 500;
+  -fx-font-size: 14px;
+  -fx-graphic-text-gap: 8px;
+  -fx-background-radius: 20px;
+  -fx-alignment: CENTER;
+  -fx-padding: 0px 24px 0px 24px;
+  -mfx-init-width: -1px;
+  -mfx-init-height: 40px;
 }
 
 .mfx-button.elevated > .surface > .bg,
@@ -164,7 +164,7 @@
 .mfx-button.filled-tonal > .surface > .bg,
 .mfx-button.text > .surface > .bg,
 .mfx-button.outlined > .surface > .bg {
-    -fx-background-radius: 20px;
+  -fx-background-radius: 20px;
 }
 
 .mfx-button.elevated:disabled,
@@ -172,8 +172,8 @@
 .mfx-button.filled-tonal:disabled,
 .mfx-button.text:disabled,
 .mfx-button.outlined:disabled {
-    -fx-text-fill: #1b1b1f;
-    -fx-background-color: rgba(27, 27, 31, 0.12);
+  -fx-text-fill: #1b1b1f;
+  -fx-background-color: rgba(27, 27, 31, 0.12);
 }
 
 .mfx-button.elevated:disabled > .surface,
@@ -181,12 +181,12 @@
 .mfx-button.filled-tonal:disabled > .surface,
 .mfx-button.text:disabled > .surface,
 .mfx-button.outlined:disabled > .surface {
-    -mfx-elevation: LEVEL0;
+  -mfx-elevation: LEVEL0;
 }
 
 .mfx-button.outlined:disabled,
 .mfx-button.text:disabled {
-    -fx-background-color: transparent;
+  -fx-background-color: transparent;
 }
 
 .mfx-button.elevated .mfx-font-icon,
@@ -194,7 +194,7 @@
 .mfx-button.filled-tonal .mfx-font-icon,
 .mfx-button.text .mfx-font-icon,
 .mfx-button.outlined .mfx-font-icon {
-    -mfx-size: 18px;
+  -mfx-size: 18px;
 }
 
 .mfx-button.elevated:disabled .mfx-font-icon,
@@ -202,12 +202,12 @@
 .mfx-button.filled-tonal:disabled .mfx-font-icon,
 .mfx-button.text:disabled .mfx-font-icon,
 .mfx-button.outlined:disabled .mfx-font-icon {
-    -mfx-color: #1b1b1f;
+  -mfx-color: #1b1b1f;
 }
 
 /* Label text is solid, label node is opaque, this is the correct way to get the right disabled color */
 .mfx-button:disabled .label {
-    -fx-opacity: 38%;
+  -fx-opacity: 38%;
 }
 
 .mfx-button.elevated:with-icon-left,
@@ -215,7 +215,7 @@
 .mfx-button.filled-tonal:with-icon-left,
 .mfx-button.text:with-icon-left,
 .mfx-button.outlined:with-icon-left {
-    -fx-padding: 0px 24px 0px 16px;
+  -fx-padding: 0px 24px 0px 16px;
 }
 
 .mfx-button.elevated:with-icon-right,
@@ -223,231 +223,231 @@
 .mfx-button.filled-tonal:with-icon-right,
 .mfx-button.text:with-icon-right,
 .mfx-button.outlined:with-icon-right {
-    -fx-padding: 0px 16px 0px 24px;
+  -fx-padding: 0px 16px 0px 24px;
 }
 
 /****************************************************************************************************
  * Elevated Buttons
  ****************************************************************************************************/
 .mfx-button.elevated {
-    -fx-text-fill: #4355b9;
-    -fx-background-color: #f6f2f7;
+  -fx-text-fill: #4355b9;
+  -fx-background-color: #f6f2f7;
 }
 
 .mfx-button.elevated > .surface {
-    -mfx-elevation: LEVEL1;
+  -mfx-elevation: LEVEL1;
 }
 
 .mfx-button.elevated > .surface > .bg {
-    -fx-background-color: #4355b9;
+  -fx-background-color: #4355b9;
 }
 
 .mfx-button.elevated:hover > .surface {
-    -mfx-elevation: LEVEL2;
+  -mfx-elevation: LEVEL2;
 }
 
 .mfx-button.elevated .mfx-font-icon {
-    -mfx-color: #4355b9;
+  -mfx-color: #4355b9;
 }
 
 .mfx-button.elevated > .surface > .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(67, 85, 185, 0.12);
+  -mfx-ripple-color: rgba(67, 85, 185, 0.12);
 }
 
 /****************************************************************************************************
  * Filled Buttons
  ****************************************************************************************************/
 .mfx-button.filled {
-    -fx-text-fill: #ffffff;
-    -fx-background-color: #4355b9;
+  -fx-text-fill: #ffffff;
+  -fx-background-color: #4355b9;
 }
 
 .mfx-button.filled > .surface {
-    -mfx-elevation: LEVEL0;
+  -mfx-elevation: LEVEL0;
 }
 
 .mfx-button.filled > .surface > .bg {
-    -fx-background-color: #ffffff;
+  -fx-background-color: #ffffff;
 }
 
 .mfx-button.filled:hover > .surface {
-    -mfx-elevation: LEVEL1;
+  -mfx-elevation: LEVEL1;
 }
 
 .mfx-button.filled .mfx-font-icon {
-    -mfx-color: #ffffff;
+  -mfx-color: #ffffff;
 }
 
 .mfx-button.filled > .surface > .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(255, 255, 255, 0.12);
+  -mfx-ripple-color: rgba(255, 255, 255, 0.12);
 }
 
 /****************************************************************************************************
  * Filled Tonal Buttons
  ****************************************************************************************************/
 .mfx-button.filled-tonal {
-    -fx-text-fill: #390033;
-    -fx-background-color: #ffd7f1;
+  -fx-text-fill: #390033;
+  -fx-background-color: #ffd7f1;
 }
 
 .mfx-button.filled-tonal > .surface {
-    -mfx-elevation: LEVEL0;
+  -mfx-elevation: LEVEL0;
 }
 
 .mfx-button.filled-tonal > .surface > .bg {
-    -fx-background-color: #390033;
+  -fx-background-color: #390033;
 }
 
 .mfx-button.filled-tonal:hover > .surface {
-    -mfx-elevation: LEVEL1;
+  -mfx-elevation: LEVEL1;
 }
 
 .mfx-button.filled-tonal .mfx-font-icon {
-    -mfx-color: #390033;
+  -mfx-color: #390033;
 }
 
 .mfx-button.filled-tonal .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(57, 0, 51, 0.12);
+  -mfx-ripple-color: rgba(57, 0, 51, 0.12);
 }
 
 /****************************************************************************************************
  * Text Buttons
  ****************************************************************************************************/
 .mfx-button.text {
-    -fx-text-fill: #4355b9;
-    -fx-background-color: transparent;
+  -fx-text-fill: #4355b9;
+  -fx-background-color: transparent;
 }
 
 .mfx-button.text > .surface > .bg {
-    -fx-background-color: #4355b9;
+  -fx-background-color: #4355b9;
 }
 
 .mfx-button.text .mfx-font-icon {
-    -mfx-color: #4355b9;
+  -mfx-color: #4355b9;
 }
 
 .mfx-button.text .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(67, 85, 185, 0.12);
+  -mfx-ripple-color: rgba(67, 85, 185, 0.12);
 }
 
 /****************************************************************************************************
  * Outlined Buttons
  ****************************************************************************************************/
 .mfx-button.outlined {
-    -fx-text-fill: #4355b9;
-    -fx-background-color: transparent;
-    -fx-border-color: #767680;
-    -fx-border-radius: 20px;
-    -fx-border-width: 1px;
+  -fx-text-fill: #4355b9;
+  -fx-background-color: transparent;
+  -fx-border-color: #767680;
+  -fx-border-radius: 20px;
+  -fx-border-width: 1px;
 }
 
 .mfx-button.outlined > .surface > .bg {
-    -fx-background-color: #4355b9;
+  -fx-background-color: #4355b9;
 }
 
 .mfx-button.outlined:disabled {
-    -fx-border-color: rgba(118, 118, 128, 0.38);
+  -fx-border-color: rgba(118, 118, 128, 0.38);
 }
 
 .mfx-button.outlined:focused {
-    -fx-border-color: #4355b9;
+  -fx-border-color: #4355b9;
 }
 
 .mfx-button.outlined .mfx-font-icon {
-    -mfx-color: #4355b9;
+  -mfx-color: #4355b9;
 }
 
 .mfx-button.outlined .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(67, 85, 185, 0.12);
+  -mfx-ripple-color: rgba(67, 85, 185, 0.12);
 }
 
 /****************************************************************************************************
- * Check Boxes
+ * Checkboxes
  ****************************************************************************************************/
 .mfx-checkbox {
-    -fx-font-family: "Roboto Medium";
-    -fx-font-weight: 500;
-    -fx-font-size: 14px;
-    -fx-text-fill: #1b1b1f;
+  -fx-font-family: "Roboto Medium";
+  -fx-font-weight: 500;
+  -fx-font-size: 14px;
+  -fx-text-fill: #1b1b1f;
 }
 
 .mfx-checkbox > .surface {
-    -fx-pref-width: 40px;
-    -fx-pref-height: 40px;
+  -fx-pref-width: 40px;
+  -fx-pref-height: 40px;
 }
 
 .mfx-checkbox > .surface > .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(67, 85, 185, 0.12);
+  -mfx-ripple-color: rgba(67, 85, 185, 0.12);
 }
 
 .mfx-checkbox > .surface > .bg {
-    -fx-background-color: #4355b9;
-    -fx-background-radius: 100px;
+  -fx-background-color: #4355b9;
+  -fx-background-radius: 100px;
 }
 
 .mfx-checkbox > .mfx-icon-wrapper {
-    -fx-background-radius: 2px;
-    -fx-border-color: #46464f;
-    -fx-border-radius: 2px;
-    -fx-border-width: 2px;
-    -mfx-size: 18px;
+  -fx-background-radius: 2px;
+  -fx-border-color: #46464f;
+  -fx-border-radius: 2px;
+  -fx-border-width: 2px;
+  -mfx-size: 18px;
 }
 
 .mfx-checkbox > .mfx-icon-wrapper > .mfx-font-icon {
-    -mfx-description: "fas-check";
-    -mfx-size: 12px;
-    visibility: hidden;
+  -mfx-description: "fas-check";
+  -mfx-size: 12px;
+  visibility: hidden;
 }
 
 .mfx-checkbox:indeterminate > .mfx-icon-wrapper {
-    -fx-background-color: #4355b9;
-    -fx-border-width: 0px;
+  -fx-background-color: #4355b9;
+  -fx-border-width: 0px;
 }
 
 .mfx-checkbox:selected > .mfx-icon-wrapper {
-    -fx-background-color: #4355b9;
-    -fx-border-width: 0px;
+  -fx-background-color: #4355b9;
+  -fx-border-width: 0px;
 }
 
 .mfx-checkbox:selected > .mfx-icon-wrapper > .mfx-font-icon,
 .mfx-checkbox:indeterminate > .mfx-icon-wrapper > .mfx-font-icon {
-    visibility: visible;
-    -mfx-color: #ffffff;
+  visibility: visible;
+  -mfx-color: #ffffff;
 }
 
 .mfx-checkbox:indeterminate > .mfx-icon-wrapper > .mfx-font-icon {
-    -mfx-description: "fas-minus";
+  -mfx-description: "fas-minus";
 }
 
 .mfx-checkbox:error > .surface > .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(186, 26, 26, 0.12);
+  -mfx-ripple-color: rgba(186, 26, 26, 0.12);
 }
 
 .mfx-checkbox:error > .surface > .bg {
-    -fx-background-color: #ba1a1a;
+  -fx-background-color: #ba1a1a;
 }
 
 .mfx-checkbox:error > .mfx-icon-wrapper {
-    -fx-border-color: #ba1a1a;
+  -fx-border-color: #ba1a1a;
 }
 
 .mfx-checkbox:selected:error > .mfx-icon-wrapper,
 .mfx-checkbox:indeterminate:error > .mfx-icon-wrapper {
-    -fx-background-color: #ba1a1a;
+  -fx-background-color: #ba1a1a;
 }
 
 .mfx-checkbox:selected:error > .mfx-icon-wrapper > .mfx-font-icon {
-    -mfx-color: #ffffff;
+  -mfx-color: #ffffff;
 }
 
 .mfx-checkbox:disabled > .mfx-icon-wrapper {
-    -fx-background-color: transparent;
-    -fx-border-color: rgba(27, 27, 31, 0.38);
+  -fx-background-color: transparent;
+  -fx-border-color: rgba(27, 27, 31, 0.38);
 }
 
 .mfx-checkbox:selected:disabled > .mfx-icon-wrapper,
 .mfx-checkbox:indeterminate:disabled > .mfx-icon-wrapper {
-    -fx-background-color: rgba(27, 27, 31, 0.38);
+  -fx-background-color: rgba(27, 27, 31, 0.38);
 }
 
 /****************************************************************************************************
@@ -455,68 +455,68 @@
  ****************************************************************************************************/
 .mfx-button.fab,
 .mfx-button.fab:extended {
-    -fx-font-family: "Roboto Medium";
-    -fx-font-weight: 500;
-    -fx-font-size: 14px;
-    -fx-graphic-text-gap: 8px;
-    -fx-background-radius: 16px;
-    -fx-padding: 16px;
-    -mfx-init-width: 56px;
-    -mfx-init-height: 56px;
+  -fx-font-family: "Roboto Medium";
+  -fx-font-weight: 500;
+  -fx-font-size: 14px;
+  -fx-graphic-text-gap: 8px;
+  -fx-background-radius: 16px;
+  -fx-padding: 16px;
+  -mfx-init-width: 56px;
+  -mfx-init-height: 56px;
 }
 
 .mfx-button.fab > .surface,
 .mfx-button.fab:extended > .surface {
-    -mfx-elevation: LEVEL3;
+  -mfx-elevation: LEVEL3;
 }
 
 .mfx-button.fab > .surface > .bg,
 .mfx-button.fab:extended > .surface > .bg {
-    -fx-background-radius: 16px;
+  -fx-background-radius: 16px;
 }
 
 .mfx-button.fab:extended {
-    -mfx-init-width: 80px;
+  -mfx-init-width: 80px;
 }
 
 .mfx-button.fab:hover > .surface,
 .mfx-button.fab:extended:hover > .surface {
-    -mfx-elevation: LEVEL4;
+  -mfx-elevation: LEVEL4;
 }
 
 .mfx-button.fab .mfx-font-icon,
 .mfx-button.fab:extended .mfx-font-icon {
-    -mfx-size: 24px;
+  -mfx-size: 24px;
 }
 
 .mfx-button.fab.small {
-    -fx-background-radius: 12px;
-    -fx-padding: 0px;
-    -mfx-init-width: 40px;
-    -mfx-init-height: 40px;
+  -fx-background-radius: 12px;
+  -fx-padding: 0px;
+  -mfx-init-width: 40px;
+  -mfx-init-height: 40px;
 }
 
 .mfx-button.fab.small > .surface > .bg {
-    -fx-background-radius: 12px;
+  -fx-background-radius: 12px;
 }
 
 .mfx-button.fab.large {
-    -fx-background-radius: 28px;
-    -mfx-init-width: 96px;
-    -mfx-init-height: 96px;
+  -fx-background-radius: 28px;
+  -mfx-init-width: 96px;
+  -mfx-init-height: 96px;
 }
 
 .mfx-button.fab.large > .surface > .bg {
-    -fx-background-radius: 28px;
+  -fx-background-radius: 28px;
 }
 
 .mfx-button.fab.large .mfx-font-icon {
-    -mfx-size: 36px;
+  -mfx-size: 36px;
 }
 
 /* FABs don't have the disabled state */
 .mfx-button.fab:disabled .label {
-    -fx-opacity: 1;
+  -fx-opacity: 1;
 }
 
 /****************************************************************************************************
@@ -524,100 +524,100 @@
  ****************************************************************************************************/
 .mfx-button.fab.lowered > .surface,
 .mfx-button.fab:extended.lowered > .surface {
-    -mfx-elevation: LEVEL1;
+  -mfx-elevation: LEVEL1;
 }
 
 .mfx-button.fab.lowered:hover > .surface,
 .mfx-button.fab:extended.lowered:hover > .surface {
-    -mfx-elevation: LEVEL2;
+  -mfx-elevation: LEVEL2;
 }
 
 /****************************************************************************************************
  * Primary FABs
  ****************************************************************************************************/
 .mfx-button.fab {
-    -fx-text-fill: #00105c;
-    -fx-background-color: #dee0ff;
+  -fx-text-fill: #00105c;
+  -fx-background-color: #dee0ff;
 }
 
 .mfx-button.fab > .surface > .bg {
-    -fx-background-color: #00105c;
+  -fx-background-color: #00105c;
 }
 
 .mfx-button.fab .mfx-font-icon {
-    -mfx-color: #00105c;
+  -mfx-color: #00105c;
 }
 
 .mfx-button.fab .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(0, 16, 92, 0.12);
+  -mfx-ripple-color: rgba(0, 16, 92, 0.12);
 }
 
 /****************************************************************************************************
  * Secondary FABs
  ****************************************************************************************************/
 .mfx-button.fab.secondary {
-    -fx-text-fill: #390033;
-    -fx-background-color: #ffd7f1;
+  -fx-text-fill: #390033;
+  -fx-background-color: #ffd7f1;
 }
 
 .mfx-button.fab.secondary > .surface > .bg {
-    -fx-background-color: #390033;
+  -fx-background-color: #390033;
 }
 
 .mfx-button.fab.secondary .mfx-font-icon {
-    -mfx-color: #390033;
+  -mfx-color: #390033;
 }
 
 .mfx-button.fab.secondary .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(57, 0, 51, 0.12);
+  -mfx-ripple-color: rgba(57, 0, 51, 0.12);
 }
 
 /****************************************************************************************************
  * Tertiary FABs
  ****************************************************************************************************/
 .mfx-button.fab.tertiary {
-    -fx-text-fill: #000d5f;
-    -fx-background-color: #dfe0ff;
+  -fx-text-fill: #000d5f;
+  -fx-background-color: #dfe0ff;
 }
 
 .mfx-button.fab.tertiary > .surface > .bg {
-    -fx-background-color: #000d5f;
+  -fx-background-color: #000d5f;
 }
 
 .mfx-button.fab.tertiary .mfx-font-icon {
-    -mfx-color: #000d5f;
+  -mfx-color: #000d5f;
 }
 
 .mfx-button.fab.tertiary .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(0, 13, 95, 0.12);
+  -mfx-ripple-color: rgba(0, 13, 95, 0.12);
 }
 
 /****************************************************************************************************
  * Surface FABs
  ****************************************************************************************************/
 .mfx-button.fab.surface {
-    -fx-text-fill: #4355b9;
-    -fx-background-color: #eae7ec;
+  -fx-text-fill: #4355b9;
+  -fx-background-color: #eae7ec;
 }
 
 .mfx-button.fab.surface > .surface > .bg {
-    -fx-background-color: #4355b9;
+  -fx-background-color: #4355b9;
 }
 
 .mfx-button.fab.surface .mfx-font-icon {
-    -mfx-color: #4355b9;
+  -mfx-color: #4355b9;
 }
 
 .mfx-button.fab.surface .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(67, 85, 185, 0.12);
+  -mfx-ripple-color: rgba(67, 85, 185, 0.12);
 }
 
 /****************************************************************************************************
  * Lowered Surface FABs
  ****************************************************************************************************/
 .mfx-button.fab.surface.lowered {
-    -fx-text-fill: #4355b9;
-    -fx-background-color: #f6f2f7;
+  -fx-text-fill: #4355b9;
+  -fx-background-color: #f6f2f7;
 }
 
 /****************************************************************************************************
@@ -627,77 +627,77 @@
 .mfx-icon-button.filled,
 .mfx-icon-button.filled-tonal,
 .mfx-icon-button.outlined {
-    -fx-background-radius: 100px;
-    -fx-padding: 4px;
-    -mfx-size: 40px;
+  -fx-background-radius: 100px;
+  -fx-padding: 4px;
+  -mfx-size: 40px;
 }
 
 .mfx-icon-button > .surface > .bg,
 .mfx-icon-button.filled > .surface > .bg,
 .mfx-icon-button.filled-tonal > .surface > .bg,
 .mfx-icon-button.outlined > .surface > .bg {
-    -fx-background-radius: 100px;
+  -fx-background-radius: 100px;
 }
 
 .mfx-icon-button:disabled,
 .mfx-icon-button.filled:disabled,
 .mfx-icon-button.filled-tonal:disabled,
 .mfx-icon-button.outlined:disabled {
-    -fx-background-color: rgba(27, 27, 31, 0.12);
+  -fx-background-color: rgba(27, 27, 31, 0.12);
 }
 
 .mfx-icon-button .mfx-font-icon,
 .mfx-icon-button.filled .mfx-font-icon,
 .mfx-icon-button.filled-tonal .mfx-font-icon,
 .mfx-icon-button.outlined .mfx-font-icon {
-    -mfx-size: 24px;
+  -mfx-size: 24px;
 }
 
 .mfx-icon-button:disabled .mfx-font-icon,
 .mfx-icon-button.filled:disabled .mfx-font-icon,
 .mfx-icon-button.filled-tonal:disabled .mfx-font-icon,
 .mfx-icon-button.outlined:disabled .mfx-font-icon {
-    -fx-opacity: 38%;
-    -mfx-color: #1b1b1f;
+  -fx-opacity: 38%;
+  -mfx-color: #1b1b1f;
 }
 
 /****************************************************************************************************
  * Standard IconButtons
  ****************************************************************************************************/
 .mfx-icon-button {
-    -fx-background-color: transparent;
+  -fx-background-color: transparent;
 }
 
 .mfx-icon-button:disabled {
-    -fx-background-color: transparent;
+  -fx-background-color: transparent;
 }
 
 .mfx-icon-button > .surface > .bg {
-    -fx-background-color: #46464f;
+  -fx-background-color: #46464f;
 }
 
 .mfx-icon-button .mfx-font-icon {
-    -mfx-color: #46464f;
+  -mfx-color: #46464f;
 }
 
 .mfx-icon-button .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(70, 70, 79, 0.12);
+  -mfx-ripple-color: rgba(70, 70, 79, 0.12);
 }
 
 .mfx-icon-button:selectable:selected {
-    -fx-background-color: transparent;
+  -fx-background-color: transparent;
 }
 
 .mfx-icon-button:selectable:selected > .surface > .bg {
-    -fx-background-color: #4355b9;
+  -fx-background-color: #4355b9;
 }
 
 .mfx-icon-button:selectable:selected .mfx-font-icon {
-    -mfx-color: #4355b9;
+  -mfx-color: #4355b9;
 }
 
 .mfx-icon-button:selectable:disabled .mfx-font-icon {
-    -mfx-color: #1b1b1f;
+  -mfx-color: #1b1b1f;
 }
 
 /****************************************************************************************************
@@ -705,33 +705,33 @@
  ****************************************************************************************************/
 .mfx-icon-button.filled,
 .mfx-icon-button.filled:selectable:selected {
-    -fx-background-color: #4355b9;
+  -fx-background-color: #4355b9;
 }
 
 .mfx-icon-button.filled > .surface > .bg,
 .mfx-icon-button.filled:selectable:selected > .surface > .bg {
-    -fx-background-color: #ffffff;
+  -fx-background-color: #ffffff;
 }
 
 .mfx-icon-button.filled .mfx-font-icon,
 .mfx-icon-button.filled:selectable:selected .mfx-font-icon {
-    -mfx-color: #ffffff;
+  -mfx-color: #ffffff;
 }
 
 .mfx-icon-button.filled > .surface > .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(255, 255, 255, 0.12);
+  -mfx-ripple-color: rgba(255, 255, 255, 0.12);
 }
 
 .mfx-icon-button.filled:selectable {
-    -fx-background-color: #e4e1e6;
+  -fx-background-color: #e4e1e6;
 }
 
 .mfx-icon-button.filled:selectable > .surface > .bg {
-    -fx-background-color: #4355b9;
+  -fx-background-color: #4355b9;
 }
 
 .mfx-icon-button.filled:selectable .mfx-font-icon {
-    -mfx-color: #4355b9;
+  -mfx-color: #4355b9;
 }
 
 /****************************************************************************************************
@@ -739,152 +739,152 @@
  ****************************************************************************************************/
 .mfx-icon-button.filled-tonal,
 .mfx-icon-button.filled-tonal:selectable:selected {
-    -fx-background-color: #ffd7f1;
+  -fx-background-color: #ffd7f1;
 }
 
 .mfx-icon-button.filled-tonal > .surface > .bg,
 .mfx-icon-button.filled-tonal:selectable:selected > .surface > .bg {
-    -fx-background-color: #390033;
+  -fx-background-color: #390033;
 }
 
 .mfx-icon-button.filled-tonal .mfx-font-icon,
 .mfx-icon-button.filled-tonal:selectable:selected .mfx-font-icon {
-    -mfx-color: #390033;
+  -mfx-color: #390033;
 }
 
 .mfx-icon-button.filled-tonal > .surface > .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(70, 70, 79, 0.12);
+  -mfx-ripple-color: rgba(70, 70, 79, 0.12);
 }
 
 .mfx-icon-button.filled-tonal:selectable {
-    -fx-background-color: #e4e1e6;
+  -fx-background-color: #e4e1e6;
 }
 
 .mfx-icon-button.filled-tonal:selectable > .surface > .bg {
-    -fx-background-color: #46464f;
+  -fx-background-color: #46464f;
 }
 
 .mfx-icon-button.filled-tonal:selectable .mfx-font-icon {
-    -mfx-color: #46464f;
+  -mfx-color: #46464f;
 }
 
 /****************************************************************************************************
  * Outlined IconButtons
  ****************************************************************************************************/
 .mfx-icon-button.outlined {
-    -fx-background-color: transparent;
-    -fx-border-color: #767680;
-    -fx-border-radius: 100%;
+  -fx-background-color: transparent;
+  -fx-border-color: #767680;
+  -fx-border-radius: 100%;
 }
 
 .mfx-icon-button.outlined > .surface > .bg {
-    -fx-background-color: #46464f;
+  -fx-background-color: #46464f;
 }
 
 .mfx-icon-button.outlined .mfx-font-icon {
-    -mfx-color: #46464f;
+  -mfx-color: #46464f;
 }
 
 .mfx-icon-button.outlined .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(70, 70, 79, 0.12);
+  -mfx-ripple-color: rgba(70, 70, 79, 0.12);
 }
 
 .mfx-icon-button.outlined:selectable:selected {
-    -fx-background-color: #303034;
-    -fx-border-color: transparent;
+  -fx-background-color: #303034;
+  -fx-border-color: transparent;
 }
 
 .mfx-icon-button.outlined:selectable:selected > .surface > .bg {
-    -fx-background-color: #f3f0f4;
+  -fx-background-color: #f3f0f4;
 }
 
 .mfx-icon-button.outlined:selectable:selected .mfx-font-icon {
-    -mfx-color: #f3f0f4;
+  -mfx-color: #f3f0f4;
 }
 
 /****************************************************************************************************
  * Segmented Buttons
  ****************************************************************************************************/
 .mfx-segmented-button {
-    -mfx-init-height: 40px;
+  -mfx-init-height: 40px;
 }
 
 .mfx-segmented-button > .segment {
-    -fx-font-family: "Roboto Medium";
-    -fx-font-weight: 500;
-    -fx-font-size: 14px;
-    -fx-text-fill: #1b1b1f;
-    -fx-graphic-text-gap: 8px;
-    -fx-background-color: transparent;
-    -fx-border-color: #767680;
-    -fx-border-insets: -1px;
-    -fx-padding: 4px 12px 4px 12px;
-    -mfx-init-width: 48px;
+  -fx-font-family: "Roboto Medium";
+  -fx-font-weight: 500;
+  -fx-font-size: 14px;
+  -fx-text-fill: #1b1b1f;
+  -fx-graphic-text-gap: 8px;
+  -fx-background-color: transparent;
+  -fx-border-color: #767680;
+  -fx-border-insets: -1px;
+  -fx-padding: 4px 12px 4px 12px;
+  -mfx-init-width: 48px;
 }
 
 .mfx-segmented-button > .segment > .surface > .bg {
-    -fx-background-color: #1b1b1f;
+  -fx-background-color: #1b1b1f;
 }
 
 .mfx-segmented-button > .segment .mfx-font-icon {
-    -mfx-color: #1b1b1f;
+  -mfx-color: #1b1b1f;
 }
 
 .mfx-segmented-button > .segment > .mfx-ripple-generator {
-    -mfx-ripple-color: rgba(27, 27, 31, 0.12);
+  -mfx-ripple-color: rgba(27, 27, 31, 0.12);
 }
 
 .mfx-segmented-button > .segment:first {
-    -fx-border-radius: 100px 0px 0px 100px;
-    -fx-background-radius: 100px 0px 0px 100px;
+  -fx-border-radius: 100px 0px 0px 100px;
+  -fx-background-radius: 100px 0px 0px 100px;
 }
 
 .mfx-segmented-button > .segment:first > .surface > .bg {
-    -fx-background-radius: 100px 0px 0px 100px;
+  -fx-background-radius: 100px 0px 0px 100px;
 }
 
 .mfx-segmented-button > .segment:last {
-    -fx-border-radius: 0px 100px 100px 0px;
-    -fx-background-radius: 0px 100px 100px 0px;
+  -fx-border-radius: 0px 100px 100px 0px;
+  -fx-background-radius: 0px 100px 100px 0px;
 }
 
 .mfx-segmented-button > .segment:last > .surface > .bg {
-    -fx-background-radius: 0px 100px 100px 0px;
+  -fx-background-radius: 0px 100px 100px 0px;
 }
 
 .mfx-segmented-button > .segment:disabled > .label {
-    -fx-opacity: 1;
+  -fx-opacity: 1;
 }
 
 .mfx-segmented-button > .segment:disabled {
-    -fx-text-fill: rgba(27, 27, 31, 0.38);
-    -fx-border-color: rgba(118, 118, 128, 0.12);
+  -fx-text-fill: rgba(27, 27, 31, 0.38);
+  -fx-border-color: rgba(118, 118, 128, 0.12);
 }
 
 .mfx-segmented-button > .segment:disabled .mfx-font-icon {
-    -mfx-color: rgba(27, 27, 31, 0.38);
+  -mfx-color: rgba(27, 27, 31, 0.38);
 }
 
 .mfx-segmented-button > .segment:selected {
-    -fx-text-fill: #390033;
-    -fx-background-color: #ffd7f1;
+  -fx-text-fill: #390033;
+  -fx-background-color: #ffd7f1;
 }
 
 .mfx-segmented-button > .segment:selected > .surface > .bg {
-    -fx-background-color: #390033;
+  -fx-background-color: #390033;
 }
 
 .mfx-segmented-button > .segment:selected .mfx-font-icon {
-    -mfx-description: "fas-check";
-    -mfx-color: #390033;
+  -mfx-description: "fas-check";
+  -mfx-color: #390033;
 }
 
 .mfx-segmented-button > .segment:selected:disabled {
-    -fx-text-fill: rgba(57, 0, 51, 0.38);
+  -fx-text-fill: rgba(57, 0, 51, 0.38);
 }
 
 .mfx-segmented-button > .segment:selected:disabled .mfx-font-icon {
-    -mfx-color: rgba(57, 0, 51, 0.38);
+  -mfx-color: rgba(57, 0, 51, 0.38);
 }
 
 /****************************************************************************************************
@@ -892,7 +892,7 @@
  ****************************************************************************************************/
 .mfx-popup .content,
 .mfx-tooltip .content {
-    -mfx-offset: "8 8";
+  -mfx-offset: "8 8";
 }
 
 /****************************************************************************************************
@@ -900,20 +900,20 @@
  ****************************************************************************************************/
 .mfx-popup .content > .plain,
 .mfx-tooltip .content > .plain {
-    -fx-background-color: #303034;
-    -fx-background-radius: 4px;
-    -fx-padding: 8px;
-    -fx-min-height: 24px;
+  -fx-background-color: #303034;
+  -fx-background-radius: 4px;
+  -fx-padding: 8px;
+  -fx-min-height: 24px;
 }
 
 .mfx-popup .content > .plain > .label,
 .mfx-tooltip .content > .plain > .label {
-    -fx-font-family: "Roboto";
-    -fx-font-weight: 400;
-    -fx-font-size: 12px;
-    -fx-text-fill: #f3f0f4;
-    -fx-wrap-text: true;
-    -fx-wrapping-width: 200px;
+  -fx-font-family: "Roboto";
+  -fx-font-weight: 400;
+  -fx-font-size: 12px;
+  -fx-text-fill: #f3f0f4;
+  -fx-wrap-text: true;
+  -fx-wrapping-width: 200px;
 }
 
 /****************************************************************************************************
@@ -921,33 +921,33 @@
  ****************************************************************************************************/
 .mfx-popup .content > .rich,
 .mfx-tooltip .content > .rich {
-    -fx-background-color: #f0edf1;
-    -fx-background-radius: 12px;
-    -fx-padding: 12px 16px 8px 16px;
-    -fx-spacing: 8px;
-    -mfx-elevation: LEVEL2;
+  -fx-background-color: #f0edf1;
+  -fx-background-radius: 12px;
+  -fx-padding: 12px 16px 8px 16px;
+  -fx-spacing: 8px;
+  -mfx-elevation: LEVEL2;
 }
 
 .mfx-popup .content > .rich > .actions,
 .mfx-tooltip .content > .rich > .actions {
-    -fx-spacing: 8px;
-    -fx-padding: 8px 0px 0px 0px;
+  -fx-spacing: 8px;
+  -fx-padding: 8px 0px 0px 0px;
 }
 
 .mfx-popup .content > .rich > .label,
 .mfx-tooltip .content > .rich > .label {
-    -fx-font-family: "Roboto";
-    -fx-font-weight: 400;
-    -fx-font-size: 14px;
-    -fx-text-fill: #46464f;
-    -fx-wrap-text: true;
-    -fx-wrapping-width: 300px;
+  -fx-font-family: "Roboto";
+  -fx-font-weight: 400;
+  -fx-font-size: 14px;
+  -fx-text-fill: #46464f;
+  -fx-wrap-text: true;
+  -fx-wrapping-width: 300px;
 }
 
 .mfx-popup .content > .rich > .header,
 .mfx-tooltip .content > .rich > .header {
-    -fx-font-family: "Roboto Medium";
-    -fx-font-weight: 500;
-    -fx-font-size: 14px;
-    -fx-text-fill: #46464f;
+  -fx-font-family: "Roboto Medium";
+  -fx-font-weight: 500;
+  -fx-font-size: 14px;
+  -fx-text-fill: #46464f;
 }
diff --git a/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-purple-dark.css b/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-purple-dark.css
index 43185588..cd1b60ee 100644
--- a/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-purple-dark.css
+++ b/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-purple-dark.css
@@ -362,7 +362,7 @@
 }
 
 /****************************************************************************************************
- * Check Boxes
+ * Checkboxes
  ****************************************************************************************************/
 .mfx-checkbox {
   -fx-font-family: "Roboto Medium";
diff --git a/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-purple-light.css b/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-purple-light.css
index af8b75ad..6107fc43 100644
--- a/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-purple-light.css
+++ b/modules/resources/src/main/resources/io/github/palexdev/mfxresources/themes/material/md-purple-light.css
@@ -362,7 +362,7 @@
 }
 
 /****************************************************************************************************
- * Check Boxes
+ * Checkboxes
  ****************************************************************************************************/
 .mfx-checkbox {
   -fx-font-family: "Roboto Medium";