diff --git a/.yarn/cache/@standardnotes-domain-core-npm-1.24.1-7fc546297e-efe7e102f0.zip b/.yarn/cache/@standardnotes-domain-core-npm-1.24.1-7fc546297e-efe7e102f0.zip
deleted file mode 100644
index 150104be9a9..00000000000
Binary files a/.yarn/cache/@standardnotes-domain-core-npm-1.24.1-7fc546297e-efe7e102f0.zip and /dev/null differ
diff --git a/.yarn/cache/@standardnotes-domain-core-npm-1.34.1-ad84c73ba0-29fa0ee786.zip b/.yarn/cache/@standardnotes-domain-core-npm-1.40.0-3257c10a79-7a8454d5e6.zip
similarity index 75%
rename from .yarn/cache/@standardnotes-domain-core-npm-1.34.1-ad84c73ba0-29fa0ee786.zip
rename to .yarn/cache/@standardnotes-domain-core-npm-1.40.0-3257c10a79-7a8454d5e6.zip
index 4f76236bb46..f83c3f838bd 100644
Binary files a/.yarn/cache/@standardnotes-domain-core-npm-1.34.1-ad84c73ba0-29fa0ee786.zip and b/.yarn/cache/@standardnotes-domain-core-npm-1.40.0-3257c10a79-7a8454d5e6.zip differ
diff --git a/.yarn/cache/@standardnotes-settings-npm-1.21.20-3b6978dd95-0a3b9fcffa.zip b/.yarn/cache/@standardnotes-settings-npm-1.22.0-8f04ce916d-93be5a6ff6.zip
similarity index 70%
rename from .yarn/cache/@standardnotes-settings-npm-1.21.20-3b6978dd95-0a3b9fcffa.zip
rename to .yarn/cache/@standardnotes-settings-npm-1.22.0-8f04ce916d-93be5a6ff6.zip
index 7d3c30da6a3..100f8f7bdde 100644
Binary files a/.yarn/cache/@standardnotes-settings-npm-1.21.20-3b6978dd95-0a3b9fcffa.zip and b/.yarn/cache/@standardnotes-settings-npm-1.22.0-8f04ce916d-93be5a6ff6.zip differ
diff --git a/packages/api/package.json b/packages/api/package.json
index c6b264bbb2f..84af6ee52b4 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.34.1",
+    "@standardnotes/domain-core": "^1.40.0",
     "@standardnotes/models": "workspace:*",
     "@standardnotes/responses": "workspace:*",
     "@standardnotes/utils": "workspace:*",
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 5a8ca3af6d7..4cb7a6503af 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@electron/remote": "^2.0.12",
-    "@standardnotes/domain-core": "^1.34.1",
+    "@standardnotes/domain-core": "^1.40.0",
     "@standardnotes/electron-clear-data": "1.1.1",
     "@standardnotes/web": "workspace:*",
     "axios": "^1.4.0",
diff --git a/packages/encryption/package.json b/packages/encryption/package.json
index 8c4442aa287..73057ffc2b1 100644
--- a/packages/encryption/package.json
+++ b/packages/encryption/package.json
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.34.1",
+    "@standardnotes/domain-core": "^1.40.0",
     "@standardnotes/models": "workspace:*",
     "@standardnotes/responses": "workspace:*",
     "@standardnotes/sncrypto-common": "workspace:*",
diff --git a/packages/features/package.json b/packages/features/package.json
index 4b1f2664dd8..c487b3fa5b4 100644
--- a/packages/features/package.json
+++ b/packages/features/package.json
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.34.1",
+    "@standardnotes/domain-core": "^1.40.0",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
diff --git a/packages/models/package.json b/packages/models/package.json
index 50e1069ebaf..89b0522c26a 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.34.1",
+    "@standardnotes/domain-core": "^1.40.0",
     "@standardnotes/features": "workspace:*",
     "@standardnotes/responses": "workspace:*",
     "@standardnotes/sncrypto-common": "workspace:^",
diff --git a/packages/services/package.json b/packages/services/package.json
index 8f6803a3ead..e6c8f9567d6 100644
--- a/packages/services/package.json
+++ b/packages/services/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "@standardnotes/api": "workspace:^",
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.34.1",
+    "@standardnotes/domain-core": "^1.40.0",
     "@standardnotes/encryption": "workspace:^",
     "@standardnotes/features": "workspace:^",
     "@standardnotes/files": "workspace:^",
