diff --git a/.github/workflows/add_identifiers.yml b/.github/workflows/add_identifiers.yml
index 6661ba30c9..3f9e6b7638 100644
--- a/.github/workflows/add_identifiers.yml
+++ b/.github/workflows/add_identifiers.yml
@@ -12,11 +12,11 @@ jobs:
   identifiers:
     name: Add Identifiers
     needs: validate
-    runs-on: macos-15
+    runs-on: macos-26
     steps:
       # Checks-out the repo
       - name: Checkout Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       
       # Patch Fastlane Match to not print tables
       - name: Patch Match Tables
diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml
index db33b8991b..fab987e7b3 100644
--- a/.github/workflows/build_loop.yml
+++ b/.github/workflows/build_loop.yml
@@ -90,7 +90,7 @@ jobs:
         if: |
           steps.workflow-permission.outputs.has_permission == 'true' &&
           (vars.SCHEDULED_BUILD != 'false' || vars.SCHEDULED_SYNC != 'false')
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           token: ${{ secrets.GH_PAT }}
 
@@ -100,7 +100,7 @@ jobs:
           steps.workflow-permission.outputs.has_permission == 'true' &&
           vars.SCHEDULED_SYNC != 'false' && github.repository_owner != 'LoopKit'
         id: sync
-        uses: aormsby/Fork-Sync-With-Upstream-action@v3.4.1
+        uses: aormsby/Fork-Sync-With-Upstream-action@v3.4.2
         with:
           target_sync_branch: ${{ env.TARGET_BRANCH }}
           shallow_since: 6 months ago
@@ -165,7 +165,7 @@ jobs:
   build:
     name: Build
     needs: [check_certs, check_status]
-    runs-on: macos-15
+    runs-on: macos-26
     permissions:
       contents: write
     if:
@@ -175,10 +175,10 @@ jobs:
         (vars.SCHEDULED_SYNC != 'false' && needs.check_status.outputs.NEW_COMMITS == 'true' )
     steps:
       - name: Select Xcode version
-        run: "sudo xcode-select --switch /Applications/Xcode_16.4.app/Contents/Developer"
+        run: "sudo xcode-select --switch /Applications/Xcode_26.2.app/Contents/Developer"
 
       - name: Checkout Repo for building
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           token: ${{ secrets.GH_PAT }}
           submodules: recursive
@@ -255,7 +255,7 @@ jobs:
       # Upload Build artifacts
       - name: Upload build log, IPA and Symbol artifacts
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: build-artifacts
           path: |
diff --git a/.github/workflows/create_certs.yml b/.github/workflows/create_certs.yml
index d20001b2ca..a3cc89e077 100644
--- a/.github/workflows/create_certs.yml
+++ b/.github/workflows/create_certs.yml
@@ -22,14 +22,14 @@ jobs:
   create_certs:
     name: Certificates
     needs: validate
-    runs-on: macos-15
+    runs-on: macos-26
     outputs:
       new_certificate_needed: ${{ steps.set_output.outputs.new_certificate_needed }}
   
     steps:
       # Checks-out the repo
       - name: Checkout Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       
       # Patch Fastlane Match to not print tables
       - name: Patch Match Tables
@@ -63,7 +63,8 @@ jobs:
         id: set_output
         run: |
           CERT_STATUS_FILE="${{ github.workspace }}/fastlane/new_certificate_needed.txt"
-          ENABLE_NUKE_CERTS=${{ vars.ENABLE_NUKE_CERTS }}
+          ENABLE_NUKE_CERTS=$(echo "${{ vars.ENABLE_NUKE_CERTS }}" | tr '[:upper:]' '[:lower:]')
+          FORCE_NUKE_CERTS=$(echo "${{ vars.FORCE_NUKE_CERTS }}" | tr '[:upper:]' '[:lower:]')
           
           if [ -f "$CERT_STATUS_FILE" ]; then
             CERT_STATUS=$(cat "$CERT_STATUS_FILE" | tr -d '\n' | tr -d '\r') # Read file content and strip newlines