diff --git a/packages/snjs/lib/Domain/UseCase/GetRecoveryCodes/GetRecoveryCodes.ts b/packages/snjs/lib/Domain/UseCase/GetRecoveryCodes/GetRecoveryCodes.ts
index 2ef8cc45aad..94a9257f27f 100644
--- a/packages/snjs/lib/Domain/UseCase/GetRecoveryCodes/GetRecoveryCodes.ts
+++ b/packages/snjs/lib/Domain/UseCase/GetRecoveryCodes/GetRecoveryCodes.ts
@@ -1,6 +1,5 @@
 import { AuthClientInterface } from '@standardnotes/services'
-import { Result, UseCaseInterface } from '@standardnotes/domain-core'
-import { SettingName } from '@standardnotes/settings'
+import { Result, SettingName, UseCaseInterface } from '@standardnotes/domain-core'
 
 import { SettingsClientInterface } from '@Lib/Services/Settings/SettingsClientInterface'
 
diff --git a/packages/snjs/lib/Services/Features/FeaturesService.spec.ts b/packages/snjs/lib/Services/Features/FeaturesService.spec.ts
index cb723281fe4..731d87c765c 100644
--- a/packages/snjs/lib/Services/Features/FeaturesService.spec.ts
+++ b/packages/snjs/lib/Services/Features/FeaturesService.spec.ts
@@ -1,8 +1,7 @@
 import { ItemInterface, SNFeatureRepo } from '@standardnotes/models'
 import { SyncService } from '../Sync/SyncService'
-import { SettingName } from '@standardnotes/settings'
 import { FeaturesService } from '@Lib/Services/Features'
-import { RoleName, ContentType, Uuid, Result } from '@standardnotes/domain-core'
+import { RoleName, ContentType, Uuid, Result, SettingName } from '@standardnotes/domain-core'
 import { NativeFeatureIdentifier, GetFeatures } from '@standardnotes/features'
 import { SettingsService } from '../Settings'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
diff --git a/packages/snjs/lib/Services/Features/UseCase/MigrateFeatureRepoToUserSetting.ts b/packages/snjs/lib/Services/Features/UseCase/MigrateFeatureRepoToUserSetting.ts
index d9a7d60b452..ec931128d9b 100644
--- a/packages/snjs/lib/Services/Features/UseCase/MigrateFeatureRepoToUserSetting.ts
+++ b/packages/snjs/lib/Services/Features/UseCase/MigrateFeatureRepoToUserSetting.ts
@@ -1,7 +1,7 @@
 import { SettingsClientInterface } from '@Lib/Services/Settings/SettingsClientInterface'
+import { SettingName } from '@standardnotes/domain-core'
 import { SNFeatureRepo } from '@standardnotes/models'
 import { MutatorClientInterface } from '@standardnotes/services'