@@ -82,22 +83,22 @@ jobs:
             echo "::error::❌ No valid distribution certificate found. Automated renewal of certificates was skipped because the repository variable ENABLE_NUKE_CERTS is not set to 'true'."
             exit 1
           fi
-          # Check if vars.FORCE_NUKE_CERTS is not set to true
-          if [ vars.FORCE_NUKE_CERTS = "true" ]; then
+          # Check if FORCE_NUKE_CERTS is set to true
+          if [ "$FORCE_NUKE_CERTS" = "true" ]; then
             echo "::warning::‼️ Nuking of certificates was forced because the repository variable FORCE_NUKE_CERTS is set to 'true'."
           fi
   # Nuke Certs if needed, and if the repository variable ENABLE_NUKE_CERTS is set to 'true', or if FORCE_NUKE_CERTS is set to 'true', which will always force certs to be nuked
   nuke_certs:
       name: Nuke certificates
       needs: [validate, create_certs]
-      runs-on: macos-15
+      runs-on: macos-26
       if: ${{ (needs.create_certs.outputs.new_certificate_needed == 'true' && vars.ENABLE_NUKE_CERTS == 'true') || vars.FORCE_NUKE_CERTS == 'true' }}
       steps:
         - name: Output from step id 'check_certs'
           run: echo "new_certificate_needed=${{ needs.create_certs.outputs.new_certificate_needed }}"
 
         - name: Checkout repository
-          uses: actions/checkout@v4
+          uses: actions/checkout@v5
 
         - name: Install dependencies
           run: bundle install
diff --git a/.github/workflows/validate_secrets.yml b/.github/workflows/validate_secrets.yml
index f8d97c4f48..ea150c0c53 100644
--- a/.github/workflows/validate_secrets.yml
+++ b/.github/workflows/validate_secrets.yml
@@ -105,7 +105,7 @@ jobs:
   validate-fastlane-secrets:
     name: Fastlane
     needs: [validate-access-token]
-    runs-on: macos-15
+    runs-on: macos-26
     env:
       GH_PAT: ${{ secrets.GH_PAT }}
       GH_TOKEN: ${{ secrets.GH_PAT }}