-import { SettingName } from '@standardnotes/settings'
 
 export class MigrateFeatureRepoToUserSettingUseCase {
   constructor(
diff --git a/packages/snjs/lib/Services/Listed/ListedService.ts b/packages/snjs/lib/Services/Listed/ListedService.ts
index 892a3d6c8be..f9d2d77809b 100644
--- a/packages/snjs/lib/Services/Listed/ListedService.ts
+++ b/packages/snjs/lib/Services/Listed/ListedService.ts
@@ -2,7 +2,6 @@ import { isString, lastElement, sleep } from '@standardnotes/utils'
 import { UuidString } from '@Lib/Types/UuidString'
 import { ItemManager } from '@Lib/Services/Items/ItemManager'
 import { DeprecatedHttpService } from '../Api/DeprecatedHttpService'
-import { SettingName } from '@standardnotes/settings'
 import { SettingsService } from '../Settings/SNSettingsService'
 import { ListedClientInterface } from './ListedClientInterface'
 import { LegacyApiService } from '../Api/ApiService'
@@ -15,7 +14,7 @@ import {
   SyncServiceInterface,
 } from '@standardnotes/services'
 import { ProtectionService } from '../Protection'
-import { ContentType } from '@standardnotes/domain-core'
+import { ContentType, SettingName } from '@standardnotes/domain-core'
 
 export class ListedService extends AbstractService implements ListedClientInterface {
   constructor(
diff --git a/packages/snjs/lib/Services/Mfa/MfaService.ts b/packages/snjs/lib/Services/Mfa/MfaService.ts
index 48c1204d1bc..462fc83d96e 100644
--- a/packages/snjs/lib/Services/Mfa/MfaService.ts
+++ b/packages/snjs/lib/Services/Mfa/MfaService.ts
@@ -1,9 +1,8 @@
-import { SettingName } from '@standardnotes/settings'
-
 import { SettingsService } from '../Settings'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
 import { FeaturesService } from '../Features/FeaturesService'
 import { AbstractService, InternalEventBusInterface, MfaServiceInterface, SignInStrings } from '@standardnotes/services'
+import { SettingName } from '@standardnotes/domain-core'
 
 export class MfaService extends AbstractService implements MfaServiceInterface {
   constructor(
diff --git a/packages/snjs/lib/Services/Settings/SNSettingsService.ts b/packages/snjs/lib/Services/Settings/SNSettingsService.ts
index 9a22963cf59..030e99ccbc9 100644
--- a/packages/snjs/lib/Services/Settings/SNSettingsService.ts
+++ b/packages/snjs/lib/Services/Settings/SNSettingsService.ts
@@ -1,9 +1,10 @@
 import { LegacyApiService } from '../Api/ApiService'
 import { SettingsGateway } from './SettingsGateway'
 import { SessionManager } from '../Session/SessionManager'
-import { EmailBackupFrequency, SettingName } from '@standardnotes/settings'
+import { EmailBackupFrequency } from '@standardnotes/settings'
 import { AbstractService, InternalEventBusInterface } from '@standardnotes/services'
 import { SettingsClientInterface } from './SettingsClientInterface'
+import { SettingName } from '@standardnotes/domain-core'
 
 export class SettingsService extends AbstractService implements SettingsClientInterface {
   private provider!: SettingsGateway
diff --git a/packages/snjs/lib/Services/Settings/SettingsClientInterface.ts b/packages/snjs/lib/Services/Settings/SettingsClientInterface.ts
index 0733ddc1232..a9e3613738a 100644
--- a/packages/snjs/lib/Services/Settings/SettingsClientInterface.ts
+++ b/packages/snjs/lib/Services/Settings/SettingsClientInterface.ts
@@ -1,5 +1,6 @@
-import { SettingName, EmailBackupFrequency } from '@standardnotes/settings'
+import { EmailBackupFrequency } from '@standardnotes/settings'
 import { SettingsList } from './SettingsList'
+import { SettingName } from '@standardnotes/domain-core'
 
 export interface SettingsClientInterface {
   listSettings(): Promise<SettingsList>
diff --git a/packages/snjs/lib/Services/Settings/SettingsGateway.ts b/packages/snjs/lib/Services/Settings/SettingsGateway.ts
index 54acb291689..17e60813808 100644
--- a/packages/snjs/lib/Services/Settings/SettingsGateway.ts
+++ b/packages/snjs/lib/Services/Settings/SettingsGateway.ts
@@ -1,8 +1,8 @@
 import { SettingsList } from './SettingsList'
-import { SettingName } from '@standardnotes/settings'
 import { API_MESSAGE_INVALID_SESSION } from '@standardnotes/services'
 import { getErrorFromErrorResponse, HttpStatusCode, isErrorResponse, User } from '@standardnotes/responses'
 import { SettingsServerInterface } from './SettingsServerInterface'
+import { SettingName } from '@standardnotes/domain-core'
 
 /**
  * SettingsGateway coordinates communication with the API service
diff --git a/packages/snjs/lib/Services/Settings/SettingsList.ts b/packages/snjs/lib/Services/Settings/SettingsList.ts
index 94ddef44a7e..e5721959cd2 100644
--- a/packages/snjs/lib/Services/Settings/SettingsList.ts
+++ b/packages/snjs/lib/Services/Settings/SettingsList.ts
@@ -1,3 +1,4 @@
+import { SettingName } from '@standardnotes/domain-core'
 import { SettingData } from '@standardnotes/responses'
 import {
   MuteSignInEmailsOption,
@@ -5,7 +6,6 @@ import {
   EmailBackupFrequency,
   ListedAuthorSecretsData,
   LogSessionUserAgentOption,
-  SettingName,
   MuteMarketingEmailsOption,
 } from '@standardnotes/settings'
 
diff --git a/packages/snjs/package.json b/packages/snjs/package.json
index 68ac2922962..ebce05b399e 100644
--- a/packages/snjs/package.json
+++ b/packages/snjs/package.json
@@ -37,7 +37,7 @@
     "@babel/preset-env": "*",
     "@standardnotes/api": "workspace:*",
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.34.1",
+    "@standardnotes/domain-core": "^1.40.0",
     "@standardnotes/domain-events": "^2.122.0",
     "@standardnotes/encryption": "workspace:*",
     "@standardnotes/features": "workspace:*",
@@ -45,7 +45,7 @@
     "@standardnotes/models": "workspace:*",
     "@standardnotes/responses": "workspace:*",
     "@standardnotes/services": "workspace:*",
-    "@standardnotes/settings": "^1.20.0",
+    "@standardnotes/settings": "^1.22.0",
     "@standardnotes/sncrypto-common": "workspace:*",
     "@standardnotes/sncrypto-web": "workspace:*",
     "@standardnotes/utils": "workspace:*",
diff --git a/packages/ui-services/package.json b/packages/ui-services/package.json
index c2789f5de51..9996e2d411d 100644
--- a/packages/ui-services/package.json
+++ b/packages/ui-services/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.34.1",
+    "@standardnotes/domain-core": "^1.40.0",
     "@standardnotes/features": "workspace:^",
     "@standardnotes/filepicker": "workspace:^",
     "@standardnotes/models": "workspace:^",
diff --git a/yarn.lock b/yarn.lock
index bba213df39a..2ea51cf2d24 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4138,7 +4138,7 @@ __metadata:
   resolution: "@standardnotes/api@workspace:packages/api"
   dependencies:
     "@standardnotes/common": ^1.50.0
-    "@standardnotes/domain-core": ^1.34.1
+    "@standardnotes/domain-core": ^1.40.0
     "@standardnotes/models": "workspace:*"
     "@standardnotes/responses": "workspace:*"
     "@standardnotes/utils": "workspace:*"
@@ -4289,7 +4289,7 @@ __metadata:
     "@babel/core": "*"
     "@babel/preset-env": "*"
     "@electron/remote": ^2.0.12
-    "@standardnotes/domain-core": ^1.34.1
+    "@standardnotes/domain-core": ^1.40.0
     "@standardnotes/electron-clear-data": 1.1.1
     "@standardnotes/web": "workspace:*"
     "@types/fs-extra": ^11.0.1
@@ -4332,21 +4332,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@standardnotes/domain-core@npm:^1.24.1":
-  version: 1.24.1
-  resolution: "@standardnotes/domain-core@npm:1.24.1"
+"@standardnotes/domain-core@npm:^1.40.0":
+  version: 1.40.0
+  resolution: "@standardnotes/domain-core@npm:1.40.0"
   dependencies:
     uuid: ^9.0.0
-  checksum: efe7e102f09c1d30ba930db3572732a952a44ddb8ad27bc2e71c9f5677cef97b3fe86465094e13d02f5a45bac80186327c0434a7fc4b5801bedee0b7d5a7ad68
-  languageName: node
-  linkType: hard
-
-"@standardnotes/domain-core@npm:^1.34.1":
-  version: 1.34.1
-  resolution: "@standardnotes/domain-core@npm:1.34.1"
-  dependencies:
-    uuid: ^9.0.0
-  checksum: 29fa0ee7868b08a5255ce737535aa67b9fe8f0562f7d5a308f4be4a63d46821f34b4ea1d4241064e3025968ae45e09eba3dcbd1ff8d510618114541c42a8e6ae
+  checksum: 7a8454d5e667b2db157247f9fdd3ba4f62e90f85a02acb9f805b00da2edc0d495318139ee4441148244af42a228053ede40b7862507003c6b510ca83863b8997
   languageName: node
   linkType: hard
 
@@ -4393,7 +4384,7 @@ __metadata:
   dependencies:
     "@standardnotes/common": ^1.50.0
     "@standardnotes/config": 2.4.3
-    "@standardnotes/domain-core": ^1.34.1
+    "@standardnotes/domain-core": ^1.40.0
     "@standardnotes/models": "workspace:*"
     "@standardnotes/responses": "workspace:*"
     "@standardnotes/sncrypto-common": "workspace:*"
@@ -4428,7 +4419,7 @@ __metadata:
   resolution: "@standardnotes/features@workspace:packages/features"
   dependencies:
     "@standardnotes/common": ^1.50.0
-    "@standardnotes/domain-core": ^1.34.1
+    "@standardnotes/domain-core": ^1.40.0
     "@types/jest": ^29.2.3
     "@typescript-eslint/eslint-plugin": "*"
     eslint: "*"
@@ -4635,7 +4626,7 @@ __metadata:
   resolution: "@standardnotes/models@workspace:packages/models"
   dependencies:
     "@standardnotes/common": ^1.50.0
-    "@standardnotes/domain-core": ^1.34.1
+    "@standardnotes/domain-core": ^1.40.0
     "@standardnotes/features": "workspace:*"
     "@standardnotes/responses": "workspace:*"
     "@standardnotes/sncrypto-common": "workspace:^"
@@ -4731,7 +4722,7 @@ __metadata:
   dependencies:
     "@standardnotes/api": "workspace:^"
     "@standardnotes/common": ^1.50.0
-    "@standardnotes/domain-core": ^1.34.1
+    "@standardnotes/domain-core": ^1.40.0
     "@standardnotes/encryption": "workspace:^"
     "@standardnotes/features": "workspace:^"
     "@standardnotes/files": "workspace:^"
@@ -4752,13 +4743,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@standardnotes/settings@npm:^1.20.0":
-  version: 1.21.20
-  resolution: "@standardnotes/settings@npm:1.21.20"
+"@standardnotes/settings@npm:^1.22.0":
+  version: 1.22.0
+  resolution: "@standardnotes/settings@npm:1.22.0"
   dependencies:
-    "@standardnotes/domain-core": ^1.24.1
+    "@standardnotes/domain-core": ^1.40.0
     reflect-metadata: ^0.1.13
-  checksum: 0a3b9fcffafcff4936199a220309646e7c9f5cde6d1855e2b86317151e635a3b55cbc1160c1681013c2d620eb567af009cf431644af4d5f305302e8cd8c5c886
+  checksum: 93be5a6ff63231f1c8baf2df71a2248f757841e9752f950005d3613c1fe08a8659b73b806c9a7d498b77c81ff5815cab2dea2f3339fb95f76cdc159a786f0c41
   languageName: node
   linkType: hard
 
@@ -4832,7 +4823,7 @@ __metadata:
     "@babel/preset-env": "*"
     "@standardnotes/api": "workspace:*"
     "@standardnotes/common": ^1.50.0
-    "@standardnotes/domain-core": ^1.34.1
+    "@standardnotes/domain-core": ^1.40.0
     "@standardnotes/domain-events": ^2.122.0
     "@standardnotes/encryption": "workspace:*"
     "@standardnotes/features": "workspace:*"
@@ -4840,7 +4831,7 @@ __metadata:
     "@standardnotes/models": "workspace:*"
     "@standardnotes/responses": "workspace:*"
     "@standardnotes/services": "workspace:*"
-    "@standardnotes/settings": ^1.20.0
+    "@standardnotes/settings": ^1.22.0
     "@standardnotes/sncrypto-common": "workspace:*"
     "@standardnotes/sncrypto-web": "workspace:*"
     "@standardnotes/utils": "workspace:*"
@@ -4957,7 +4948,7 @@ __metadata:
   resolution: "@standardnotes/ui-services@workspace:packages/ui-services"
   dependencies:
     "@standardnotes/common": ^1.50.0
-    "@standardnotes/domain-core": ^1.34.1
+    "@standardnotes/domain-core": ^1.40.0
     "@standardnotes/features": "workspace:^"
     "@standardnotes/filepicker": "workspace:^"
     "@standardnotes/models": "workspace:^"