@@ -116,7 +116,7 @@ jobs:
       TEAMID: ${{ secrets.TEAMID }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install Project Dependencies
         run: bundle install
diff --git a/.gitmodules b/.gitmodules
index 1308e60c03..488052f03c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,3 +58,9 @@
 [submodule "LibreTransmitter"]
 	path = LibreTransmitter
 	url = https://github.com/LoopKit/LibreTransmitter.git
+[submodule "MedtrumKit"]
+	path = MedtrumKit
+	url = https://github.com/loopandlearn/MedtrumKit.git
+[submodule "DanaKit"]
+	path = DanaKit
+	url = https://github.com/loopandlearn/DanaKit
diff --git a/CGMBLEKit b/CGMBLEKit
index 134396b961..ba5d0b7daf 160000
--- a/CGMBLEKit
+++ b/CGMBLEKit
@@ -1 +1 @@
-Subproject commit 134396b96170d410b18f9699b92409bc6d35aedb
+Subproject commit ba5d0b7daf83d282b587c8ff0e835162b8c75846
diff --git a/DanaKit b/DanaKit
new file mode 160000
index 0000000000..0158fc8539
--- /dev/null
+++ b/DanaKit
@@ -0,0 +1 @@
+Subproject commit 0158fc85391725bb1855ea34469d48cb65667850
diff --git a/G7SensorKit b/G7SensorKit
index 0c09305008..4d0780db06 160000
--- a/G7SensorKit
+++ b/G7SensorKit
@@ -1 +1 @@
-Subproject commit 0c093050084b63d7af0dc99307dba09239eb3180
+Subproject commit 4d0780db06c7c95b3a3bf3cdb2f2838d521e411a
diff --git a/LibreTransmitter b/LibreTransmitter
index 12dec3ce19..20f6d0e171 160000
--- a/LibreTransmitter
+++ b/LibreTransmitter
@@ -1 +1 @@
-Subproject commit 12dec3ce191afe761fd68a70172ef75638319e20
+Subproject commit 20f6d0e171450b294b202cefa8edaf2c5e4a5150
diff --git a/LogglyService b/LogglyService
index 8a7691cd74..0a8f3c83be 160000
--- a/LogglyService
+++ b/LogglyService
@@ -1 +1 @@
-Subproject commit 8a7691cd7497ffacf4fd8caa4a174fb860e42297
+Subproject commit 0a8f3c83bed117248c56acf8278b18a88f399988
diff --git a/Loop b/Loop
index c044b52fb3..367a9878f5 160000
--- a/Loop
+++ b/Loop
@@ -1 +1 @@
-Subproject commit c044b52fb30f3986a7b55c6d5cb1c587c5f9a4ee
+Subproject commit 367a9878f5274be3ad5ead4142e2837bc0c394c2
diff --git a/LoopKit b/LoopKit
index 58cd228556..835c45a317 160000
--- a/LoopKit
+++ b/LoopKit
@@ -1 +1 @@
-Subproject commit 58cd22855637a86fd1776d1735fec4cb2b92a460
+Subproject commit 835c45a31789305f4e26af58405124b8a5fd45f7
diff --git a/LoopOnboarding b/LoopOnboarding
index 60f57a77c9..6fbc8c7ae2 160000
--- a/LoopOnboarding
+++ b/LoopOnboarding
@@ -1 +1 @@
-Subproject commit 60f57a77c9450df17c39f475542795e72f261136
+Subproject commit 6fbc8c7ae2594cd0931b5ea9a36b015fafcd2b13
diff --git a/LoopSupport b/LoopSupport
index 6d7d3e293e..e470d203d3 160000
--- a/LoopSupport
+++ b/LoopSupport
@@ -1 +1 @@
-Subproject commit 6d7d3e293ebc5f8b7d9f9e6b0326bf6641da8680
+Subproject commit e470d203d386895515a058f36ddfd741da185108
diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata
index a870f8b7c9..49dd551423 100644
--- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata
+++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata
@@ -108,12 +108,18 @@
    <FileRef
       location = "group:TrueTime.swift/TrueTime.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:MedtrumKit/MedtrumKit.xcodeproj">
+   </FileRef>
    <FileRef
       location = "group:OmniBLE/OmniBLE.xcodeproj">
    </FileRef>
    <FileRef
       location = "group:OmniKit/OmniKit.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:DanaKit/DanaKit.xcodeproj">
+   </FileRef>
    <FileRef
       location = "group:RileyLinkKit/RileyLinkKit.xcodeproj">
    </FileRef>
diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme
index e09bc55654..bb99e50468 100644
--- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme
+++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme
@@ -146,6 +146,20 @@
                ReferencedContainer = "container:MinimedKit/MinimedKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3E767D422D67B790004B1971"
+               BuildableName = "MedtrumKitPlugin.loopplugin"
+               BlueprintName = "MedtrumKitPlugin"
+               ReferencedContainer = "container:MedtrumKit/MedtrumKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -174,6 +188,20 @@
                ReferencedContainer = "container:OmniBLE/OmniBLE.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3E6007862D0C5D0C00B186D1"
+               BuildableName = "DanaKitPlugin.loopplugin"
+               BlueprintName = "DanaKitPlugin"
+               ReferencedContainer = "container:DanaKit/DanaKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
diff --git a/MedtrumKit b/MedtrumKit
new file mode 160000
index 0000000000..b7f3d44c06
--- /dev/null
+++ b/MedtrumKit
@@ -0,0 +1 @@
+Subproject commit b7f3d44c06bb7c580be897e0414e64de2d6dd995
diff --git a/MinimedKit b/MinimedKit
index 942996e3f5..ba80a8f46a 160000
--- a/MinimedKit
+++ b/MinimedKit
@@ -1 +1 @@
-Subproject commit 942996e3f53c4875553c9827aeee1799a8dbf434
+Subproject commit ba80a8f46aa6582818289e7457574017281351e6
diff --git a/NightscoutRemoteCGM b/NightscoutRemoteCGM
index 512c9dc6d8..d442e9f24f 160000
--- a/NightscoutRemoteCGM
+++ b/NightscoutRemoteCGM
@@ -1 +1 @@
-Subproject commit 512c9dc6d81b54ea9cc9a3a6681a888ea5ac91dc
+Subproject commit d442e9f24f5f42cf2d5d8725809ad64084be10cf
diff --git a/NightscoutService b/NightscoutService
index d21abadedf..d6785fdcaa 160000
--- a/NightscoutService
+++ b/NightscoutService
@@ -1 +1 @@
-Subproject commit d21abadedf3cb25fa4732223f3954a22050ee532
+Subproject commit d6785fdcaa47fcd9efa3da19dd4be97efaedb806
diff --git a/OmniBLE b/OmniBLE
index 3782c584fe..b0b78e66a6 160000
--- a/OmniBLE
+++ b/OmniBLE
@@ -1 +1 @@
-Subproject commit 3782c584fe800116b6e60754e3be3cd818e033ee
+Subproject commit b0b78e66a6962677970a00e5d37ae4157e548b8a
diff --git a/OmniKit b/OmniKit
index 1446be89bf..38af22b3d3 160000
--- a/OmniKit
+++ b/OmniKit
@@ -1 +1 @@
-Subproject commit 1446be89bfab23ac021d3e22f03b34bda8ce30cf
+Subproject commit 38af22b3d36e05a4cdffb242a1a47b347a4031fc
diff --git a/Scripts/manual_upload_to_lokalise.sh b/Scripts/manual_upload_to_lokalise.sh
index a013c86d57..caf63f4eed 100755
--- a/Scripts/manual_upload_to_lokalise.sh
+++ b/Scripts/manual_upload_to_lokalise.sh
@@ -37,18 +37,21 @@ foreach lang in $LANGUAGES
 # modify the hyphen to underscore to support lokalise lang-iso expectation
 lang_iso=$(sed "s/zh-Hans/zh_Hans/g; s/pt-BR/pt_BR/g" <<<"$lang")
 
-# flags to consider (neither in use by default)
-#   cleanup-mode (was default) - this deleted any keys in localise not in clone
-#      remove this because we have 3 repos that are work in progress
-#   replace-modified (was not there) - given that we may have input from crowdin,
-#      we may need to use this to update to lokalise, but not sure how to handle this
+# flags updated to default 2026-03-31
+#   cleanup-mode - this deletes any keys in lokalise not in clone;
+#      make sure the appropriate branch, with any new managers is used
+#   replace-modified - this allows us to accept translations from other sources
+#      make sure that if there is new input, it is uploaded promptly to avoid
+#        overwriting what translators provide in lokalise
 lokalise2 \
     --token $LOKALISE_TOKEN \
     --convert-placeholders=false \
     --project-id 414338966417c70d7055e2.75119857 \
     file upload \
     --file ${lang}.xliff \
-    --lang-iso ${lang_iso}
+    --lang-iso ${lang_iso} \
+    --replace-modified \
+    --cleanup-mode
 end
 
 section_divider
diff --git a/TidepoolService b/TidepoolService
index a10f9d3ba0..5f4927dcac 160000
--- a/TidepoolService
+++ b/TidepoolService
@@ -1 +1 @@
-Subproject commit a10f9d3ba097daae85de61d4a5bca063f34d64dc
+Subproject commit 5f4927dcac2b17276776b83016896997001b1a67
diff --git a/VersionOverride.xcconfig b/VersionOverride.xcconfig
index a960162062..b17045813b 100644
--- a/VersionOverride.xcconfig
+++ b/VersionOverride.xcconfig
@@ -8,5 +8,5 @@
 
 // Version [for DIY Loop]
 //   configure the version number in LoopWorkspace
-LOOP_MARKETING_VERSION = 3.13.0
+LOOP_MARKETING_VERSION = 3.13.1
 CURRENT_PROJECT_VERSION = 57
diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift
index 8c4f0edfe9..875faf232b 160000
--- a/dexcom-share-client-swift
+++ b/dexcom-share-client-swift
@@ -1 +1 @@
-Subproject commit 8c4f0edfe9356463c66a2e5dff9d00794291ebfd
+Subproject commit 875faf232bb3f13d619512f9e8b47a2d5acac433